Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -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);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseAffiliatesBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBestStockPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidDataGroupBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticePageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeProvinceBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeTenderStageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBondCreditRatingBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessBidCooperatePageBody.java

@@ -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;
+    }
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessHistorySendPageBody.java

@@ -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;
+    }
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessHistorySendProvinceBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessOftenAgencyPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -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;
+    }
     
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessTenderPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseChangeInfoBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalYearsBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPersonsPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingCauseActionBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPageBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPureRoleBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsCauseActionBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsPageBody.java

@@ -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;
+    }
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsRoleBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeCaseReasonBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticePageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeRoleBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeTypeBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizePageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizeReasonTypeBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseDynamicPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseIcInfoBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInfoHeaderBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseKeymembersBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterprisePartnersBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectApprovalProjectPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeAreaBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticePageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProAssessmentWayBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectPurposesBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeProProjectTypeBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticeTenderStageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectCreditXzxkPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandTransactionPageBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandUseBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectTenderDataGroupBody.java

@@ -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;
+    }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseStatisticBody.java

@@ -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;
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseSupplierPageBody.java

@@ -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;
+    }
 }

dsk-operate-ui/src/api/macro/macro.js

@@ -200,6 +200,15 @@ export function urbanInvestmentStatistics(param) {
   })
 }
 
+//城投平台-认领
+export function claim(param) {
+  return request({
+    url: '/customer/claim',
+    method: 'POST',
+    data: param
+  })
+}
+
 
 
 

dsk-operate-ui/src/views/index.vue

@@ -134,7 +134,7 @@
               </div>
             </div>
             <div>
-              <div id="fx-echarts" style="height: 200px;"></div>
+              <div id="fx-echarts" style="height: 260px;"></div>
             </div>
           </div>
 
@@ -608,7 +608,7 @@ export default {
                 },
                 {
                   offset: 1,
-                  color: "#0CBC6D",
+                  color: "#9DDCCA",
                 },
               ]),
             },
@@ -636,11 +636,11 @@ export default {
               color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
                 {
                   offset: 0.2,
-                  color: "#DFEAFF",
+                  color: "#FAFDFF",
                 },
                 {
                   offset: 1,
-                  color: "#5895FF",
+                  color: "#C5E3FF",
                 },
               ]),
             },
@@ -668,11 +668,11 @@ export default {
               color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
                 {
                   offset: 0.2,
-                  color: "#ECE8FF",
+                  color: "#FAF9FF",
                 },
                 {
                   offset: 1,
-                  color: "#BCC0FF",
+                  color: "#E2DCFF",
                 },
               ]),
             },
@@ -1042,7 +1042,7 @@ export default {
             height: 60px;
             background: #FFFFFF;
             border-radius: 4px;
-            border: 1px solid #E6E6E9;
+            /*border: 1px solid #E6E6E9;*/
             color:#0081FF;
             line-height: 64px;
             font-size: 14px;
@@ -1261,7 +1261,7 @@ export default {
         }
       }
       .analysis{
-        height: 242px;
+        height: 314px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;
@@ -1474,7 +1474,7 @@ export default {
         }
       }
       .zbgg{
-        height: 382px;
+        height: 450px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -700,7 +700,7 @@ export default {
         .item{
           width: 19%;
           .item-title{
-            font-size: 13px;
+            font-size: 12px;
             color: rgba(35,35,35,0.8);
             i{
               width: 2px;
@@ -750,7 +750,7 @@ export default {
           border-right: 1px solid #E4E4E4;
           display: inline-block;
           color: rgba(35,35,35,0.8);
-          font-size: 13px;
+          font-size: 12px;
           padding-left: 16px;
           width: 20%;
           line-height: 26px;
@@ -773,7 +773,7 @@ export default {
             font-style: normal;
             margin-left: 4px;
             font-weight: 400;
-            font-size: 13px;
+            font-size: 12px;
           }
         }
         span:last-child{

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -50,9 +50,9 @@
           <!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <!--<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>-->
+          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
           <!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
@@ -101,7 +101,7 @@ export default {
       tableData: [],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       tableDataTotal: null,
       aptitudeCodeList:[],
       aptitudeType:'',

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -11,28 +11,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '万' : ''}}</span></h4>
               <p>项目总投资额</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon1.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '万' : ''}}</span></h4>
               <p>项目资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon2.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '万' : ''}}</span></h4>
               <p>专项债融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon3.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '万' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -41,28 +41,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '万' : ''}}</span></h4>
               <p>其他资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon5.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '亿' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '万' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
               <p>专项债融资额/专项债只数</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon6.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '万' : ''}}</span></h4>
               <p>其他融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon7.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '万' : ''}}</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -95,7 +95,7 @@
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
+          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '万' : ''}}</span>
         </p>
       </div>
     </div>
