Commit d071f508 authored by zhangyi's avatar zhangyi

update

parent ec5d9c16
......@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.Map;
/**
......@@ -29,67 +30,67 @@ public class EnterpriseBussinessController {
@ApiOperation(value = "客户信息列表(openApi)")
@RequestMapping(value = "/clientPage", method = RequestMethod.POST)
public TableDataInfo clientPage(@RequestBody EnterpriseBussinessClientPageBody paramMap) throws Exception {
public TableDataInfo clientPage(@RequestBody @Valid EnterpriseBussinessClientPageBody paramMap) throws Exception {
return enterpriseBussinessService.clientPage(paramMap);
}
@ApiOperation(value = "客户项目列表(openApi)")
@RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
public Map<String, Object> clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
public Map<String, Object> clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
return enterpriseBussinessService.clientProjectPage(paramMap);
}
@ApiOperation(value = "投标记录列表(开标记录)(openApi)")
@RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
public TableDataInfo tenderPage(@RequestBody EnterpriseBussinessTenderPageBody paramMap) throws Exception {
public TableDataInfo tenderPage(@RequestBody @Valid EnterpriseBussinessTenderPageBody paramMap) throws Exception {
return enterpriseBussinessService.tenderPage(paramMap);
}
@ApiOperation(value = "投标记录详情(开标记录)(openApi)")
@RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
public R tenderDetail(@RequestBody EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
public R tenderDetail(@RequestBody @Valid EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
return enterpriseBussinessService.tenderDetail(paramMap);
}
@ApiOperation(value = "供应商列表(openApi)")
@RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
public TableDataInfo supplierPage(@RequestBody EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
public TableDataInfo supplierPage(@RequestBody @Valid EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
return enterpriseBussinessService.supplierPage(paramMap);
}
@ApiOperation(value = "供应商项目列表(openApi)")
@RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
public Map<String, Object> supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
public Map<String, Object> supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
return enterpriseBussinessService.supplierProjectPage(paramMap);
}
@ApiOperation(value = "中标项目详情(openApi)")
@RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
public R projectDetail(@RequestBody EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
public R projectDetail(@RequestBody @Valid EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
return enterpriseBussinessService.projectDetail(paramMap);
}
@ApiOperation(value = "招标代理常合作代理机构列表(openApi)")
@RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
public TableDataInfo oftenAgencyPage(@RequestBody EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
public TableDataInfo oftenAgencyPage(@RequestBody @Valid EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
return enterpriseBussinessService.oftenAgencyPage(paramMap);
}
@ApiOperation(value = "招标合作明细列表(openApi)")
@RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
public TableDataInfo bidCooperatePage(@RequestBody EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
public TableDataInfo bidCooperatePage(@RequestBody @Valid EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
return enterpriseBussinessService.bidCooperatePage(paramMap);
}
@ApiOperation(value = "历史发包列表(openApi)")
@RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
public TableDataInfo historySendPage(@RequestBody EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
public TableDataInfo historySendPage(@RequestBody @Valid EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
return enterpriseBussinessService.historySendPage(paramMap);
}
@ApiOperation(value = "历史发包省份(openApi)")
@RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
public R historySendProvince(@RequestBody EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
public R historySendProvince(@RequestBody @Valid EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
return enterpriseBussinessService.historySendProvince(paramMap);
}
......
......@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
/**
......@@ -20,5 +21,8 @@ public class EnterpriseAffiliatesBody extends BasePage {
private Integer hasBid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -22,4 +23,9 @@ public class EnterpriseBestStockPageBody extends BasePage
//是否历史 0 否 1 是
private Integer isHistory;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,8 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
@Data
......@@ -24,4 +26,9 @@ public class EnterpriseBidDataGroupBody
@NotNull(message = "spanId不能为空")
private Integer spanId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -30,4 +31,9 @@ public class EnterpriseBidNoticePageBody extends BasePage
*/
private Integer provinceId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseBidNoticeProvinceBody
@NotNull(message = "企业id不能为空")
private Integer companyId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseBidNoticeTenderStageBody
@NotNull(message = "企业id不能为空")
private Integer companyId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseBondCreditRatingBody
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -29,5 +30,10 @@ public class EnterpriseBussinessBidCooperatePageBody extends BasePage {
*/
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == tendereeId || 0 == agencyId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -31,4 +32,9 @@ public class EnterpriseBussinessClientPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -30,4 +31,9 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid || 0 == unitId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -53,6 +54,9 @@ public class EnterpriseBussinessHistorySendPageBody extends BasePage {
*/
private Double amountMax;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -17,5 +18,8 @@ public class EnterpriseBussinessHistorySendProvinceBody {
*/
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -30,4 +31,8 @@ public class EnterpriseBussinessOftenAgencyPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -30,4 +31,8 @@ public class EnterpriseBussinessSupplierPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -28,6 +29,12 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
* 查询关键字
*/
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid || 0 == unitId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -25,4 +26,9 @@ public class EnterpriseBussinessTenderPageBody extends BasePage {
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseChangeInfoBody extends BasePage
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -25,4 +26,9 @@ public class EnterpriseCreditAbnormalPageBody extends BasePage {
private List<String> years;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -20,4 +21,8 @@ public class EnterpriseCreditAbnormalYearsBody {
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -26,5 +27,8 @@ public class EnterpriseCreditExecutedPageBody extends BasePage {
*/
private String dateTo;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -28,5 +29,8 @@ public class EnterpriseCreditExecutedPersonsPageBody extends BasePage {
*/
private String dateTo;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,8 @@ public class EnterpriseCreditKaitingCauseActionBody {
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -44,4 +45,9 @@ public class EnterpriseCreditKaitingPageBody extends BasePage {
private String dateTo;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditKaitingPureRoleBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditLawsuitsCauseActionBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -41,6 +42,9 @@ public class EnterpriseCreditLawsuitsPageBody extends BasePage {
*/
private String dateTo;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditLawsuitsRoleBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeCaseReasonBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -43,5 +44,8 @@ public class EnterpriseCreditNoticePageBody extends BasePage {
*/
private String dateTo;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeRoleBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeTypeBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -28,4 +29,9 @@ public class EnterpriseCreditPenalizePageBody extends BasePage {
*/
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,4 +19,9 @@ public class EnterpriseCreditPenalizeReasonTypeBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseDynamicPageBody extends BasePage
@NotNull(message = "企业id不能为空")
private Integer companyId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseFinancialBody
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,9 @@ public class EnterpriseIcInfoBody extends BasePage
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,8 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +21,9 @@ public class EnterpriseInfoHeaderBody
@NotNull(message = "企业id不能为空")
private Integer companyId;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
/**
......@@ -21,5 +22,8 @@ public class EnterpriseInvestmentBody extends BasePage {
private double stockPercentageMin;
private double stockPercentageMax;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -19,4 +20,8 @@ public class EnterpriseKeymembersBody extends BasePage
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
/**
......@@ -17,6 +18,9 @@ public class EnterprisePartnersBody extends BasePage {
//企业Id
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -30,4 +31,9 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeAreaBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -49,4 +50,9 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
*/
private List<Integer> areaIds;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProAssessmentWayBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -40,5 +41,8 @@ public class EnterpriseProjectBidNoticeProPageBody extends BasePage {
private String bidAssessmentWay;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProProjectPurposesBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProProjectTypeBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -19,4 +20,9 @@ public class EnterpriseProjectBidNoticeTenderStageBody {
@NotNull(message = "企业id不能为空")
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -29,5 +30,8 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -23,5 +24,8 @@ public class EnterpriseProjectCreditXzxkPageBody extends BasePage {
*/
private String keys;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -35,4 +36,9 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
*/
private Integer sort;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
import java.util.List;
......@@ -20,5 +21,8 @@ public class EnterpriseProjectLandUseBody {
private Integer cid;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
/**
......@@ -20,5 +21,10 @@ public class EnterpriseProjectTenderDataGroupBody {
//group类型 0:金额,1:项目类型
private Integer type;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == cid;
}
}
......@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
@Data
......@@ -20,4 +21,10 @@ public class EnterpriseStatisticBody
private Integer companyId;
private Boolean isFy = false;
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -4,6 +4,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.NotNull;
/**
......@@ -40,4 +41,9 @@ public class EnterpriseSupplierPageBody extends BasePage {
sb.append('}');
return sb.toString();
}
@AssertFalse(message = "企业不存在")
public boolean isVaildCid() {
return 0 == companyId;
}
}
......@@ -49,37 +49,38 @@ public class EnterpriseService {
private RedisCache redisCache;
public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
if (200 != companyCode) throw new RuntimeException();
Map companyData = MapUtils.getMap(companyMap, "data", null);
companyData.put("claimStatus", 0);
companyData.put("uipId", null);
Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
map.put("cid", body.getCompanyId());
Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", map);
Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
if (200 != uipCode) return R.ok(companyData);
Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
String uipId = MapUtils.getString(uipData, "uipId", null);
if (ObjectUtil.isEmpty(uipId)) {
return R.ok(companyData);
}
companyData.put("uipId", uipId);
ArrayList<String> uipIds = new ArrayList<>();
uipIds.add(uipId);
List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
if (CollectionUtils.isNotEmpty(claimStatusList)) {
companyMap.put("claimStatus", 1);
}
return R.ok(companyData);
// Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
// Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
// if (200 != companyCode) return R.ok();
// Map companyData = MapUtils.getMap(companyMap, "data", null);
// companyData.put("claimStatus", 0);
// companyData.put("uipId", null);
//
// Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
// map.put("cid", body.getCompanyId());
//
// Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", map);
// Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
// if (200 != uipCode) return R.ok(companyData);
//
// Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
// String uipId = MapUtils.getString(uipData, "uipId", null);
//
// if (ObjectUtil.isEmpty(uipId)) {
// return R.ok(companyData);
// }
//
// companyData.put("uipId", uipId);
// ArrayList<String> uipIds = new ArrayList<>();
// uipIds.add(uipId);
// List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
//
// if (CollectionUtils.isNotEmpty(claimStatusList)) {
// companyMap.put("claimStatus", 1);
// }
//
// return R.ok(companyData);
return R.ok();
}
public R statistic(EnterpriseStatisticBody body) throws Exception {
......@@ -113,6 +114,7 @@ public class EnterpriseService {
}
public R bidDataGroup(EnterpriseBidDataGroupBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bidDataGroup", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment