Merge branch 'master' of J:\IdeaProjects with conflicts.

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

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.base.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.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;

picc-admin-server/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:log4jdbc:mysql://127.0.0.1:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: root
+    password: 123456
   devtools:
     add-properties: false
     restart:
@@ -10,7 +10,7 @@ spring:
 
 logger:
   level: WARN
-  dir: H:\\projects\\picc\\logs\\picc-admin-server\\
+  dir: J:\\projects\\picc\\logs\\picc-admin-server\\
 
 oss:
   accessKeyId: LTAILGOo7bwpkvnq

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

@@ -30,7 +30,6 @@ public class InsuranceAgent {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
-<<<<<<< Updated upstream
 
 	/**
 =======
@@ -49,12 +48,9 @@ public class InsuranceAgent {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
 	/**
-=======
 	@ApiModelProperty(value = "姓名")
 		/**
->>>>>>> Stashed changes
 	 *获取姓名
 	 */
     	public String getName(){
@@ -67,12 +63,11 @@ public class InsuranceAgent {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
 	/**
-=======
+
 	@ApiModelProperty(value = "审核状态")
 		/**
->>>>>>> Stashed changes
+
 	 *获取审核状态
 	 */
     	public String getStatus(){
@@ -85,7 +80,6 @@ public class InsuranceAgent {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "是否删除")
@@ -103,7 +97,6 @@ public class InsuranceAgent {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "创建人")
@@ -136,7 +129,6 @@ public class InsuranceAgent {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "修改人")

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

@@ -35,7 +35,6 @@ public class InsuranceDefinition {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "编号")
@@ -53,7 +52,6 @@ public class InsuranceDefinition {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "险种")
@@ -71,7 +69,6 @@ public class InsuranceDefinition {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "投保声明")
@@ -89,7 +86,6 @@ public class InsuranceDefinition {
 	public void setInsuranceDescription(String insuranceDescription){
 		this.insuranceDescription = insuranceDescription;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "雇主责任险条款")
@@ -107,7 +103,6 @@ public class InsuranceDefinition {
 	public void setClause(String clause){
 		this.clause = clause;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "状态")
@@ -125,7 +120,6 @@ public class InsuranceDefinition {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "是否删除")
@@ -143,7 +137,6 @@ public class InsuranceDefinition {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "创建人")
@@ -176,7 +169,6 @@ public class InsuranceDefinition {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "修改人")

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

@@ -37,7 +37,6 @@ public class InsuranceDefinitionLimit {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "编号")
@@ -55,7 +54,6 @@ public class InsuranceDefinitionLimit {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "险种信息ID")
@@ -73,7 +71,6 @@ public class InsuranceDefinitionLimit {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "限额名称")
@@ -91,7 +88,6 @@ public class InsuranceDefinitionLimit {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "责任限额/免赔额")
@@ -109,7 +105,6 @@ public class InsuranceDefinitionLimit {
 	public void setLimit(String limit){
 		this.limit = limit;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "计算单位(次/元/人/万)")
@@ -127,7 +122,6 @@ public class InsuranceDefinitionLimit {
 	public void setUnit(String unit){
 		this.unit = unit;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "状态")
@@ -145,7 +139,6 @@ public class InsuranceDefinitionLimit {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "是否删除")
@@ -163,7 +156,6 @@ public class InsuranceDefinitionLimit {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "创建人")
@@ -196,7 +188,6 @@ public class InsuranceDefinitionLimit {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "修改人")

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

@@ -32,13 +32,9 @@ public class InsuranceJobs {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
-<<<<<<< Updated upstream
 
-	/**
-=======
 	@ApiModelProperty(value = "编号")
 		/**
->>>>>>> Stashed changes
 	 *获取编号
 	 */
     	public String getId(){
@@ -51,12 +47,8 @@ public class InsuranceJobs {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
 	@ApiModelProperty(value = "行业ID")
 		/**
->>>>>>> Stashed changes
 	 *获取行业ID
 	 */
     	public String getJobsId(){
@@ -69,13 +61,9 @@ public class InsuranceJobs {
 	public void setJobsId(String jobsId){
 		this.jobsId = jobsId;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
 
 	@ApiModelProperty(value = "险种信息ID")
 		/**
->>>>>>> Stashed changes
 	 *获取险种信息ID
 	 */
     	public String getDefinitionId(){
@@ -88,12 +76,9 @@ public class InsuranceJobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
+
 	@ApiModelProperty(value = "收费标准(月)")
 		/**
->>>>>>> Stashed changes
 	 *获取收费标准(月)
 	 */
     	public BigDecimal getCharges(){
@@ -106,12 +91,8 @@ public class InsuranceJobs {
 	public void setCharges(BigDecimal charges){
 		this.charges = charges;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
 	@ApiModelProperty(value = "是否删除")
 		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -124,12 +105,9 @@ public class InsuranceJobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
+
 	@ApiModelProperty(value = "创建人")
 		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -157,12 +135,9 @@ 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,6 @@ public class Jobs {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "编号")
@@ -53,7 +52,6 @@ public class Jobs {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "险种信息ID")
@@ -71,7 +69,6 @@ public class Jobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "名称")
@@ -89,7 +86,6 @@ public class Jobs {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "详细信息")
@@ -107,7 +103,6 @@ public class Jobs {
 	public void setContent(String content){
 		this.content = content;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "状态")
@@ -125,7 +120,6 @@ public class Jobs {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "是否删除")
@@ -143,7 +137,6 @@ public class Jobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "创建人")
@@ -176,7 +169,6 @@ public class Jobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
 	/**
 =======
 	@ApiModelProperty(value = "修改人")

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

@@ -9,7 +9,6 @@ import java.util.Map;
 
 @Repository
 public interface InsurancePolicyRecordDAO {
-<<<<<<< Updated upstream
     int insert(InsurancePolicyRecord entity);
 
     int update(InsurancePolicyRecord entity);
@@ -23,14 +22,6 @@ 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,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 
 public interface InsurancePolicyRecordService {
-<<<<<<< Updated upstream
     InsurancePolicyRecord get(String id);
 
     boolean exist(String id);
@@ -22,14 +21,7 @@ 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,7 +39,6 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
         return insurancePolicyRecordDAO.update(model);
     }
 
-<<<<<<< Updated upstream
     @Override
     public int delete(String id) {
         // TODO Auto-generated method stub
@@ -60,35 +59,15 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
         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);
-=======
-	@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;