Merge remote-tracking branch 'origin/master'

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

@@ -311,7 +311,7 @@ public class InsuranceApplicationController {
 
         map.put("insuranceDefinitionLimitList",mapList);
 
-        List<Jobs> jobsList = jobsService.findByDefinitionId(definitionId);
+        List<Jobs> jobsList = jobsService.list();
 
         List<Map<String,Object>> mapList1 = new ArrayList<Map<String,Object>>();
 

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

@@ -6,6 +6,7 @@ import com.jpsoft.picc.modules.base.service.InsuranceAgentService;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyRecordService;
+import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
@@ -302,21 +303,24 @@ public class InsurancePolicyController {
     @ApiOperation(value="人才超市初审")
     @RequestMapping(value = "firstApproval",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="id",value = "每月投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query"),
             @ApiImplicitParam(name="processStatus",value = "流程审核状态（正常/回退）",required = true,paramType = "query"),
             @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query")
     })
-    public MessageResult<Integer> firstApproval(String id,String processStatus,String opinion, @RequestAttribute String subject){
+    public MessageResult<Integer> firstApproval(String applicationId,String policyId,String processStatus,String opinion, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        int affectCount1 = approval(id,processStatus,opinion,"50",subject);
+        String status = String.valueOf(PolicyStatus.PendingRetrial.getValue());
+
+        int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         msgResult.setResult(true);
-        msgResult.setData(affectCount1);
+        msgResult.setData(affectCount);
 
         return msgResult;
     }
@@ -325,21 +329,24 @@ public class InsurancePolicyController {
     @ApiOperation(value="PICC复审")
     @RequestMapping(value = "secondApproval",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="id",value = "每月投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query"),
             @ApiImplicitParam(name="processStatus",value = "流程审核状态（正常/回退）",required = true,paramType = "query"),
             @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query")
     })
-    public MessageResult<Integer> secondApproval(String id,String processStatus,String opinion, @RequestAttribute String subject){
+    public MessageResult<Integer> secondApproval(String applicationId,String policyId,String processStatus,String opinion, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        int affectCount1 = approval(id,processStatus,opinion,"60",subject);
+        String status = String.valueOf(PolicyStatus.PendingPay.getValue());
+
+        int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         msgResult.setResult(true);
-        msgResult.setData(affectCount1);
+        msgResult.setData(affectCount);
 
         return msgResult;
     }
@@ -348,79 +355,46 @@ public class InsurancePolicyController {
     @ApiOperation(value="PICC出单")
     @RequestMapping(value = "issued",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="id",value = "每月投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query"),
             @ApiImplicitParam(name="processStatus",value = "流程审核状态（正常/回退）",required = true,paramType = "query"),
             @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query")
     })
-    public MessageResult<Integer> issued(String id,String processStatus,String opinion, @RequestAttribute String subject){
+    public MessageResult<Integer> issued(String applicationId,String policyId,String processStatus,String opinion, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        int affectCount1 = approval(id,processStatus,opinion,"70",subject);
+        String status = String.valueOf(PolicyStatus.SendOutPolicy.getValue());
+
+        int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         msgResult.setResult(true);
-        msgResult.setData(affectCount1);
+        msgResult.setData(affectCount);
 
         return msgResult;
     }
 
-
-    private Integer approval(String id,String processStatus,String opinion,String status,String subject){
-
-        InsurancePolicy insurancePolicy = insurancePolicyService.get(id);
-
-        insurancePolicy.setProcessStatus(processStatus);
-        insurancePolicy.setStatus(status);
-
-        int affectCount = insurancePolicyService.update(insurancePolicy);
-
-        int affectCount1 = 0;
-
-        if(affectCount > 0){
-            InsurancePolicyRecord insurancePolicyRecord = new InsurancePolicyRecord();
-            insurancePolicyRecord.setPolicyId(insurancePolicy.getId());
-            insurancePolicyRecord.setOpinion(opinion);
-            insurancePolicyRecord.setProcessStatus(processStatus);
-            insurancePolicyRecord.setId(UUID.randomUUID().toString());
-            insurancePolicyRecord.setDelFlag(false);
-            insurancePolicyRecord.setCreateBy(subject);
-            insurancePolicyRecord.setCreateTime(new Date());
-
-            affectCount1 = insurancePolicyRecordService.insert(insurancePolicyRecord);
-        }
-        return affectCount1;
-    }
-
-
-
-
-
     @ApiOperation(value="企业缴费")
     @RequestMapping(value = "pay",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",required = true,paramType = "query"),
+            @ApiImplicitParam(name="processStatus",value = "流程审核状态（正常/回退）",required = true,paramType = "query"),
+            @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query")
     })
