更新实体和service类注释

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

@@ -30,13 +30,8 @@ public class InsuranceAgent {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
-<<<<<<< Updated upstream
 
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
     	public String getId(){
@@ -49,12 +44,8 @@ public class InsuranceAgent {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "姓名")
-		/**
->>>>>>> Stashed changes
 	 *获取姓名
 	 */
     	public String getName(){
@@ -67,12 +58,8 @@ public class InsuranceAgent {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "审核状态")
-		/**
->>>>>>> Stashed changes
 	 *获取审核状态
 	 */
     	public String getStatus(){
@@ -85,12 +72,8 @@ public class InsuranceAgent {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -103,12 +86,8 @@ public class InsuranceAgent {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -136,12 +115,9 @@ 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,12 +35,7 @@ public class InsuranceDefinition {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-<<<<<<< Updated upstream
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
     	public String getId(){
@@ -53,12 +48,8 @@ public class InsuranceDefinition {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "险种")
-		/**
->>>>>>> Stashed changes
 	 *获取险种
 	 */
     	public String getName(){
@@ -71,12 +62,7 @@ public class InsuranceDefinition {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
 	/**
-=======
-	@ApiModelProperty(value = "投保声明")
-		/**
->>>>>>> Stashed changes
 	 *获取投保声明
 	 */
     	public String getInsuranceDescription(){
@@ -89,12 +75,8 @@ public class InsuranceDefinition {
 	public void setInsuranceDescription(String insuranceDescription){
 		this.insuranceDescription = insuranceDescription;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "雇主责任险条款")
-		/**
->>>>>>> Stashed changes
 	 *获取雇主责任险条款
 	 */
     	public String getClause(){
@@ -107,12 +89,8 @@ public class InsuranceDefinition {
 	public void setClause(String clause){
 		this.clause = clause;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "状态")
-		/**
->>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -125,12 +103,8 @@ public class InsuranceDefinition {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -143,15 +117,11 @@ public class InsuranceDefinition {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
-    	public String getCreateBy(){
+	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -176,15 +146,11 @@ public class InsuranceDefinition {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "修改人")
-		/**
->>>>>>> Stashed changes
 	 *获取修改人
 	 */
-    	public String getUpdateBy(){
+	public String getUpdateBy(){
 		return updateBy;
 	}
 	

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

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

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

@@ -32,16 +32,11 @@ public class InsuranceJobs {
 	private String updateBy;
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
-<<<<<<< Updated upstream
 
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
-    	public String getId(){
+    public String getId(){
 		return id;
 	}
 	
@@ -51,15 +46,11 @@ public class InsuranceJobs {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "行业ID")
-		/**
->>>>>>> Stashed changes
 	 *获取行业ID
 	 */
-    	public String getJobsId(){
+	public String getJobsId(){
 		return jobsId;
 	}
 	
@@ -69,16 +60,11 @@ public class InsuranceJobs {
 	public void setJobsId(String jobsId){
 		this.jobsId = jobsId;
 	}
-<<<<<<< Updated upstream
-	/**
-=======
 
-	@ApiModelProperty(value = "险种信息ID")
-		/**
->>>>>>> Stashed changes
+	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
+	public String getDefinitionId(){
 		return definitionId;
 	}
 	
@@ -88,15 +74,11 @@ public class InsuranceJobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "收费标准(月)")
-		/**
->>>>>>> Stashed changes
 	 *获取收费标准(月)
 	 */
-    	public BigDecimal getCharges(){
+	public BigDecimal getCharges(){
 		return charges;
 	}
 	
@@ -106,15 +88,11 @@ public class InsuranceJobs {
 	public void setCharges(BigDecimal charges){
 		this.charges = charges;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
-    	public Boolean getDelFlag(){
+	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -124,15 +102,11 @@ public class InsuranceJobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
-    	public String getCreateBy(){
+	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -145,7 +119,7 @@ public class InsuranceJobs {
 	/**
 	 *获取创建时间
 	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 		public Date getCreateTime(){
 		return createTime;
@@ -157,12 +131,8 @@ public class InsuranceJobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "修改人")
-		/**
->>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){
@@ -175,15 +145,16 @@ public class InsuranceJobs {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
+
 	/**
 	 *获取修改时间
 	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 		public Date getUpdateTime(){
 		return updateTime;
 	}
-	
+
 	/**
 	 *设置修改时间
 	 */

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

@@ -35,12 +35,7 @@ public class Jobs {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-<<<<<<< Updated upstream
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
     	public String getId(){
@@ -53,12 +48,8 @@ public class Jobs {
 	public void setId(String id){
 		this.id = id;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "险种信息ID")
-		/**
->>>>>>> Stashed changes
 	 *获取险种信息ID
 	 */
     	public String getDefinitionId(){
@@ -71,15 +62,11 @@ public class Jobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "名称")
-		/**
->>>>>>> Stashed changes
 	 *获取名称
 	 */
-    	public String getName(){
+	public String getName(){
 		return name;
 	}
 	
@@ -89,12 +76,8 @@ public class Jobs {
 	public void setName(String name){
 		this.name = name;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "详细信息")
-		/**
->>>>>>> Stashed changes
 	 *获取详细信息
 	 */
     	public String getContent(){
@@ -107,12 +90,8 @@ public class Jobs {
 	public void setContent(String content){
 		this.content = content;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "状态")
-		/**
->>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -125,12 +104,8 @@ public class Jobs {
 	public void setStatus(String status){
 		this.status = status;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -143,12 +118,8 @@ public class Jobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -176,15 +147,11 @@ public class Jobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-<<<<<<< Updated upstream
+
 	/**
-=======
-	@ApiModelProperty(value = "修改人")
-		/**
->>>>>>> Stashed changes
 	 *获取修改人
 	 */
-    	public String getUpdateBy(){
+	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -197,7 +164,7 @@ public class Jobs {
 	/**
 	 *获取修改时间
 	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 		public Date getUpdateTime(){
 		return updateTime;

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

@@ -9,21 +9,6 @@ import java.util.Map;
 
 @Repository
 public interface InsurancePolicyRecordDAO {
-<<<<<<< Updated upstream
-    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> search(Map<String, Object> searchParams, List<Sort> sortList);
-=======
 	int insert(InsurancePolicyRecord entity);
 	int update(InsurancePolicyRecord entity);
 	int exist(String id);
@@ -32,5 +17,4 @@ public interface InsurancePolicyRecordDAO {
 	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,21 +8,6 @@ import java.util.List;
 import java.util.Map;
 
 public interface InsurancePolicyRecordService {
-<<<<<<< Updated upstream
-    InsurancePolicyRecord get(String id);
-
-    boolean exist(String id);
-
-    int insert(InsurancePolicyRecord model);
-
-    int update(InsurancePolicyRecord model);
-
-    int delete(String id);
-
-    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);
@@ -31,5 +16,4 @@ public interface InsurancePolicyRecordService {
 	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,32 +39,18 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
         return insurancePolicyRecordDAO.update(model);
     }
 
-<<<<<<< Updated upstream
     @Override
     public int delete(String id) {
         // TODO Auto-generated method stub
         return insurancePolicyRecordDAO.delete(id);
     }
 
-    @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> 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);
-=======
 	@Override
 	public boolean exist(String id) {
 		// TODO Auto-generated method stub
@@ -77,18 +63,11 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
 	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/java/com/jpsoft/picc/modules/common/dto/MessageResult.java

@@ -2,8 +2,10 @@ package com.jpsoft.picc.modules.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.ToString;
 
 @ApiModel(value = "返回消息体")
+@ToString
 public class MessageResult<T> {
     private boolean result;
     private String message;