1.修改企业端投保标签统计

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/AttachmentController.java

@@ -289,11 +289,13 @@ public class AttachmentController {
                 Company company = companyService.get(insuranceApplication.getCompanyId());
                 String url = company.getUsccFiles();
 
-                Map<String,String> fileMap = new HashMap<>();
-                fileMap.put("fileUrl", url);
-                fileMap.put("fileName", "营业执照" + url.substring(url.lastIndexOf(".")));
+                if(StringUtils.isNotEmpty(url)) {
+                    Map<String, String> fileMap = new HashMap<>();
+                    fileMap.put("fileUrl", url);
+                    fileMap.put("fileName", "营业执照" + url.substring(url.lastIndexOf(".")));
 
-                fileList.add(fileMap);
+                    fileList.add(fileMap);
+                }
             }
 
             //电子投保文件

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsuranceApplicationController.java

@@ -611,7 +611,7 @@ public class InsuranceApplicationController {
         Company company = companyService.findByCreateBy(principal.getName());
 
         MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String, Object> status = new HashMap<>();
+        Map<String, Object> dataMap = new HashMap<>();
 
         try {
             Map<String, Object> searchParams = new HashMap<>();
@@ -635,49 +635,14 @@ public class InsuranceApplicationController {
                 searchParams.put("endTime", endTime);
             }
 
-            Integer Draft = 0;Integer Back = 0;Integer PendingTrial = 0;Integer PendingRetrial = 0;Integer PendingPay = 0;
-            Integer PendingMakePolicy = 0;Integer PendingOutPolicy = 0;Integer SendOutPolicy = 0;Integer Expired = 0;
-            Page<InsuranceApplication> page = insuranceApplicationService.pageSearch(searchParams, 1, 1000, sortList);
-            for(InsuranceApplication insuranceApplication : page.getResult()){
-                if(insuranceApplication.getStatus().equals(PolicyStatus.Draft.getValue())){
-                    Draft++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.Back.getValue())){
-                    Back++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.PendingTrial.getValue())){
-                    PendingTrial++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.PendingRetrial.getValue())){
-                    PendingRetrial++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.PendingPay.getValue())){
-                    PendingPay++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.PendingMakePolicy.getValue())){
-                    PendingMakePolicy++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.PendingOutPolicy.getValue())){
-                    PendingOutPolicy++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.SendOutPolicy.getValue())){
-                    SendOutPolicy++;
-                }
-                if(insuranceApplication.getStatus().equals(PolicyStatus.Expired.getValue())){
-                    Expired++;
-                }
+            for(PolicyStatus policyStatus : PolicyStatus.values()){
+                searchParams.put("status", policyStatus.getValue() + "");
+                Page<InsuranceApplication> page = insuranceApplicationService.pageSearch(searchParams, 1, 1, sortList);
+
+                dataMap.put(policyStatus.getValue() + "", page.getTotal());
             }
-            status.put(PolicyStatus.Draft.getText(),Draft);
-            status.put(PolicyStatus.Back.getText(),Back);
-            status.put(PolicyStatus.PendingTrial.getText(),PendingTrial);
-            status.put(PolicyStatus.PendingRetrial.getText(),PendingRetrial);
-            status.put(PolicyStatus.PendingPay.getText(),PendingPay);
-            status.put(PolicyStatus.PendingMakePolicy.getText(),PendingMakePolicy);
-            status.put(PolicyStatus.PendingOutPolicy.getText(),PendingOutPolicy);
-            status.put(PolicyStatus.SendOutPolicy.getText(),SendOutPolicy);
-            status.put(PolicyStatus.Expired.getText(),Expired);
-
-            msgResult.setData(status);
+
+            msgResult.setData(dataMap);
             msgResult.setResult(true);
         }
         catch(Exception ex){

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java

@@ -506,7 +506,7 @@ public class InsurancePolicyController {
                                        @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
                                        HttpServletRequest request){
         MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String, Object> status = new HashMap<>();
+        Map<String, Object> dataMap = new HashMap<>();
 
         try {
             AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
@@ -533,49 +533,14 @@ public class InsurancePolicyController {
                 searchParams.put("endTime", endTime);
             }
 
-            Integer Draft = 0;Integer Back = 0;Integer PendingTrial = 0;Integer PendingRetrial = 0;Integer PendingPay = 0;
-            Integer PendingMakePolicy = 0;Integer PendingOutPolicy = 0;Integer SendOutPolicy = 0;Integer Expired = 0;
-            Page<InsurancePolicy> page = insurancePolicyService.nextMonthPageList(searchParams, 1, 1000,sortList);
-            for(InsurancePolicy insurancePolicy : page.getResult()){
-                if(insurancePolicy.getStatus().equals(PolicyStatus.Draft.getValue())){
-                    Draft++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.Back.getValue())){
-                    Back++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.PendingTrial.getValue())){
-                    PendingTrial++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.PendingRetrial.getValue())){
-                    PendingRetrial++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.PendingPay.getValue())){
-                    PendingPay++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.PendingMakePolicy.getValue())){
-                    PendingMakePolicy++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.PendingOutPolicy.getValue())){
-                    PendingOutPolicy++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.SendOutPolicy.getValue())){
-                    SendOutPolicy++;
-                }
-                if(insurancePolicy.getStatus().equals(PolicyStatus.Expired.getValue())){
-                    Expired++;
-                }
+            for(PolicyStatus policyStatus : PolicyStatus.values()) {
+                searchParams.put("status", policyStatus.getValue() + "");
+                Page<InsurancePolicy> page = insurancePolicyService.nextMonthPageList(searchParams, 1, 1000, sortList);
+
+                dataMap.put(policyStatus.getValue() + "", page.getTotal());
             }
-            status.put(PolicyStatus.Draft.getText(),Draft);
-            status.put(PolicyStatus.Back.getText(),Back);
-            status.put(PolicyStatus.PendingTrial.getText(),PendingTrial);
-            status.put(PolicyStatus.PendingRetrial.getText(),PendingRetrial);
-            status.put(PolicyStatus.PendingPay.getText(),PendingPay);
-            status.put(PolicyStatus.PendingMakePolicy.getText(),PendingMakePolicy);
-            status.put(PolicyStatus.PendingOutPolicy.getText(),PendingOutPolicy);
-            status.put(PolicyStatus.SendOutPolicy.getText(),SendOutPolicy);
-            status.put(PolicyStatus.Expired.getText(),Expired);
-
-            msgResult.setData(status);
+
+            msgResult.setData(dataMap);
             msgResult.setResult(true);
         }
         catch(Exception ex){