Merge remote-tracking branch 'origin/master'

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

@@ -81,10 +81,11 @@ public class ApplicationPolicyController {
             @ApiImplicitParam(name="companyName",value = "企业名称",paramType = "query"),
             @ApiImplicitParam(name="insuredName",value = "投保人姓名",paramType = "query"),
             @ApiImplicitParam(name="status",value = "状态",paramType = "query"),
-            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query")
+            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query"),
+            @ApiImplicitParam(name="policyNo",value = "保险单号",paramType = "query")
     })
     public MessageResult<Map> otherPageList(
-            String definitionId,String status,String userType,
+            String definitionId,String status,String userType,String policyNo,
             String insuredName,String companyName,
             @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
             @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
@@ -132,6 +133,10 @@ public class ApplicationPolicyController {
             searchParams.put("endTime", endTime);
         }
 
+        if (StringUtils.isNotEmpty(policyNo)) {
+            searchParams.put("policyNo","%" + policyNo + "%");
+        }
+
         Page<ApplicationPolicy> page = applicationPolicyService.otherSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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

@@ -283,12 +283,13 @@ public class InsuranceApplicationController {
             @ApiImplicitParam(name="insuredName",value = "投保人姓名",paramType = "query"),
             @ApiImplicitParam(name="startTime",value = "开始时间",paramType = "query"),
             @ApiImplicitParam(name="endTime",value = "结束时间",paramType = "query"),
-            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query")
+            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query"),
+            @ApiImplicitParam(name="policyNo",value = "保险服务单号",paramType = "query")
     })
     public MessageResult<Map> pageList(
             String status,String definitionId,
             String insuredName,String companyName,
-            String startTime,String endTime,String userType,
+            String startTime,String endTime,String userType,String policyNo,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -333,6 +334,10 @@ public class InsuranceApplicationController {
             }
         }
 
+        if (StringUtils.isNotEmpty(policyNo)) {
+            searchParams.put("policyNo","%" + policyNo + "%");
+        }
+
         Page<InsuranceApplication> page = insuranceApplicationService.pageSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);

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

@@ -629,23 +629,32 @@ public class InsurancePolicyController {
         @RequestMapping(value = "rollbackOrder",method = RequestMethod.POST)
         @ApiImplicitParams({
                 @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
-                @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
+                @ApiImplicitParam(name="policyId",value = "每月投保单ID",paramType = "query"),
+                @ApiImplicitParam(name="status",value = "转单步骤",required = true,paramType = "query")
         })
-        public MessageResult<Integer> rollbackOrder(String applicationId,String policyId, @RequestAttribute String subject){
+        public MessageResult<Integer> rollbackOrder(String applicationId,String policyId,String status, @RequestAttribute String subject){
             //当前用户ID
             System.out.println(subject);
 
             MessageResult<Integer> msgResult = new MessageResult<>();
 
             try {
+                InsurancePolicy insurancePolicy;
 
-                InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
+                if(StringUtils.isNotEmpty(policyId)){
+                    insurancePolicy = insurancePolicyService.get(policyId);
+                }
+                else{
+                    List<ApplicationPolicy> applicationPolicyList = applicationPolicyService.findByApplicationId(applicationId);
+                    ApplicationPolicy applicationPolicy = applicationPolicyList.get(0);
+                    insurancePolicy = applicationPolicy.getPolicy();
+                }
 
                 PolicyStatus srcPolicyStatus = PolicyStatus.valueOf(Integer.valueOf(insurancePolicy.getStatus()));
 
-                PolicyStatus destPolicyStatus = PolicyStatus.PendingTrial;
+                PolicyStatus destPolicyStatus = PolicyStatus.valueOf(Integer.valueOf(status));
 
-                int affectCount = approval(applicationId, policyId, "回退", "", destPolicyStatus.getValue() + "", subject);
+                int affectCount = approval(applicationId, policyId, "回退", "", destPolicyStatus.getValue()+ "", subject);
 
                 //发送微信通知
                 templateMessageService.sendTemplateMessage(policyId, srcPolicyStatus, destPolicyStatus);
@@ -662,14 +671,21 @@ public class InsurancePolicyController {
         }
 
 
-
-
-
         private Integer approval(String applicationId,String policyId,String processStatus,String opinion,String status,String subject){
         int affectCount = 0;
 
         InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
-        InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
+
+        InsurancePolicy insurancePolicy;
+
+        if(StringUtils.isNotEmpty(policyId)){
+            insurancePolicy = insurancePolicyService.get(policyId);
+        }
+        else{
+            List<ApplicationPolicy> applicationPolicyList = applicationPolicyService.findByApplicationId(applicationId);
+            ApplicationPolicy applicationPolicy = applicationPolicyList.get(0);
+            insurancePolicy = applicationPolicy.getPolicy();
+        }
 
         String curStatus = insurancePolicy.getStatus();
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/UserController.java

@@ -365,8 +365,6 @@ public class UserController {
             msgResult.setMessage(ex.getMessage());
         }
 
-
-
         return msgResult;
     }
 }

picc-common/src/main/resources/mapper/business/ApplicationPolicy.xml

@@ -111,6 +111,9 @@
 			<if test="searchParams.insuredName != null">
 				and b.insured_name like #{searchParams.insuredName}
 			</if>
+			<if test="searchParams.policyNo != null">
+				and b.policy_no like #{searchParams.policyNo}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			a.${sort.name} ${sort.order}

picc-common/src/main/resources/mapper/business/InsuranceApplication.xml

@@ -250,6 +250,9 @@
             <if test="searchParams.userType != null">
                 and (status_='30' or status_='60' or status_='70')
             </if>
+            <if test="searchParams.policyNo != null">
+                and policy_no like #{searchParams.policyNo}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}