-    public MessageResult<Integer> pay(String applicationId,String policyId, @RequestAttribute String subject){
+    public MessageResult<Integer> pay(String applicationId,String policyId,String processStatus,String opinion, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
-
-        insuranceApplication.setStatus("50");//状态改为待出单
-
-        int affectCount = insuranceApplicationService.update(insuranceApplication);
+        String status = String.valueOf(PolicyStatus.PendingMakePolicy.getValue());
 
-        if(affectCount>0){
-            InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
-
-        }
+        int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         msgResult.setResult(true);
         msgResult.setData(affectCount);
@@ -435,20 +409,16 @@ public class InsurancePolicyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
     })
-    public MessageResult<Integer> transfer(String policyId, @RequestAttribute String subject){
+    public MessageResult<Integer> transfer(String applicationId,String policyId,String processStatus,String opinion, @RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Integer> msgResult = new MessageResult<>();
 
-        InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
-
-        insurancePolicy.setStatus("70");//已出单
+        String status = String.valueOf(PolicyStatus.PendingOutPolicy.getValue());
 
-        insurancePolicy.setTransferTime(new Date());
-
-        int affectCount = insurancePolicyService.update(insurancePolicy);
+        int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         msgResult.setResult(true);
         msgResult.setData(affectCount);
@@ -457,5 +427,42 @@ public class InsurancePolicyController {
     }
 
 
+    private Integer approval(String applicationId,String id,String processStatus,String opinion,String status,String subject){
+
+        int affectCount2 = 0;
+
+        InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+
+        insuranceApplication.setStatus(status);
+
+        int affectCount = insuranceApplicationService.update(insuranceApplication);
+
+        if(affectCount>0){
+            InsurancePolicy insurancePolicy = insurancePolicyService.get(id);
+
+            insurancePolicy.setProcessStatus(processStatus);
+            insurancePolicy.setStatus(status);
+
+            int affectCount1 = insurancePolicyService.update(insurancePolicy);
+
+            if(affectCount1 > 0){
+                InsurancePolicyRecord insurancePolicyRecord = new InsurancePolicyRecord();
+                insurancePolicyRecord.setPolicyId(insurancePolicy.getId());
+                insurancePolicyRecord.setOpinion(opinion);
+                insurancePolicyRecord.setProcessStatus(processStatus);
+                insurancePolicyRecord.setId(UUID.randomUUID().toString());
+                insurancePolicyRecord.setDelFlag(false);
+                insurancePolicyRecord.setCreateBy(subject);
+                insurancePolicyRecord.setCreateTime(new Date());
+
+                affectCount2 = insurancePolicyRecordService.insert(insurancePolicyRecord);
+            }
+        }
+
+
+        return affectCount2;
+    }
+
+
 
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/Jobs.java

@@ -34,10 +34,6 @@ public class Jobs {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
-
-	@ApiModelProperty(value = "险种关系列表")
-	private List<Jobs> jobsList;
-
     /**
 	 *获取编号
 	 */
@@ -165,20 +161,4 @@ public class Jobs {
 		this.updateTime = updateTime;
 	}
 
-	/**
-	 *获取险种关系列表
-	 */
-	public List<Jobs> getJobsList(){
-		return jobsList;
-	}
-
-	/**
-	 *设置险种关系列表
-	 */
-	public void setJobsList(List<Jobs> jobsList){
-		this.jobsList = jobsList;
-	}
-
-
-
 }