Merge remote-tracking branch 'origin/master'

# Conflicts:
#	picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/JobsServiceImpl.java

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceJobsController.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.InsuranceJobsService;
 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;
@@ -69,7 +71,7 @@ public class InsuranceJobsController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+/*    @ApiOperation(value="获取信息")
     @GetMapping("edit/{id}")
     public MessageResult<InsuranceJobs> edit(@PathVariable("id") String id){
         MessageResult<InsuranceJobs> msgResult = new MessageResult<>();
@@ -122,7 +124,7 @@ public class InsuranceJobsController {
         }
 
         return msgResult;
-    }
+    }*/
 
 	@ApiOperation(value="删除")
     @PostMapping("delete/{id}")
@@ -156,7 +158,7 @@ public class InsuranceJobsController {
     }
 
 
-    @ApiOperation(value="批量删除")
+/*    @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
     public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
@@ -218,6 +220,28 @@ public class InsuranceJobsController {
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
+        return msgResult;
+    }*/
+
+
+
+    @ApiOperation(value="险种关联行业类型列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="definitionId",value = "险种信息ID",required = true,paramType = "query")
+    })
+    public MessageResult<List<InsuranceJobs>> list(String definitionId, @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<InsuranceJobs>> msgResult = new MessageResult<>();
+
+        List<InsuranceJobs> list = insuranceJobsService.listByDefinitionId(definitionId);
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
         return msgResult;
     }
 }

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

@@ -1,12 +1,22 @@
 package com.jpsoft.picc.modules.business.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
+import com.jpsoft.picc.modules.base.entity.InsuranceJobs;
+import com.jpsoft.picc.modules.base.entity.Jobs;
+import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
+import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
+import com.jpsoft.picc.modules.base.service.InsuranceJobsService;
+import com.jpsoft.picc.modules.base.service.JobsService;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
 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;