@@ -130,8 +130,8 @@
               {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
+          <el-table-column prop="actualBondIssueScale" label="专项债规模（万）"  width="260" />
+          <el-table-column prop="isUsedProjectScale" label="用于项目规模(万)" width="260" />
           <el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
         </el-table>
       </div>

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -39,7 +39,7 @@
           highlight-current-row
           v-if="tableDataTotal > 0"
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column label="地区" min-width="150" align="left" fixed>
@@ -56,12 +56,12 @@
           <el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
           <el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
           <el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
-          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
+          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" :formatter="formatStatus" width="170" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
           <el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
-          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="right"></el-table-column>
+          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column>
           <el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="right"></el-table-column>
           <el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="right"></el-table-column>
           <el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="right"></el-table-column>
@@ -137,7 +137,7 @@
         tableData: [],
         tableLoading: false,
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 20,
         tableDataTotal: null,
       }
     },

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -64,7 +64,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="type" label="地区"/>
@@ -80,7 +80,7 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对{{year}}年全国招标数据进行分析，发现主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{year}}年全国公开的招标项目，未公开的不含在内</p>
@@ -99,7 +99,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="label" label="月份"/>

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -32,7 +32,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="major" label="资质类型"/>
@@ -78,7 +78,7 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left">
+          <el-table-column label="序号" width="60" align="left">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="province" label="地区"/>
@@ -121,7 +121,7 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left">
+          <el-table-column label="序号" width="60" align="left">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="province" label="地区" />

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -153,13 +153,13 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="companyName" label="公司名称" width="300" fixed>
             <template slot-scope="scope">
               <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
-              <span class="table-span" style="color: #3D3D3D;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
+              <span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
               <span class="table-span" style="color: rgba(35,35,35,0.4);" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
             </template>
           </el-table-column>
@@ -191,7 +191,7 @@
           </el-table-column>
           <el-table-column prop="actualController" label="实控人" :formatter="formatStatus" width="250" />
           <el-table-column prop="latestReportPeriod" label="最新报告期" :formatter="formatStatus" width="120" />
-          <el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="120" align="right"/>
+          <el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="130" align="right"/>
           <el-table-column prop="belongNetAssets" label="归母净资产（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/>
           <el-table-column prop="monetaryFunds" label="货币资金（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
           <el-table-column prop="landAssets" label="土地资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
@@ -241,13 +241,20 @@
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
+    <el-dialog :visible.sync="claimVisible" width="244" :show-close="false">
+      <div>认领成功，是否完善客户信息？</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="innerVisible = true">立即完善</el-button>
+        <el-button @click="claimVisible = false">稍后</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
   import {encodeStr} from "@/assets/js/common.js"
   import dataRegion from '@/assets/json/dataRegion'
-  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics } from '@/api/macro/macro'
+  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim } from '@/api/macro/macro'
 export default {
   name: 'Urban',
   data() {
@@ -279,7 +286,8 @@ export default {
       addresslength: 0,
       searchState:false,
       typeList:[],
-      statistics:{}
+      statistics:{},
+      claimVisible:false,
     }
   },
   watch:{
@@ -571,7 +579,14 @@ export default {
         message: '功能正在开发中',
         type: 'warning'
       });
-    }
+    },
+    handleClick(item){
+      claim({uipId:item.uipId,companyName:item.companyName}).then(res => {
+        if(res.code === 200){
+          this.claimVisible=true;
+        }
+      })
+    },
   },
 }
 </script>
@@ -773,5 +788,43 @@ export default {
         }
       }
     }
+    ::v-deep .el-dialog{
+      width: 244px;
+      margin: 0 !important;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      .el-dialog__header{
+        display: none;
+      }
+      .el-dialog__body{
+        padding: 24px;
+      }
+      .el-dialog__footer{
+        text-align: center;
+        padding: 0 24px 24px;
+        .el-button{
+          width: 72px;
+          height: 28px;
+          border-radius: 2px;
+          font-size: 12px;
+        }
+        .el-button:first-child{
+          background: #0081FF;
+          border: 1px solid #0081FF;
+
+          color: #FFFFFF;
+        }
+        .el-button:last-child{
+          background: #FFFFFF;
+          border: 1px solid #CCCCCC;
+          color: rgba(35,35,35,0.8);
+        }
+        .el-button--medium{
+          padding: 0;
+        }
+      }
+    }
   }
 </style>

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -51,7 +51,7 @@ public class EnterpriseService {
     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();
+        if (200 != companyCode) return R.ok();
         Map companyData = MapUtils.getMap(companyMap, "data", null);
         companyData.put("claimStatus", 0);
         companyData.put("uipId", null);
@@ -113,6 +113,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);
     }
@@ -198,9 +199,7 @@ public class EnterpriseService {
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
             String uipId = MapUtils.getString(companyMap, "uipId");
-            if (CollectionUtils.isEmpty(claimStatusList)) {
-                companyMap.put("claimStatus", 0);
-            }
+            companyMap.put("claimStatus", 0);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (uipId.equals(vo.getUipId())) {
                     companyMap.put("claimStatus", 1);