接口增加流程回退

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

@@ -320,7 +320,16 @@ public class InsurancePolicyController {
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        String status = String.valueOf(PolicyStatus.PendingRetrial.getValue());
+        String status ="";
+
+        if(processStatus.equals("正常")){
+            //30
+            status = String.valueOf(PolicyStatus.PendingRetrial.getValue());
+        }
+        else{
+            //15
+            status = String.valueOf(PolicyStatus.Back.getValue());
+        }
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
@@ -346,7 +355,16 @@ public class InsurancePolicyController {
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        String status = String.valueOf(PolicyStatus.PendingPay.getValue());
+        String status ="";
+
+        if(processStatus.equals("正常")){
+            //40
+            status = String.valueOf(PolicyStatus.PendingPay.getValue());
+        }
+        else{
+            //20
+            status = String.valueOf(PolicyStatus.PendingTrial.getValue());
+        }
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
@@ -373,7 +391,16 @@ public class InsurancePolicyController {
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        String status = String.valueOf(PolicyStatus.SendOutPolicy.getValue());
+        String status ="";
+
+        if(processStatus.equals("正常")){
+            //70
+            status = String.valueOf(PolicyStatus.SendOutPolicy.getValue());
+        }
+        else{
+            //50
+            status = String.valueOf(PolicyStatus.PendingMakePolicy.getValue());
+        }
 
         if(StringUtils.isNotEmpty(insurancePolicyFile)){
 
@@ -389,9 +416,8 @@ public class InsurancePolicyController {
         boolean flag = false;
         String msg = "";
 
-        if(affectCount>0){
+        if(affectCount > 0 && processStatus.equals("正常")){
             //生成下月投保单
-
             try {
                 generatePolicyInTrans(applicationId, policyId, subject);
                 flag = true;
@@ -426,7 +452,16 @@ public class InsurancePolicyController {
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        String status = String.valueOf(PolicyStatus.PendingMakePolicy.getValue());
+        String status ="";
+
+        if(processStatus.equals("正常")){
+            //50
+            status = String.valueOf(PolicyStatus.PendingMakePolicy.getValue());
+        }
+        else{
+            //30
+            status = String.valueOf(PolicyStatus.PendingRetrial.getValue());
+        }
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
@@ -458,7 +493,16 @@ public class InsurancePolicyController {
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        String status = String.valueOf(PolicyStatus.PendingOutPolicy.getValue());
+        String status ="";
+
+        if(processStatus.equals("正常")){
+            //60
+            status = String.valueOf(PolicyStatus.PendingOutPolicy.getValue());
+        }
+        else{
+            //40
+            status = String.valueOf(PolicyStatus.PendingPay.getValue());
+        }
 
         InsurancePolicy item = insurancePolicyService.get(policyId);