@@ -27,6 +37,18 @@ public class InsuranceApplicationController {
     @Autowired
     private InsuranceApplicationService insuranceApplicationService;
 
+    @Autowired
+    private InsuranceDefinitionService insuranceDefinitionService;
+
+    @Autowired
+    private InsuranceDefinitionLimitService insuranceDefinitionLimitService;
+
+    @Autowired
+    private JobsService jobsService;
+
+    @Autowired
+    private InsuranceJobsService insuranceJobsService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsuranceApplication> create(){
@@ -97,6 +119,36 @@ public class InsuranceApplicationController {
         return msgResult;
     }
 
+
+    @ApiOperation(value="获取投保信息")
+    @GetMapping("insureDetail/{id}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id",value = "投保信息ID",required = true,paramType = "query")
+    })
+    public MessageResult<InsuranceApplication> insureDetail(@PathVariable("id") String id){
+        MessageResult<InsuranceApplication> msgResult = new MessageResult<>();
+
+        try {
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(id);
+
+            if (insuranceApplication != null) {
+                msgResult.setResult(true);
+                msgResult.setData(insuranceApplication);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
     @ApiOperation(value="更新用户")
     @PostMapping("update")
     public MessageResult<InsuranceApplication> update(@RequestBody InsuranceApplication insuranceApplication,@RequestAttribute String subject){
@@ -222,4 +274,76 @@ public class InsuranceApplicationController {
 
         return msgResult;
     }
+
+
+
+    @ApiOperation(value="获取承保信息")
+    @RequestMapping(value = "acceptDetail",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="definitionId",value = "险种ID",required = true,paramType = "query")
+    })
+    public MessageResult<Map> acceptDetail(String definitionId, @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> map = new HashMap<String,Object>();
+
+        InsuranceDefinition insuranceDefinition = insuranceDefinitionService.get(definitionId);
+
+        map.put("id",insuranceDefinition.getId());
+        map.put("name",insuranceDefinition.getName());
+
+        List<InsuranceDefinitionLimit> insuranceDefinitionLimitList = insuranceDefinitionLimitService.findByDefinitionId(definitionId);
+
+        List<Map<String,Object>> mapList = new ArrayList<Map<String,Object>>();
+
+        for(InsuranceDefinitionLimit  insuranceDefinitionLimit:insuranceDefinitionLimitList){
+            Map<String,Object> map1 = new HashMap<String,Object>();
+            map1.put("id",insuranceDefinitionLimit.getId());
+            map1.put("name",insuranceDefinitionLimit.getName());
+            map1.put("limit",insuranceDefinitionLimit.getLimit());
+            map1.put("unit",insuranceDefinitionLimit.getUnit());
+            mapList.add(map1);
+        }
+
+        map.put("insuranceDefinitionLimitList",mapList);
+
+        List<Jobs> jobsList = jobsService.findByDefinitionId(definitionId);
+
+        List<Map<String,Object>> mapList1 = new ArrayList<Map<String,Object>>();
+
+        for (Jobs jobs:jobsList) {
+            Map<String,Object> map1 = new HashMap<String,Object>();
+            String jobId = jobs.getId();
+            map1.put("id",jobId);
+            map1.put("name",jobs.getName());
+            map1.put("content",jobs.getContent());
+
+            List<InsuranceJobs> insuranceJobsList = insuranceJobsService.findByDefinitionIdAndJobId(definitionId,jobId);
+
+            List<Map<String,Object>> mapList2 = new ArrayList<Map<String,Object>>();
+
+            for (InsuranceJobs insuranceJobs:insuranceJobsList) {
+                Map<String,Object> map2 = new HashMap<String,Object>();
+                map2.put("id",insuranceJobs.getId());
+                map2.put("charges",insuranceJobs.getCharges());
+
+                mapList2.add(map2);
+            }
+
+            map1.put("insuranceJobsList",mapList2);
+
+            mapList1.add(map1);
+        }
+
+        map.put("jobsList",mapList1);
+
+        msgResult.setResult(true);
+        msgResult.setData(map);
+
+        return msgResult;
+    }
 }

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

@@ -1,12 +1,16 @@
 package com.jpsoft.picc.modules.business.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceAgent;
+import com.jpsoft.picc.modules.base.service.InsuranceAgentService;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
 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;
@@ -27,6 +31,9 @@ public class InsurancePolicyController {
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
+    @Autowired
+    private InsuranceAgentService insuranceAgentService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsurancePolicy> create(){
@@ -222,4 +229,62 @@ public class InsurancePolicyController {
 
         return msgResult;
     }
+
+
+    @ApiOperation(value="读取附件")
+    @RequestMapping(value = "attachmentList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id",value = "每月投保单ID",required = true,paramType = "query")
+    })
+    public MessageResult<Map> attachmentList(String id, @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,String> map = new HashMap<String,String>();
+
+        InsurancePolicy insurancePolicy = insurancePolicyService.get(id);
+
+        String file = insurancePolicy.getInsurancePolicyFile();
+
+        String[] files = file.split(";");
+
+        if(files.length==2){
+            map.put("file1",files[0]);
+            map.put("file2",files[1]);
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(map);
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value="读取推广信息")
+    @RequestMapping(value = "LoadInsuranceAgent",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id",value = "每月投保单ID",required = true,paramType = "query")
+    })
+    public MessageResult<InsuranceAgent> LoadInsuranceAgent(String id, @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<InsuranceAgent> msgResult = new MessageResult<>();
+
+        InsurancePolicy insurancePolicy = insurancePolicyService.get(id);
+
+        String agentId = insurancePolicy.getAgentId();
+
+        InsuranceAgent insuranceAgent = insuranceAgentService.get(agentId);
+
+        msgResult.setResult(true);
+        msgResult.setData(insuranceAgent);
+
+        return msgResult;
+    }
 }

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

@@ -7,6 +7,8 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyRecordService;
 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;
@@ -222,4 +224,26 @@ public class InsurancePolicyRecordController {
 
         return msgResult;
     }
