1.手动提交修改下月投保单状态逻辑完善。

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -726,31 +726,6 @@ public class InsurancePolicyController {
 
         destPolicy.setStartTime(startTime.toDate());
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());
-
-        //下月状态为待初审
-//        destPolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
-        List<InsurancePolicyMember> insurancePolicyMemberList = insurancePolicyMemberService.findByPolicyId(srcPolicy.getId());
-
-        boolean isUnChecked = false;
-
-        for (InsurancePolicyMember insurancePolicyMember:insurancePolicyMemberList) {
-            String memberStatus = insurancePolicyMember.getStatus();
-            //花名册人员是否为已复核状态
-            if(!("2").equals(memberStatus)){
-                isUnChecked = true;
-                break;
-            }
-        }
-
-        if(isUnChecked){
-            //有未复核人员
-            destPolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
-        }
-        else{
-            //所有人员都已复核
-            destPolicy.setStatus(PolicyStatus.PendingMakePolicy.getValue() + "");
-        }
-
         destPolicy.setEffectiveDate(startTime.toString("yyyyMM"));
 
         //todo 相同企业、相同险种、截止时间相同 是否已经有下月参保记录(状态为草稿)
@@ -868,6 +843,29 @@ public class InsurancePolicyController {
         //更新下月投保单的参保人数和参保费用
         insurancePolicy.setInsuranceFee(totalAmount);
         insurancePolicy.setNumber((int)totalNumber);
+
+        List<InsurancePolicyMember> insurancePolicyMemberList = insurancePolicyMemberService.findByPolicyId(insurancePolicy.getId());
+
+        boolean isUnChecked = false;
+
+        for (InsurancePolicyMember insurancePolicyMember:insurancePolicyMemberList) {
+            String memberStatus = insurancePolicyMember.getStatus();
+            //花名册人员是否为已复核状态
+            if(!("2").equals(memberStatus)){
+                isUnChecked = true;
+                break;
+            }
+        }
+
+        if(isUnChecked){
+            //有未复核人员
+            insurancePolicy.setStatus(PolicyStatus.PendingTrial.getValue() + "");
+        }
+        else{
+            //所有人员都已复核
+            insurancePolicy.setStatus(PolicyStatus.PendingMakePolicy.getValue() + "");
+        }
+
         insurancePolicy.setUpdateTime(new Date());
         insurancePolicy.setUpdateBy(subject);
 

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/OSSUtil.java

@@ -46,13 +46,17 @@ public class OSSUtil {
 
         String retFileUrl = savePath + fileName;
 
-        if(ossClient.doesObjectExist(ossConfig.getBucketName(), retFileUrl)){
-            String ext = fileName.substring(fileName.indexOf("."));
+//        if(ossClient.doesObjectExist(ossConfig.getBucketName(), retFileUrl)){
+            int index = fileName.indexOf(".");
 
-            String newFileName = DateTime.now().toString("yyyyMMddHHmmssSSS") + ext;
+            String prefix = fileName.substring(0,index);
+
+            String ext = fileName.substring(index);
+
+            String newFileName = prefix + DateTime.now().toString("ddHHmmssSSS") + ext;
 
             retFileUrl = savePath + newFileName;
-        }
+//        }
 
         // 上传文件流
         PutObjectResult result = ossClient.putObject(ossConfig.getBucketName(), retFileUrl, fileInputStream);