Merge remote-tracking branch 'origin/master'

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

@@ -196,7 +196,7 @@ public class InsuranceAgentController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name="name",value = "姓名",required = true,paramType = "query")
+            @ApiImplicitParam(name="name",value = "姓名",paramType = "query")
     })
     public MessageResult<Map> pageList(
             String name,

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

@@ -7,6 +7,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -193,8 +195,11 @@ public class InsuranceDefinitionController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="name",value = "名称",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,8 +214,8 @@ public class InsuranceDefinitionController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<InsuranceDefinition> page = insuranceDefinitionService.pageSearch(searchParams,pageIndex,pageSize,sortList);

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

@@ -8,6 +8,8 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -194,8 +196,11 @@ public class InsuranceDefinitionLimitController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="name",value = "险种限额名称",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -210,8 +215,8 @@ public class InsuranceDefinitionLimitController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<InsuranceDefinitionLimit> page = insuranceDefinitionLimitService.pageSearch(searchParams,pageIndex,pageSize,sortList);

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

@@ -195,8 +195,12 @@ public class InsuranceJobsController {
 
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="jobsId",value = "行业ID",paramType = "query"),
+            @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query")
+    })
     public MessageResult<Map> pageList(
-            String id,
+            String jobsId,String definitionId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -211,8 +215,12 @@ public class InsuranceJobsController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(jobsId)) {
+            searchParams.put("jobsId",jobsId);
+        }
+
+        if (StringUtils.isNotEmpty(definitionId)) {
+            searchParams.put("definitionId",definitionId);
         }
 
         Page<InsuranceJobs> page = insuranceJobsService.pageSearch(searchParams,pageIndex,pageSize,sortList);

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

@@ -194,7 +194,7 @@ public class JobsController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -209,8 +209,8 @@ public class JobsController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
         Page<Jobs> page = jobsService.pageSearch(searchParams,pageIndex,pageSize,sortList);

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);
 
@@ -363,25 +381,43 @@ public class InsurancePolicyController {
             @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")
+            @ApiImplicitParam(name="opinion",value = "意见",required = true,paramType = "query"),
+            @ApiImplicitParam(name="insurancePolicyFile",value = "投保单附件",required = true,paramType = "query")
     })
-    public MessageResult<Integer> issued(String applicationId,String policyId,String processStatus,String opinion,@RequestAttribute String subject){
+    public MessageResult<Integer> issued(String applicationId,String policyId,String processStatus,String opinion,String insurancePolicyFile,@RequestAttribute String subject){
 
         //当前用户ID
         System.out.println(subject);
 
         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)){
+
+            InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
+
+            insurancePolicy.setInsurancePolicyFile(insurancePolicyFile);
+
+            insurancePolicyService.update(insurancePolicy);
+        }
 
         int affectCount = approval(applicationId,policyId,processStatus,opinion,status ,subject);
 
         boolean flag = false;
         String msg = "";
 
-        if(affectCount>0){
+        if(affectCount > 0 && processStatus.equals("正常")){
             //生成下月投保单
-
             try {
                 generatePolicyInTrans(applicationId, policyId, subject);
                 flag = true;
@@ -416,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);
 
@@ -448,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);
 

picc-common/src/main/resources/mapper/base/InsuranceDefinition.xml

@@ -91,8 +91,8 @@ id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,u
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

picc-common/src/main/resources/mapper/base/InsuranceDefinitionLimit.xml

@@ -114,8 +114,8 @@ id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,upda
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

picc-common/src/main/resources/mapper/base/InsuranceJobs.xml

@@ -95,10 +95,10 @@ id_,jobs_id,definition_id,charges_,del_flag,create_by,create_time,update_by,upda
 		<where>
 			and del_flag = false
 			<if test="searchParams.jobsId != null">
-				and jobs_id like #{searchParams.jobsId}
+				and jobs_id = #{searchParams.jobsId}
 			</if>
 			<if test="searchParams.definitionId != null">
-				and definition_id like #{searchParams.definitionId}
+				and definition_id = #{searchParams.definitionId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

picc-common/src/main/resources/mapper/base/Jobs.xml

@@ -86,8 +86,8 @@ id_,name_,content_,status_,del_flag,create_by,create_time,update_by,update_time
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">