+
+
+
+    @ApiOperation(value="企业投保审批历史记录")
+    @RequestMapping(value = "historyList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="policy_id",value = "每月投保单申请ID",required = true,paramType = "query")
+    })
+    public MessageResult<List<InsurancePolicyRecord>> historyList(String policy_id,@RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<InsurancePolicyRecord>> msgResult = new MessageResult<>();
+
+        List<InsurancePolicyRecord> list = insurancePolicyRecordService.historyList(policy_id);
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/InsuranceDefinitionLimitDAO.java

@@ -14,5 +14,6 @@ public interface InsuranceDefinitionLimitDAO {
 	InsuranceDefinitionLimit get(String id);
 	int delete(String id);
 	List<InsuranceDefinitionLimit> list();
+	List<InsuranceDefinitionLimit> findByDefinitionId(String definitionId);
 	List<InsuranceDefinitionLimit> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/InsuranceJobsDAO.java

@@ -14,5 +14,7 @@ public interface InsuranceJobsDAO {
 	InsuranceJobs get(String id);
 	int delete(String id);
 	List<InsuranceJobs> list();
+	List<InsuranceJobs> listByDefinitionId(String definitionId);
+	List<InsuranceJobs> findByDefinitionIdAndJobId(String definitionId, String jobId);
 	List<InsuranceJobs> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/dao/JobsDAO.java

@@ -1,6 +1,8 @@
 package com.jpsoft.picc.modules.base.dao;
 
 import java.util.List;
+
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.base.entity.Jobs;
 import java.util.Map;
@@ -14,5 +16,6 @@ public interface JobsDAO {
 	Jobs get(String id);
 	int delete(String id);
 	List<Jobs> list();
+	List<Jobs> findByDefinitionId(String definitionId);
 	List<Jobs> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -30,8 +30,13 @@ public class InsuranceAgent {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+<<<<<<< Updated upstream
 
 	/**
+=======
+	@ApiModelProperty(value = "编号")
+		/**
+>>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -44,7 +49,12 @@ public class InsuranceAgent {
 	public void setId(String id){
 		this.id = id;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "姓名")
+		/**
+>>>>>>> Stashed changes
 	 *获取姓名
 	 */
     	public String getName(){
@@ -57,7 +67,12 @@ public class InsuranceAgent {
 	public void setName(String name){
 		this.name = name;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "审核状态")
+		/**
+>>>>>>> Stashed changes
 	 *获取审核状态
 	 */
     	public String getStatus(){
@@ -70,7 +85,12 @@ public class InsuranceAgent {
 	public void setStatus(String status){
 		this.status = status;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "是否删除")
+		/**
+>>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -83,7 +103,12 @@ public class InsuranceAgent {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "创建人")
+		/**
+>>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -111,7 +136,12 @@ public class InsuranceAgent {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "修改人")
+		/**
+>>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

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

@@ -35,7 +35,12 @@ public class InsuranceDefinition {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "编号")
+		/**
+>>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -48,7 +53,12 @@ public class InsuranceDefinition {
 	public void setId(String id){
 		this.id = id;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "险种")
+		/**
+>>>>>>> Stashed changes
 	 *获取险种
 	 */
     	public String getName(){
@@ -61,7 +71,12 @@ public class InsuranceDefinition {
 	public void setName(String name){
 		this.name = name;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "投保声明")
+		/**
+>>>>>>> Stashed changes
 	 *获取投保声明
 	 */
     	public String getInsuranceDescription(){
@@ -74,7 +89,12 @@ public class InsuranceDefinition {
 	public void setInsuranceDescription(String insuranceDescription){
 		this.insuranceDescription = insuranceDescription;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "雇主责任险条款")
+		/**
+>>>>>>> Stashed changes
 	 *获取雇主责任险条款
 	 */
     	public String getClause(){
@@ -87,7 +107,12 @@ public class InsuranceDefinition {
 	public void setClause(String clause){
 		this.clause = clause;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "状态")
+		/**
+>>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -100,7 +125,12 @@ public class InsuranceDefinition {
 	public void setStatus(String status){
 		this.status = status;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "是否删除")
+		/**
+>>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -113,7 +143,12 @@ public class InsuranceDefinition {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "创建人")
+		/**
+>>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -141,7 +176,12 @@ public class InsuranceDefinition {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "修改人")
+		/**
+>>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

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

@@ -37,7 +37,12 @@ public class InsuranceDefinitionLimit {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "编号")
+		/**
+>>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -50,7 +55,12 @@ public class InsuranceDefinitionLimit {
 	public void setId(String id){
 		this.id = id;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "险种信息ID")
+		/**
+>>>>>>> Stashed changes
 	 *获取险种信息ID
 	 */
     	public String getDefinitionId(){
@@ -63,7 +73,12 @@ public class InsuranceDefinitionLimit {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "限额名称")
+		/**
+>>>>>>> Stashed changes
 	 *获取限额名称
 	 */
     	public String getName(){
@@ -76,7 +91,12 @@ public class InsuranceDefinitionLimit {
 	public void setName(String name){
 		this.name = name;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "责任限额/免赔额")
+		/**
+>>>>>>> Stashed changes
 	 *获取责任限额/免赔额
 	 */
     	public String getLimit(){
@@ -89,7 +109,12 @@ public class InsuranceDefinitionLimit {
 	public void setLimit(String limit){
 		this.limit = limit;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "计算单位(次/元/人/万)")
+		/**
+>>>>>>> Stashed changes
 	 *获取计算单位(次/元/人/万)
 	 */
     	public String getUnit(){
@@ -102,7 +127,12 @@ public class InsuranceDefinitionLimit {
 	public void setUnit(String unit){
 		this.unit = unit;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "状态")
+		/**
+>>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -115,7 +145,12 @@ public class InsuranceDefinitionLimit {
 	public void setStatus(String status){
 		this.status = status;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "是否删除")
+		/**
+>>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -128,7 +163,12 @@ public class InsuranceDefinitionLimit {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "创建人")
+		/**
+>>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -156,7 +196,12 @@ public class InsuranceDefinitionLimit {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "修改人")
+		/**
+>>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

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

@@ -32,8 +32,13 @@ public class InsuranceJobs {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+<<<<<<< Updated upstream
 
 	/**
+=======
+	@ApiModelProperty(value = "编号")
+		/**
+>>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -46,7 +51,12 @@ public class InsuranceJobs {
 	public void setId(String id){
 		this.id = id;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "行业ID")
+		/**
+>>>>>>> Stashed changes
 	 *获取行业ID
 	 */
     	public String getJobsId(){
@@ -59,7 +69,13 @@ public class InsuranceJobs {
 	public void setJobsId(String jobsId){
 		this.jobsId = jobsId;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+
+	@ApiModelProperty(value = "险种信息ID")
+		/**
+>>>>>>> Stashed changes
 	 *获取险种信息ID
 	 */
     	public String getDefinitionId(){
@@ -72,7 +88,12 @@ public class InsuranceJobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "收费标准(月)")
+		/**
+>>>>>>> Stashed changes
 	 *获取收费标准(月)
 	 */
     	public BigDecimal getCharges(){
@@ -85,7 +106,12 @@ public class InsuranceJobs {
 	public void setCharges(BigDecimal charges){
 		this.charges = charges;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "是否删除")
+		/**
+>>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -98,7 +124,12 @@ public class InsuranceJobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "创建人")
+		/**
+>>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -126,7 +157,12 @@ public class InsuranceJobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "修改人")
+		/**
+>>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

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

@@ -35,7 +35,12 @@ public class Jobs {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "编号")
+		/**
+>>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -48,7 +53,12 @@ public class Jobs {
 	public void setId(String id){
 		this.id = id;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "险种信息ID")
+		/**
+>>>>>>> Stashed changes
 	 *获取险种信息ID
 	 */
     	public String getDefinitionId(){
@@ -61,7 +71,12 @@ public class Jobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "名称")
+		/**
+>>>>>>> Stashed changes
 	 *获取名称
 	 */
     	public String getName(){
@@ -74,7 +89,12 @@ public class Jobs {
 	public void setName(String name){
 		this.name = name;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "详细信息")
+		/**
+>>>>>>> Stashed changes
 	 *获取详细信息
 	 */
     	public String getContent(){
@@ -87,7 +107,12 @@ public class Jobs {
 	public void setContent(String content){
 		this.content = content;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "状态")
+		/**
+>>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -100,7 +125,12 @@ public class Jobs {
 	public void setStatus(String status){
 		this.status = status;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "是否删除")
+		/**
+>>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -113,7 +143,12 @@ public class Jobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "创建人")
+		/**
+>>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -141,7 +176,12 @@ public class Jobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+<<<<<<< Updated upstream
 	/**
+=======
+	@ApiModelProperty(value = "修改人")
+		/**
+>>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/InsuranceDefinitionLimitService.java

@@ -13,5 +13,6 @@ public interface InsuranceDefinitionLimitService {
 	int update(InsuranceDefinitionLimit model);
 	int delete(String id);
 	List<InsuranceDefinitionLimit> list();
+	List<InsuranceDefinitionLimit> findByDefinitionId(String definitionId);
 	Page<InsuranceDefinitionLimit> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/InsuranceJobsService.java

@@ -13,5 +13,7 @@ public interface InsuranceJobsService {
 	int update(InsuranceJobs model);
 	int delete(String id);
 	List<InsuranceJobs> list();
+	List<InsuranceJobs> listByDefinitionId(String definitionId);
+	List<InsuranceJobs> findByDefinitionIdAndJobId(String definitionId, String jobId);
 	Page<InsuranceJobs> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/JobsService.java

@@ -13,5 +13,6 @@ public interface JobsService {
 	int update(Jobs model);
 	int delete(String id);
 	List<Jobs> list();
+	List<Jobs> findByDefinitionId(String definitionId);
 	Page<Jobs> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/InsuranceDefinitionLimitServiceImpl.java

@@ -58,6 +58,11 @@ public class InsuranceDefinitionLimitServiceImpl implements InsuranceDefinitionL
 		// TODO Auto-generated method stub
 		return insuranceDefinitionLimitDAO.list();
 	}
+
+	@Override
+	public List<InsuranceDefinitionLimit> findByDefinitionId(String definitionId){
+		return insuranceDefinitionLimitDAO.findByDefinitionId(definitionId);
+	}
 		
 	@Override
 	public Page<InsuranceDefinitionLimit> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/InsuranceJobsServiceImpl.java

@@ -58,6 +58,16 @@ public class InsuranceJobsServiceImpl implements InsuranceJobsService {
 		// TODO Auto-generated method stub
 		return insuranceJobsDAO.list();
 	}
+
+	@Override
+	public List<InsuranceJobs> listByDefinitionId(String definitionId){
+		return insuranceJobsDAO.listByDefinitionId(definitionId);
+	}
+
+	@Override
+	public List<InsuranceJobs> findByDefinitionIdAndJobId(String definitionId, String jobId){
+		return insuranceJobsDAO.findByDefinitionIdAndJobId(definitionId,jobId);
+	}
 		
 	@Override
 	public Page<InsuranceJobs> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/JobsServiceImpl.java

@@ -58,6 +58,11 @@ public class JobsServiceImpl implements JobsService {
 		// TODO Auto-generated method stub
 		return jobsDAO.list();
 	}
+
+	@Override
+	public List<Jobs> findByDefinitionId(String definitionId){
+		return jobsDAO.findByDefinitionId(definitionId);
+	}
 		
 	@Override
 	public Page<Jobs> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {

picc-common/src/main/java/com/jpsoft/picc/modules/business/dao/InsurancePolicyRecordDAO.java

@@ -9,6 +9,7 @@ import java.util.Map;
 
 @Repository
 public interface InsurancePolicyRecordDAO {
+<<<<<<< Updated upstream
     int insert(InsurancePolicyRecord entity);
 
     int update(InsurancePolicyRecord entity);
@@ -22,4 +23,14 @@ public interface InsurancePolicyRecordDAO {
     List<InsurancePolicyRecord> list();
 
     List<InsurancePolicyRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
+=======
+	int insert(InsurancePolicyRecord entity);
+	int update(InsurancePolicyRecord entity);
+	int exist(String id);
+	InsurancePolicyRecord get(String id);
+	int delete(String id);
+	List<InsurancePolicyRecord> list();
+	List<InsurancePolicyRecord> historyList(String policy_id);
+	List<InsurancePolicyRecord> search(Map<String,Object> searchParams,List<Sort> sortList);
+>>>>>>> Stashed changes
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/service/InsurancePolicyRecordService.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface InsurancePolicyRecordService {
+<<<<<<< Updated upstream
     InsurancePolicyRecord get(String id);
 
     boolean exist(String id);
@@ -21,4 +22,14 @@ public interface InsurancePolicyRecordService {
     List<InsurancePolicyRecord> list();
 
     Page<InsurancePolicyRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
+=======
+	InsurancePolicyRecord get(String id);
+	boolean exist(String id);
+	int insert(InsurancePolicyRecord model);
+	int update(InsurancePolicyRecord model);
+	int delete(String id);
+	List<InsurancePolicyRecord> list();
+	List<InsurancePolicyRecord> historyList(String policy_id);
+	Page<InsurancePolicyRecord> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+>>>>>>> Stashed changes
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/service/impl/InsurancePolicyRecordServiceImpl.java

@@ -39,6 +39,7 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
         return insurancePolicyRecordDAO.update(model);
     }
 
+<<<<<<< Updated upstream
     @Override
     public int delete(String id) {
         // TODO Auto-generated method stub
@@ -63,6 +64,31 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
     public Page<InsurancePolicyRecord> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
         Page<InsurancePolicyRecord> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
             insurancePolicyRecordDAO.search(searchParams, sortList);
+=======
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = insurancePolicyRecordDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+
+	@Override
+	public List<InsurancePolicyRecord> historyList(String policy_id){
+		return insurancePolicyRecordDAO.historyList(policy_id);
+	}
+	
+	@Override
+	public List<InsurancePolicyRecord> list() {
+		// TODO Auto-generated method stub
+		return insurancePolicyRecordDAO.list();
+	}
+		
+	@Override
+	public Page<InsurancePolicyRecord> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
+        Page<InsurancePolicyRecord> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+            insurancePolicyRecordDAO.search(searchParams,sortList);
+>>>>>>> Stashed changes
         });
 
         return page;

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

@@ -90,6 +90,9 @@ id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,upda
 	<select id="list" resultMap="InsuranceDefinitionLimitMap">
 		select * from base_insurance_definition_limit
 	</select>
+	<select id="findByDefinitionId" parameterType="string" resultMap="InsuranceDefinitionLimitMap">
+		select * from base_insurance_definition_limit where definition_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsuranceDefinitionLimitMap">
 		<![CDATA[
 			select * from base_insurance_definition_limit

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

@@ -78,7 +78,13 @@ id_,jobs_id,definition_id,charges_,del_flag,create_by,create_time,update_by,upda
 		select count(*) from base_insurance_jobs where id_=#{0}
 	</select>
 	<select id="list" resultMap="InsuranceJobsMap">
-		select * from base_insurance_jobs
+	select * from base_insurance_jobs
+	</select>
+	<select id="listByDefinitionId" parameterType="string" resultMap="InsuranceJobsMap">
+		select * from base_insurance_jobs where definition_id=#{0}
+	</select>
+	<select id="findByDefinitionIdAndJobId" parameterType="string" resultMap="InsuranceJobsMap">
+		select * from base_insurance_jobs where definition_id=#{definitionId,jdbcType=VARCHAR} and jobs_id=#{jobId,jdbcType=VARCHAR}
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsuranceJobsMap">
 		<![CDATA[

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

@@ -85,6 +85,9 @@ id_,definition_id,name_,content_,status_,del_flag,create_by,create_time,update_b
 	<select id="list" resultMap="JobsMap">
 		select * from base_jobs
 	</select>
+	<select id="findByDefinitionId" parameterType="string" resultMap="JobsMap">
+		select * from base_jobs where definition_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="JobsMap">
 		<![CDATA[
 			select * from base_jobs

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

@@ -80,6 +80,9 @@ id_,policy_id,opinion_,process_status,del_flag,create_by,create_time,update_by,u
 	<select id="list" resultMap="InsurancePolicyRecordMap">
 		select * from business_insurance_policy_record
 	</select>
+	<select id="historyList" parameterType="string" resultMap="InsurancePolicyRecordMap">
+		select * from business_insurance_policy_record where policy_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsurancePolicyRecordMap">
 		<![CDATA[
 			select * from business_insurance_policy_record