1.更新实体类注解。

2.将企业信息表分为企业信息表和企业用户信息表。
3.完成企业用户注册相关接口，准备对接CAS。

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.ApprovalRecord;
 import com.jpsoft.picc.modules.base.service.ApprovalRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.Company;
 import com.jpsoft.picc.modules.base.service.CompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.CompanyMember;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.InsuranceAgent;
 import com.jpsoft.picc.modules.base.service.InsuranceAgentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.InsuranceDefinition;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.InsuranceDefinitionLimit;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.InsuranceJobs;
 import com.jpsoft.picc.modules.base.service.InsuranceJobsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.Jobs;
 import com.jpsoft.picc.modules.base.service.JobsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.Message;
 import com.jpsoft.picc.modules.base.service.MessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

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

@@ -4,7 +4,6 @@ import com.github.pagehelper.Page;
 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.base.entity.TransactionRecord;
 import com.jpsoft.picc.modules.base.service.TransactionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,8 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController

picc-admin-server/src/main/resources/logback-spring.xml

@@ -4,15 +4,15 @@
     <!--
     官方文档指明，需要使用<springProperty>,才可使用application.properties（或application.yml）中的值
     -->
-    <springProperty scope="context" name="loggerLevel" source="logger.level"/>
-    <springProperty scope="context" name="loggerPath" source="logger.dir"/>
-    <property name="pattern" value="%date %level [%thread] %logger{36} [%file : %line] %msg%n"></property>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <springProperty scope="context" userName="loggerLevel" source="logger.level"/>
+    <springProperty scope="context" userName="loggerPath" source="logger.dir"/>
+    <property userName="pattern" value="%date %level [%thread] %logger{36} [%file : %line] %msg%n"></property>
+    <appender userName="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${pattern}</pattern>
         </encoder>
     </appender>
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender userName="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${loggerPath}/logfile.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${loggerPath}/logfile.%d{yyyy-MM-dd}.log</fileNamePattern>
@@ -25,22 +25,22 @@
     <!--
     直接用maven的变量是@...@,用spring的变量是${...}
     -->
-    <springProfile name="dev">
+    <springProfile userName="dev">
         <!--root的level不能用变量-->
-        <logger name="jdbc" additivity="false" level="WARN">
+        <logger userName="jdbc" additivity="false" level="WARN">
             <appender-ref ref="STDOUT" />
         </logger>
-        <logger name="jdbc.sqltiming" additivity="false" level="ON">
+        <logger userName="jdbc.sqltiming" additivity="false" level="ON">
             <appender-ref ref="STDOUT" />
         </logger>
     </springProfile>
-    <springProfile name="test">
+    <springProfile userName="test">
         <root level="WARN">
             <appender-ref ref="STDOUT" />
             <appender-ref ref="FILE" />
         </root>
     </springProfile>
-    <springProfile name="production">
+    <springProfile userName="production">
         <root level="WARN">
             <appender-ref ref="STDOUT" />
             <appender-ref ref="FILE" />

picc-admin-server/src/main/resources/mapper/sys/DataDictionary.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.DataDictionaryDAO">
 	<resultMap id="DataDictionaryMap" type="DataDictionary">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="value" column="value_" />
 			<result property="sortNo" column="sort_no" />
 			<result property="parentId" column="parent_id" />
@@ -30,7 +30,7 @@
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{value,jdbcType=VARCHAR}
 ,#{sortNo,jdbcType= NUMERIC }
 ,#{parentId,jdbcType=VARCHAR}
@@ -50,8 +50,8 @@
 	<update id="update" parameterType="DataDictionary">
 		update sys_data_dictionary
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="value!=null">
 		value_=#{value,jdbcType=VARCHAR},
@@ -110,8 +110,8 @@
 			<if test="searchParams.id != null">
 				and a.ID_ like #{searchParams.id}
 			</if>
-			<if test="searchParams.name != null">
-				and a.name_ like #{searchParams.name}
+			<if test="searchParams.userName != null">
+				and a.name_ like #{searchParams.userName}
 			</if>
 			<if test="searchParams.excludeId != null">
 				<![CDATA[
@@ -124,13 +124,13 @@
 
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 
 	<select id="queryChildren" resultType="java.util.HashMap" parameterType="string" >
 		SELECT
-		a.id_ as id,a.name_ as name,a.value_ as value
+		a.id_ as id,a.name_ as userName,a.value_ as value
 		FROM
 		sys_data_dictionary a where a.del_flag = 0
 		and data_type = 2
@@ -138,7 +138,7 @@
 	</select>
 
 	<select id="getName" parameterType="string" resultType="string">
-		select a.name_ as name
+		select a.name_ as userName
 		from sys_data_dictionary a
 		where a.id_=#{0} and a.del_flag = 0
 	</select>

picc-admin-server/src/main/resources/mapper/sys/Menu.xml

@@ -118,7 +118,7 @@
             ]]>
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
+            ${sort.userName} ${sort.order}
         </foreach>
     </select>
     <select id="findAllocMenu"  parameterType="string" resultMap="MenuMap">

picc-admin-server/src/main/resources/mapper/sys/Permission.xml

@@ -90,7 +90,7 @@
             and path_ like #{searchParams.path}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
+            ${sort.userName} ${sort.order}
         </foreach>
     </select>
     <select id="hasPermitted" parameterType="string" resultType="int">

picc-admin-server/src/main/resources/mapper/sys/Role.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.sys.dao.RoleDAO">
     <resultMap id="RoleMap" type="Role">
         <id property="id" column="id_"/>
-        <result property="name" column="name_"/>
+        <result property="userName" column="name_"/>
         <result property="description" column="description_"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -25,7 +25,7 @@
 		values
 		(
             #{id,jdbcType=VARCHAR}
-            ,#{name,jdbcType=VARCHAR}
+            ,#{userName,jdbcType=VARCHAR}
             ,#{description,jdbcType=VARCHAR}
             ,#{createTime,jdbcType= TIMESTAMP }
             ,#{updateTime,jdbcType= TIMESTAMP }
@@ -41,8 +41,8 @@
     <update id="update" parameterType="Role">
         update sys_role
         <set>
-            <if test="name!=null">
-                name_=#{name,jdbcType=VARCHAR},
+            <if test="userName!=null">
+                name_=#{userName,jdbcType=VARCHAR},
             </if>
             <if test="description!=null">
                 description_=#{description,jdbcType=VARCHAR},
@@ -87,7 +87,7 @@
                 and description_ like #{searchParams.roleDesc}
             </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
+            ${sort.userName} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-admin-server/src/main/resources/mapper/sys/RoleMenu.xml

@@ -88,7 +88,7 @@ id_,role_id,menu_id,del_flag,create_by,create_time,update_by,update_time		from s
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 	<select id="findByRoleId" parameterType="string" resultMap="RoleMenuMap">

picc-admin-server/src/main/resources/mapper/sys/RolePermission.xml

@@ -87,7 +87,7 @@
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 	<select id="findByRoleId" parameterType="string" resultMap="RolePermissionMap">

picc-admin-server/src/main/resources/mapper/sys/User.xml

@@ -96,7 +96,7 @@
             and real_name like #{searchParams.realName}
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
+            ${sort.userName} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-admin-server/src/main/resources/mapper/sys/UserRole.xml

@@ -94,7 +94,7 @@
             </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
-            ${sort.name} ${sort.order}
+            ${sort.userName} ${sort.order}
         </foreach>
     </select>
 </mapper>

picc-admin-server/src/test/java/com/jpsoft/picc/test/CompanyTest.java

@@ -1,6 +1,5 @@
 package com.jpsoft.picc.test;
 
-import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.service.CompanyService;
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -0,0 +1,18 @@
+package com.jpsoft.picc.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
+import java.util.Map;
+import com.jpsoft.picc.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyUserDAO {
+	int insert(CompanyUser entity);
+	int update(CompanyUser entity);
+	int exist(String id);
+	CompanyUser get(String id);
+	int delete(String id);
+	List<CompanyUser> list();
+	List<CompanyUser> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

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

@@ -11,24 +11,32 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_approval_record的实体类
- 企业历史投保记录
  */
-@ApiModel(value = "企业历史投保记录")
+@ApiModel(value = "base_approval_record的实体类")
 public class ApprovalRecord {
+    @ApiModelProperty(value = "ID")
 	private String id;
+    @ApiModelProperty(value = "企业ID")
 	private String companyId;
+    @ApiModelProperty(value = "投保申请ID")
 	private String applicationId;
+    @ApiModelProperty(value = "投保状态")
 	private String status;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "更新人")
 	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
-		/**
+	/**
 	 *获取ID
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -38,10 +46,10 @@ public class ApprovalRecord {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取企业ID
 	 */
-	public String getCompanyId(){
+    	public String getCompanyId(){
 		return companyId;
 	}
 	
@@ -51,10 +59,10 @@ public class ApprovalRecord {
 	public void setCompanyId(String companyId){
 		this.companyId = companyId;
 	}
-		/**
+	/**
 	 *获取投保申请ID
 	 */
-	public String getApplicationId(){
+    	public String getApplicationId(){
 		return applicationId;
 	}
 	
@@ -64,10 +72,10 @@ public class ApprovalRecord {
 	public void setApplicationId(String applicationId){
 		this.applicationId = applicationId;
 	}
-		/**
+	/**
 	 *获取投保状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -77,10 +85,10 @@ public class ApprovalRecord {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -90,13 +98,12 @@ public class ApprovalRecord {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -106,10 +113,10 @@ public class ApprovalRecord {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取更新人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -119,13 +126,12 @@ public class ApprovalRecord {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-		/**
+	/**
 	 *获取更新时间
 	 */
-	public Date getUpdateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
 		return updateTime;
 	}
 	
@@ -135,10 +141,10 @@ public class ApprovalRecord {
 	public void setUpdateTime(Date updateTime){
 		this.updateTime = updateTime;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	

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

@@ -11,46 +11,70 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_company的实体类
-  企业信息
  */
-@ApiModel(value = "企业信息")
+@ApiModel(value = "base_company的实体类")
 public class Company {
+    @ApiModelProperty(value = "ID")
 	private String id;
+    @ApiModelProperty(value = "企业名称")
 	private String name;
-	private String realName;
-	private String passWord;
+    @ApiModelProperty(value = "法人代表")
 	private String legalName;
+    @ApiModelProperty(value = "法人代表身份证")
 	private String legalCard;
+    @ApiModelProperty(value = "法人代表身份证附件")
 	private String legalCardFile;
+    @ApiModelProperty(value = "证件编号")
 	private String usccCode;
+    @ApiModelProperty(value = "证件附件(营业执照/企业代码)")
 	private String usccFiles;
+    @ApiModelProperty(value = "企业类型")
 	private String type;
+    @ApiModelProperty(value = "营业性质")
 	private String businessNature;
+    @ApiModelProperty(value = "营业范围")
 	private String businessScope;
+    @ApiModelProperty(value = "行业类型")
 	private String industryType;
+    @ApiModelProperty(value = "雇员人数")
 	private Integer employeesNumber;
+    @ApiModelProperty(value = "已投保人数")
 	private Integer insuredNumber;
+    @ApiModelProperty(value = "联系人")
 	private String person;
+    @ApiModelProperty(value = "联系电话")
 	private String tel;
+    @ApiModelProperty(value = "电子邮箱")
 	private String mail;
+    @ApiModelProperty(value = "邮政编码")
 	private String postal;
+    @ApiModelProperty(value = "地址")
 	private String address;
+    @ApiModelProperty(value = "企业公章(附件)")
 	private String companyStampFile;
+    @ApiModelProperty(value = "推广员账号")
 	private String promoter;
+    @ApiModelProperty(value = "近三年损失情况（时间、原因、损失金额）")
 	private String remark;
-	private String openId;
+    @ApiModelProperty(value = "云平台买方ID")
 	private String buyId;
+    @ApiModelProperty(value = "状态")
 	private String status;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "更新人")
 	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
-		/**
+	/**
 	 *获取ID
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -60,49 +84,23 @@ public class Company {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
-	 *获取用户名
-	 */
-	public String getName(){
-		return name;
-	}
-	
 	/**
-	 *设置用户名
-	 */
-	public void setName(String name){
-		this.name = name;
-	}
-		/**
 	 *获取企业名称
 	 */
-	public String getRealName(){
-		return realName;
+    	public String getName(){
+		return name;
 	}
 	
 	/**
 	 *设置企业名称
 	 */
-	public void setRealName(String realName){
-		this.realName = realName;
-	}
-		/**
-	 *获取密码
-	 */
-	public String getPassWord(){
-		return passWord;
+	public void setName(String name){
+		this.name = name;
 	}
-	
 	/**
-	 *设置密码
-	 */
-	public void setPassWord(String passWord){
-		this.passWord = passWord;
-	}
-		/**
 	 *获取法人代表
 	 */
-	public String getLegalName(){
+    	public String getLegalName(){
 		return legalName;
 	}
 	
@@ -112,10 +110,10 @@ public class Company {
 	public void setLegalName(String legalName){
 		this.legalName = legalName;
 	}
-		/**
+	/**
 	 *获取法人代表身份证
 	 */
-	public String getLegalCard(){
+    	public String getLegalCard(){
 		return legalCard;
 	}
 	
@@ -125,10 +123,10 @@ public class Company {
 	public void setLegalCard(String legalCard){
 		this.legalCard = legalCard;
 	}
-		/**
+	/**
 	 *获取法人代表身份证附件
 	 */
-	public String getLegalCardFile(){
+    	public String getLegalCardFile(){
 		return legalCardFile;
 	}
 	
@@ -138,10 +136,10 @@ public class Company {
 	public void setLegalCardFile(String legalCardFile){
 		this.legalCardFile = legalCardFile;
 	}
-		/**
+	/**
 	 *获取证件编号
 	 */
-	public String getUsccCode(){
+    	public String getUsccCode(){
 		return usccCode;
 	}
 	
@@ -151,10 +149,10 @@ public class Company {
 	public void setUsccCode(String usccCode){
 		this.usccCode = usccCode;
 	}
-		/**
+	/**
 	 *获取证件附件(营业执照/企业代码)
 	 */
-	public String getUsccFiles(){
+    	public String getUsccFiles(){
 		return usccFiles;
 	}
 	
@@ -164,10 +162,10 @@ public class Company {
 	public void setUsccFiles(String usccFiles){
 		this.usccFiles = usccFiles;
 	}
-		/**
+	/**
 	 *获取企业类型
 	 */
-	public String getType(){
+    	public String getType(){
 		return type;
 	}
 	
@@ -177,10 +175,10 @@ public class Company {
 	public void setType(String type){
 		this.type = type;
 	}
-		/**
+	/**
 	 *获取营业性质
 	 */
-	public String getBusinessNature(){
+    	public String getBusinessNature(){
 		return businessNature;
 	}
 	
@@ -190,10 +188,10 @@ public class Company {
 	public void setBusinessNature(String businessNature){
 		this.businessNature = businessNature;
 	}
-		/**
+	/**
 	 *获取营业范围
 	 */
-	public String getBusinessScope(){
+    	public String getBusinessScope(){
 		return businessScope;
 	}
 	
@@ -203,10 +201,10 @@ public class Company {
 	public void setBusinessScope(String businessScope){
 		this.businessScope = businessScope;
 	}
-		/**
+	/**
 	 *获取行业类型
 	 */
-	public String getIndustryType(){
+    	public String getIndustryType(){
 		return industryType;
 	}
 	
@@ -216,10 +214,10 @@ public class Company {
 	public void setIndustryType(String industryType){
 		this.industryType = industryType;
 	}
-		/**
+	/**
 	 *获取雇员人数
 	 */
-	public Integer getEmployeesNumber(){
+    	public Integer getEmployeesNumber(){
 		return employeesNumber;
 	}
 	
@@ -229,10 +227,10 @@ public class Company {
 	public void setEmployeesNumber(Integer employeesNumber){
 		this.employeesNumber = employeesNumber;
 	}
-		/**
+	/**
 	 *获取已投保人数
 	 */
-	public Integer getInsuredNumber(){
+    	public Integer getInsuredNumber(){
 		return insuredNumber;
 	}
 	
@@ -242,10 +240,10 @@ public class Company {
 	public void setInsuredNumber(Integer insuredNumber){
 		this.insuredNumber = insuredNumber;
 	}
-		/**
+	/**
 	 *获取联系人
 	 */
-	public String getPerson(){
+    	public String getPerson(){
 		return person;
 	}
 	
@@ -255,10 +253,10 @@ public class Company {
 	public void setPerson(String person){
 		this.person = person;
 	}
-		/**
+	/**
 	 *获取联系电话
 	 */
-	public String getTel(){
+    	public String getTel(){
 		return tel;
 	}
 	
@@ -268,10 +266,10 @@ public class Company {
 	public void setTel(String tel){
 		this.tel = tel;
 	}
-		/**
+	/**
 	 *获取电子邮箱
 	 */
-	public String getMail(){
+    	public String getMail(){
 		return mail;
 	}
 	
@@ -281,10 +279,10 @@ public class Company {
 	public void setMail(String mail){
 		this.mail = mail;
 	}
-		/**
+	/**
 	 *获取邮政编码
 	 */
-	public String getPostal(){
+    	public String getPostal(){
 		return postal;
 	}
 	
@@ -294,10 +292,10 @@ public class Company {
 	public void setPostal(String postal){
 		this.postal = postal;
 	}
-		/**
+	/**
 	 *获取地址
 	 */
-	public String getAddress(){
+    	public String getAddress(){
 		return address;
 	}
 	
@@ -307,10 +305,10 @@ public class Company {
 	public void setAddress(String address){
 		this.address = address;
 	}
-		/**
+	/**
 	 *获取企业公章(附件)
 	 */
-	public String getCompanyStampFile(){
+    	public String getCompanyStampFile(){
 		return companyStampFile;
 	}
 	
@@ -320,10 +318,10 @@ public class Company {
 	public void setCompanyStampFile(String companyStampFile){
 		this.companyStampFile = companyStampFile;
 	}
-		/**
+	/**
 	 *获取推广员账号
 	 */
-	public String getPromoter(){
+    	public String getPromoter(){
 		return promoter;
 	}
 	
@@ -333,10 +331,10 @@ public class Company {
 	public void setPromoter(String promoter){
 		this.promoter = promoter;
 	}
-		/**
+	/**
 	 *获取近三年损失情况（时间、原因、损失金额）
 	 */
-	public String getRemark(){
+    	public String getRemark(){
 		return remark;
 	}
 	
@@ -346,23 +344,10 @@ public class Company {
 	public void setRemark(String remark){
 		this.remark = remark;
 	}
-		/**
-	 *获取微信openID
-	 */
-	public String getOpenId(){
-		return openId;
-	}
-	
 	/**
-	 *设置微信openID
-	 */
-	public void setOpenId(String openId){
-		this.openId = openId;
-	}
-		/**
 	 *获取云平台买方ID
 	 */
-	public String getBuyId(){
+    	public String getBuyId(){
 		return buyId;
 	}
 	
@@ -372,10 +357,10 @@ public class Company {
 	public void setBuyId(String buyId){
 		this.buyId = buyId;
 	}
-		/**
+	/**
 	 *获取状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -385,10 +370,10 @@ public class Company {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -398,13 +383,12 @@ public class Company {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -414,10 +398,10 @@ public class Company {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取更新人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -427,13 +411,12 @@ public class Company {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-		/**
+	/**
 	 *获取更新时间
 	 */
-	public Date getUpdateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
 		return updateTime;
 	}
 	
@@ -443,10 +426,10 @@ public class Company {
 	public void setUpdateTime(Date updateTime){
 		this.updateTime = updateTime;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	

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

@@ -11,31 +11,46 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_company_member的实体类
-  企业人员信息
  */
-@ApiModel(value = "企业人员信息")
+@ApiModel(value = "base_company_member的实体类")
 public class CompanyMember {
+    @ApiModelProperty(value = "ID")
 	private String id;
+    @ApiModelProperty(value = "企业ID")
 	private String companyId;
+    @ApiModelProperty(value = "姓名")
 	private String name;
+    @ApiModelProperty(value = "证件类型")
 	private String cardType;
+    @ApiModelProperty(value = "证件编号")
 	private String cardNo;
+    @ApiModelProperty(value = "性别")
 	private Boolean sex;
+    @ApiModelProperty(value = "年龄")
 	private Integer age;
+    @ApiModelProperty(value = "行业ID")
 	private String jobsId;
+    @ApiModelProperty(value = "健康状态")
 	private String healthStatus;
+    @ApiModelProperty(value = "身份证附件")
 	private String cardFiles;
+    @ApiModelProperty(value = "状态")
 	private String status;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "更新人")
 	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
-		/**
+	/**
 	 *获取ID
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -45,10 +60,10 @@ public class CompanyMember {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取企业ID
 	 */
-	public String getCompanyId(){
+    	public String getCompanyId(){
 		return companyId;
 	}
 	
@@ -58,10 +73,10 @@ public class CompanyMember {
 	public void setCompanyId(String companyId){
 		this.companyId = companyId;
 	}
-		/**
+	/**
 	 *获取姓名
 	 */
-	public String getName(){
+    	public String getName(){
 		return name;
 	}
 	
@@ -71,10 +86,10 @@ public class CompanyMember {
 	public void setName(String name){
 		this.name = name;
 	}
-		/**
+	/**
 	 *获取证件类型
 	 */
-	public String getCardType(){
+    	public String getCardType(){
 		return cardType;
 	}
 	
@@ -84,10 +99,10 @@ public class CompanyMember {
 	public void setCardType(String cardType){
 		this.cardType = cardType;
 	}
-		/**
+	/**
 	 *获取证件编号
 	 */
-	public String getCardNo(){
+    	public String getCardNo(){
 		return cardNo;
 	}
 	
@@ -97,10 +112,10 @@ public class CompanyMember {
 	public void setCardNo(String cardNo){
 		this.cardNo = cardNo;
 	}
-		/**
+	/**
 	 *获取性别
 	 */
-	public Boolean getSex(){
+    	public Boolean getSex(){
 		return sex;
 	}
 	
@@ -110,10 +125,10 @@ public class CompanyMember {
 	public void setSex(Boolean sex){
 		this.sex = sex;
 	}
-		/**
+	/**
 	 *获取年龄
 	 */
-	public Integer getAge(){
+    	public Integer getAge(){
 		return age;
 	}
 	
@@ -123,10 +138,10 @@ public class CompanyMember {
 	public void setAge(Integer age){
 		this.age = age;
 	}
-		/**
+	/**
 	 *获取行业ID
 	 */
-	public String getJobsId(){
+    	public String getJobsId(){
 		return jobsId;
 	}
 	
@@ -136,10 +151,10 @@ public class CompanyMember {
 	public void setJobsId(String jobsId){
 		this.jobsId = jobsId;
 	}
-		/**
+	/**
 	 *获取健康状态
 	 */
-	public String getHealthStatus(){
+    	public String getHealthStatus(){
 		return healthStatus;
 	}
 	
@@ -149,10 +164,10 @@ public class CompanyMember {
 	public void setHealthStatus(String healthStatus){
 		this.healthStatus = healthStatus;
 	}
-		/**
+	/**
 	 *获取身份证附件
 	 */
-	public String getCardFiles(){
+    	public String getCardFiles(){
 		return cardFiles;
 	}
 	
@@ -162,10 +177,10 @@ public class CompanyMember {
 	public void setCardFiles(String cardFiles){
 		this.cardFiles = cardFiles;
 	}
-		/**
+	/**
 	 *获取状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -175,10 +190,10 @@ public class CompanyMember {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -188,13 +203,12 @@ public class CompanyMember {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -204,10 +218,10 @@ public class CompanyMember {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取更新人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -217,13 +231,12 @@ public class CompanyMember {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-		/**
+	/**
 	 *获取更新时间
 	 */
-	public Date getUpdateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
 		return updateTime;
 	}
 	
@@ -233,10 +246,10 @@ public class CompanyMember {
 	public void setUpdateTime(Date updateTime){
 		this.updateTime = updateTime;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	

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

@@ -0,0 +1,247 @@
+package com.jpsoft.picc.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+
+/**
+  描述:base_company_user的实体类
+ */
+@ApiModel(value = "base_company_user的实体类")
+public class CompanyUser {
+    @ApiModelProperty(value = "ID")
+	private String id;
+    @ApiModelProperty(value = "用户名")
+	private String userName;
+    @ApiModelProperty(value = "密码")
+	private String password;
+    @ApiModelProperty(value = "用户头像地址")
+	private String avatar;
+    @ApiModelProperty(value = "用户注册手机号")
+	private String phone;
+    @ApiModelProperty(value = "微信openID")
+	private String openId;
+    @ApiModelProperty(value = "职业介绍")
+	private String profession;
+    @ApiModelProperty(value = "简介")
+	private String summary;
+    @ApiModelProperty(value = "关联企业编号")
+	private String companyId;
+    @ApiModelProperty(value = "状态")
+	private String status;
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+    @ApiModelProperty(value = "更新人")
+	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+
+	/**
+	 *获取ID
+	 */
+    	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置ID
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+	/**
+	 *获取用户名
+	 */
+    	public String getUserName(){
+		return userName;
+	}
+	
+	/**
+	 *设置用户名
+	 */
+	public void setUserName(String userName){
+		this.userName = userName;
+	}
+	/**
+	 *获取密码
+	 */
+    	public String getPassword(){
+		return password;
+	}
+	
+	/**
+	 *设置密码
+	 */
+	public void setPassword(String password){
+		this.password = password;
+	}
+	/**
+	 *获取用户头像地址
+	 */
+    	public String getAvatar(){
+		return avatar;
+	}
+	
+	/**
+	 *设置用户头像地址
+	 */
+	public void setAvatar(String avatar){
+		this.avatar = avatar;
+	}
+	/**
+	 *获取用户注册手机号
+	 */
+    	public String getPhone(){
+		return phone;
+	}
+	
+	/**
+	 *设置用户注册手机号
+	 */
+	public void setPhone(String phone){
+		this.phone = phone;
+	}
+	/**
+	 *获取微信openID
+	 */
+    	public String getOpenId(){
+		return openId;
+	}
+	
+	/**
+	 *设置微信openID
+	 */
+	public void setOpenId(String openId){
+		this.openId = openId;
+	}
+	/**
+	 *获取职业介绍
+	 */
+    	public String getProfession(){
+		return profession;
+	}
+	
+	/**
+	 *设置职业介绍
+	 */
+	public void setProfession(String profession){
+		this.profession = profession;
+	}
+	/**
+	 *获取简介
+	 */
+    	public String getSummary(){
+		return summary;
+	}
+	
+	/**
+	 *设置简介
+	 */
+	public void setSummary(String summary){
+		this.summary = summary;
+	}
+	/**
+	 *获取关联企业编号
+	 */
+    	public String getCompanyId(){
+		return companyId;
+	}
+	
+	/**
+	 *设置关联企业编号
+	 */
+	public void setCompanyId(String companyId){
+		this.companyId = companyId;
+	}
+	/**
+	 *获取状态
+	 */
+    	public String getStatus(){
+		return status;
+	}
+	
+	/**
+	 *设置状态
+	 */
+	public void setStatus(String status){
+		this.status = status;
+	}
+	/**
+	 *获取创建人
+	 */
+    	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+	/**
+	 *获取创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+	/**
+	 *获取更新人
+	 */
+    	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+	/**
+	 *获取更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+	/**
+	 *获取是否删除
+	 */
+    	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+}

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

@@ -11,23 +11,30 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_insurance_agent的实体类
-  保险代理人
  */
-@ApiModel(value = "保险代理人")
+@ApiModel(value = "base_insurance_agent的实体类")
 public class InsuranceAgent {
+    @ApiModelProperty(value = "编号")
 	private String id;
+    @ApiModelProperty(value = "姓名")
 	private String name;
+    @ApiModelProperty(value = "审核状态")
 	private String status;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "修改人")
 	private String updateBy;
+    @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-		/**
+	/**
 	 *获取编号
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -37,10 +44,10 @@ public class InsuranceAgent {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取姓名
 	 */
-	public String getName(){
+    	public String getName(){
 		return name;
 	}
 	
@@ -50,10 +57,10 @@ public class InsuranceAgent {
 	public void setName(String name){
 		this.name = name;
 	}
-		/**
+	/**
 	 *获取审核状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -63,10 +70,10 @@ public class InsuranceAgent {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -76,10 +83,10 @@ public class InsuranceAgent {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -89,13 +96,12 @@ public class InsuranceAgent {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -105,10 +111,10 @@ public class InsuranceAgent {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取修改人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -118,13 +124,12 @@ public class InsuranceAgent {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "修改时间")
-		/**
+	/**
 	 *获取修改时间
 	 */
-	public Date getUpdateTime(){
+    	@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/InsuranceDefinition.java

@@ -11,25 +11,34 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_insurance_definition的实体类
- 险种信息
  */
-@ApiModel(value = "险种信息")
+@ApiModel(value = "base_insurance_definition的实体类")
 public class InsuranceDefinition {
+    @ApiModelProperty(value = "编号")
 	private String id;
+    @ApiModelProperty(value = "险种")
 	private String name;
+    @ApiModelProperty(value = "投保声明")
 	private String insuranceDescription;
+    @ApiModelProperty(value = "雇主责任险条款")
 	private String clause;
+    @ApiModelProperty(value = "状态")
 	private String status;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "修改人")
 	private String updateBy;
+    @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-		/**
+	/**
 	 *获取编号
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -39,10 +48,10 @@ public class InsuranceDefinition {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取险种
 	 */
-	public String getName(){
+    	public String getName(){
 		return name;
 	}
 	
@@ -52,10 +61,10 @@ public class InsuranceDefinition {
 	public void setName(String name){
 		this.name = name;
 	}
-		/**
+	/**
 	 *获取投保声明
 	 */
-	public String getInsuranceDescription(){
+    	public String getInsuranceDescription(){
 		return insuranceDescription;
 	}
 	
@@ -65,10 +74,10 @@ public class InsuranceDefinition {
 	public void setInsuranceDescription(String insuranceDescription){
 		this.insuranceDescription = insuranceDescription;
 	}
-		/**
+	/**
 	 *获取雇主责任险条款
 	 */
-	public String getClause(){
+    	public String getClause(){
 		return clause;
 	}
 	
@@ -78,10 +87,10 @@ public class InsuranceDefinition {
 	public void setClause(String clause){
 		this.clause = clause;
 	}
-		/**
+	/**
 	 *获取状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -91,10 +100,10 @@ public class InsuranceDefinition {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -104,10 +113,10 @@ public class InsuranceDefinition {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -117,13 +126,12 @@ public class InsuranceDefinition {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -133,10 +141,10 @@ public class InsuranceDefinition {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取修改人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -146,13 +154,12 @@ public class InsuranceDefinition {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "修改时间")
-		/**
+	/**
 	 *获取修改时间
 	 */
-	public Date getUpdateTime(){
+    	@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/InsuranceDefinitionLimit.java

@@ -11,26 +11,36 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_insurance_definition_limit的实体类
- 险种限额信息
  */
-@ApiModel(value = "险种限额信息")
+@ApiModel(value = "base_insurance_definition_limit的实体类")
 public class InsuranceDefinitionLimit {
+    @ApiModelProperty(value = "编号")
 	private String id;
+    @ApiModelProperty(value = "险种信息ID")
 	private String definitionId;
+    @ApiModelProperty(value = "限额名称")
 	private String name;
+    @ApiModelProperty(value = "责任限额/免赔额")
 	private String limit;
+    @ApiModelProperty(value = "计算单位(次/元/人/万)")
 	private String unit;
+    @ApiModelProperty(value = "状态")
 	private String status;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "修改人")
 	private String updateBy;
+    @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-		/**
+	/**
 	 *获取编号
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -40,10 +50,10 @@ public class InsuranceDefinitionLimit {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取险种信息ID
 	 */
-	public String getDefinitionId(){
+    	public String getDefinitionId(){
 		return definitionId;
 	}
 	
@@ -53,10 +63,10 @@ public class InsuranceDefinitionLimit {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-		/**
+	/**
 	 *获取限额名称
 	 */
-	public String getName(){
+    	public String getName(){
 		return name;
 	}
 	
@@ -66,10 +76,10 @@ public class InsuranceDefinitionLimit {
 	public void setName(String name){
 		this.name = name;
 	}
-		/**
+	/**
 	 *获取责任限额/免赔额
 	 */
-	public String getLimit(){
+    	public String getLimit(){
 		return limit;
 	}
 	
@@ -79,10 +89,10 @@ public class InsuranceDefinitionLimit {
 	public void setLimit(String limit){
 		this.limit = limit;
 	}
-		/**
+	/**
 	 *获取计算单位(次/元/人/万)
 	 */
-	public String getUnit(){
+    	public String getUnit(){
 		return unit;
 	}
 	
@@ -92,10 +102,10 @@ public class InsuranceDefinitionLimit {
 	public void setUnit(String unit){
 		this.unit = unit;
 	}
-		/**
+	/**
 	 *获取状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -105,10 +115,10 @@ public class InsuranceDefinitionLimit {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -118,10 +128,10 @@ public class InsuranceDefinitionLimit {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -131,13 +141,12 @@ public class InsuranceDefinitionLimit {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -147,10 +156,10 @@ public class InsuranceDefinitionLimit {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取修改人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -160,13 +169,12 @@ public class InsuranceDefinitionLimit {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "修改时间")
-		/**
+	/**
 	 *获取修改时间
 	 */
-	public Date getUpdateTime(){
+    	@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/InsuranceJobs.java

@@ -11,24 +11,32 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_insurance_jobs的实体类
-  险种关联行业收费标准表
  */
-@ApiModel(value = "险种关联行业收费标准")
+@ApiModel(value = "base_insurance_jobs的实体类")
 public class InsuranceJobs {
+    @ApiModelProperty(value = "编号")
 	private String id;
+    @ApiModelProperty(value = "行业ID")
 	private String jobsId;
+    @ApiModelProperty(value = "险种信息ID")
 	private String definitionId;
+    @ApiModelProperty(value = "收费标准(月)")
 	private BigDecimal charges;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "修改人")
 	private String updateBy;
+    @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-		/**
+	/**
 	 *获取编号
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -38,10 +46,10 @@ public class InsuranceJobs {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取行业ID
 	 */
-	public String getJobsId(){
+    	public String getJobsId(){
 		return jobsId;
 	}
 	
@@ -51,10 +59,10 @@ public class InsuranceJobs {
 	public void setJobsId(String jobsId){
 		this.jobsId = jobsId;
 	}
-		/**
+	/**
 	 *获取险种信息ID
 	 */
-	public String getDefinitionId(){
+    	public String getDefinitionId(){
 		return definitionId;
 	}
 	
@@ -64,10 +72,10 @@ public class InsuranceJobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-		/**
+	/**
 	 *获取收费标准(月)
 	 */
-	public BigDecimal getCharges(){
+    	public BigDecimal getCharges(){
 		return charges;
 	}
 	
@@ -77,10 +85,10 @@ public class InsuranceJobs {
 	public void setCharges(BigDecimal charges){
 		this.charges = charges;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -90,10 +98,10 @@ public class InsuranceJobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -103,13 +111,12 @@ public class InsuranceJobs {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -119,10 +126,10 @@ public class InsuranceJobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取修改人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -132,13 +139,12 @@ public class InsuranceJobs {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "修改时间")
-		/**
+	/**
 	 *获取修改时间
 	 */
-	public Date getUpdateTime(){
+    	@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

@@ -11,25 +11,34 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_jobs的实体类
- 行业/职业类型信息表
  */
-@ApiModel(value = "行业/职业类型信息")
+@ApiModel(value = "base_jobs的实体类")
 public class Jobs {
+    @ApiModelProperty(value = "编号")
 	private String id;
+    @ApiModelProperty(value = "险种信息ID")
 	private String definitionId;
+    @ApiModelProperty(value = "名称")
 	private String name;
+    @ApiModelProperty(value = "详细信息")
 	private String content;
+    @ApiModelProperty(value = "状态")
 	private String status;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "修改人")
 	private String updateBy;
+    @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-		/**
+	/**
 	 *获取编号
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -39,10 +48,10 @@ public class Jobs {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取险种信息ID
 	 */
-	public String getDefinitionId(){
+    	public String getDefinitionId(){
 		return definitionId;
 	}
 	
@@ -52,10 +61,10 @@ public class Jobs {
 	public void setDefinitionId(String definitionId){
 		this.definitionId = definitionId;
 	}
-		/**
+	/**
 	 *获取名称
 	 */
-	public String getName(){
+    	public String getName(){
 		return name;
 	}
 	
@@ -65,10 +74,10 @@ public class Jobs {
 	public void setName(String name){
 		this.name = name;
 	}
-		/**
+	/**
 	 *获取详细信息
 	 */
-	public String getContent(){
+    	public String getContent(){
 		return content;
 	}
 	
@@ -78,10 +87,10 @@ public class Jobs {
 	public void setContent(String content){
 		this.content = content;
 	}
-		/**
+	/**
 	 *获取状态
 	 */
-	public String getStatus(){
+    	public String getStatus(){
 		return status;
 	}
 	
@@ -91,10 +100,10 @@ public class Jobs {
 	public void setStatus(String status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -104,10 +113,10 @@ public class Jobs {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -117,13 +126,12 @@ public class Jobs {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -133,10 +141,10 @@ public class Jobs {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取修改人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -146,13 +154,12 @@ public class Jobs {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "修改时间")
-		/**
+	/**
 	 *获取修改时间
 	 */
-	public Date getUpdateTime(){
+    	@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/Message.java

@@ -11,26 +11,36 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_message的实体类
- 站内消息表
  */
-@ApiModel(value = "站内消息")
+@ApiModel(value = "base_message的实体类")
 public class Message {
+    @ApiModelProperty(value = "ID")
 	private String id;
+    @ApiModelProperty(value = "标题")
 	private String title;
+    @ApiModelProperty(value = "内容")
 	private String content;
+    @ApiModelProperty(value = "发件人ID")
 	private String senderId;
+    @ApiModelProperty(value = "收件人ID")
 	private String recipientId;
+    @ApiModelProperty(value = "状态(未读/已读)")
 	private Boolean status;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "更新人")
 	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
-		/**
+	/**
 	 *获取ID
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -40,10 +50,10 @@ public class Message {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取标题
 	 */
-	public String getTitle(){
+    	public String getTitle(){
 		return title;
 	}
 	
@@ -53,10 +63,10 @@ public class Message {
 	public void setTitle(String title){
 		this.title = title;
 	}
-		/**
+	/**
 	 *获取内容
 	 */
-	public String getContent(){
+    	public String getContent(){
 		return content;
 	}
 	
@@ -66,10 +76,10 @@ public class Message {
 	public void setContent(String content){
 		this.content = content;
 	}
-		/**
+	/**
 	 *获取发件人ID
 	 */
-	public String getSenderId(){
+    	public String getSenderId(){
 		return senderId;
 	}
 	
@@ -79,10 +89,10 @@ public class Message {
 	public void setSenderId(String senderId){
 		this.senderId = senderId;
 	}
-		/**
+	/**
 	 *获取收件人ID
 	 */
-	public String getRecipientId(){
+    	public String getRecipientId(){
 		return recipientId;
 	}
 	
@@ -92,10 +102,10 @@ public class Message {
 	public void setRecipientId(String recipientId){
 		this.recipientId = recipientId;
 	}
-		/**
+	/**
 	 *获取状态(未读/已读)
 	 */
-	public Boolean getStatus(){
+    	public Boolean getStatus(){
 		return status;
 	}
 	
@@ -105,10 +115,10 @@ public class Message {
 	public void setStatus(Boolean status){
 		this.status = status;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -118,13 +128,12 @@ public class Message {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -134,10 +143,10 @@ public class Message {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取更新人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -147,13 +156,12 @@ public class Message {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-		/**
+	/**
 	 *获取更新时间
 	 */
-	public Date getUpdateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
 		return updateTime;
 	}
 	
@@ -163,10 +171,10 @@ public class Message {
 	public void setUpdateTime(Date updateTime){
 		this.updateTime = updateTime;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	

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

@@ -11,28 +11,40 @@ import io.swagger.annotations.ApiModel;
 
 /**
   描述:base_transaction_record的实体类
- 企业账户流水表
  */
-@ApiModel(value = "企业账户流水信息")
+@ApiModel(value = "base_transaction_record的实体类")
 public class TransactionRecord {
+    @ApiModelProperty(value = "ID")
 	private String id;
+    @ApiModelProperty(value = "企业ID")
 	private String companyId;
+    @ApiModelProperty(value = "交易号")
 	private String transactionNumber;
+    @ApiModelProperty(value = "交易金额")
 	private BigDecimal amount;
+    @ApiModelProperty(value = "订单号")
 	private String orderNo;
+    @ApiModelProperty(value = "支付状态")
 	private String paymentStatus;
+    @ApiModelProperty(value = "支付类型")
 	private String buyType;
+    @ApiModelProperty(value = "支付时间")
 	private Date paymentTime;
+    @ApiModelProperty(value = "创建人")
 	private String createBy;
+    @ApiModelProperty(value = "创建时间")
 	private Date createTime;
+    @ApiModelProperty(value = "更新人")
 	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
 
-		/**
+	/**
 	 *获取ID
 	 */
-	public String getId(){
+    	public String getId(){
 		return id;
 	}
 	
@@ -42,10 +54,10 @@ public class TransactionRecord {
 	public void setId(String id){
 		this.id = id;
 	}
-		/**
+	/**
 	 *获取企业ID
 	 */
-	public String getCompanyId(){
+    	public String getCompanyId(){
 		return companyId;
 	}
 	
@@ -55,10 +67,10 @@ public class TransactionRecord {
 	public void setCompanyId(String companyId){
 		this.companyId = companyId;
 	}
-		/**
+	/**
 	 *获取交易号
 	 */
-	public String getTransactionNumber(){
+    	public String getTransactionNumber(){
 		return transactionNumber;
 	}
 	
@@ -68,10 +80,10 @@ public class TransactionRecord {
 	public void setTransactionNumber(String transactionNumber){
 		this.transactionNumber = transactionNumber;
 	}
-		/**
+	/**
 	 *获取交易金额
 	 */
-	public BigDecimal getAmount(){
+    	public BigDecimal getAmount(){
 		return amount;
 	}
 	
@@ -81,10 +93,10 @@ public class TransactionRecord {
 	public void setAmount(BigDecimal amount){
 		this.amount = amount;
 	}
-		/**
+	/**
 	 *获取订单号
 	 */
-	public String getOrderNo(){
+    	public String getOrderNo(){
 		return orderNo;
 	}
 	
@@ -94,10 +106,10 @@ public class TransactionRecord {
 	public void setOrderNo(String orderNo){
 		this.orderNo = orderNo;
 	}
-		/**
+	/**
 	 *获取支付状态
 	 */
-	public String getPaymentStatus(){
+    	public String getPaymentStatus(){
 		return paymentStatus;
 	}
 	
@@ -107,10 +119,10 @@ public class TransactionRecord {
 	public void setPaymentStatus(String paymentStatus){
 		this.paymentStatus = paymentStatus;
 	}
-		/**
+	/**
 	 *获取支付类型
 	 */
-	public String getBuyType(){
+    	public String getBuyType(){
 		return buyType;
 	}
 	
@@ -120,13 +132,12 @@ public class TransactionRecord {
 	public void setBuyType(String buyType){
 		this.buyType = buyType;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "支付时间")
-		/**
+	/**
 	 *获取支付时间
 	 */
-	public Date getPaymentTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getPaymentTime(){
 		return paymentTime;
 	}
 	
@@ -136,10 +147,10 @@ public class TransactionRecord {
 	public void setPaymentTime(Date paymentTime){
 		this.paymentTime = paymentTime;
 	}
-		/**
+	/**
 	 *获取创建人
 	 */
-	public String getCreateBy(){
+    	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -149,13 +160,12 @@ public class TransactionRecord {
 	public void setCreateBy(String createBy){
 		this.createBy = createBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "创建时间")
-		/**
+	/**
 	 *获取创建时间
 	 */
-	public Date getCreateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
 		return createTime;
 	}
 	
@@ -165,10 +175,10 @@ public class TransactionRecord {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
-		/**
+	/**
 	 *获取更新人
 	 */
-	public String getUpdateBy(){
+    	public String getUpdateBy(){
 		return updateBy;
 	}
 	
@@ -178,13 +188,12 @@ public class TransactionRecord {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-    @ApiModelProperty(value = "更新时间")
-		/**
+	/**
 	 *获取更新时间
 	 */
-	public Date getUpdateTime(){
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
 		return updateTime;
 	}
 	
@@ -194,10 +203,10 @@ public class TransactionRecord {
 	public void setUpdateTime(Date updateTime){
 		this.updateTime = updateTime;
 	}
-		/**
+	/**
 	 *获取是否删除
 	 */
-	public Boolean getDelFlag(){
+    	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	

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

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

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

@@ -0,0 +1,17 @@
+package com.jpsoft.picc.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.common.dto.Sort;
+
+public interface CompanyUserService {
+	CompanyUser get(String id);
+	boolean exist(String id);
+	int insert(CompanyUser model);
+	int update(CompanyUser model);
+	int delete(String id);
+	List<CompanyUser> list();
+	Page<CompanyUser> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+}

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

@@ -0,0 +1,70 @@
+package com.jpsoft.picc.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.picc.modules.base.dao.CompanyUserDAO;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
+import com.jpsoft.picc.modules.base.service.CompanyUserService;
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="companyUserService")
+public class CompanyUserServiceImpl implements CompanyUserService {
+	@Resource(name="companyUserDAO")
+	private CompanyUserDAO companyUserDAO;
+
+	@Override
+	public CompanyUser get(String id) {
+		// TODO Auto-generated method stub
+		return companyUserDAO.get(id);
+	}
+
+	@Override
+	public int insert(CompanyUser model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return companyUserDAO.insert(model);
+	}
+
+	@Override
+	public int update(CompanyUser model) {
+		// TODO Auto-generated method stub
+		return companyUserDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return companyUserDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = companyUserDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<CompanyUser> list() {
+		// TODO Auto-generated method stub
+		return companyUserDAO.list();
+	}
+		
+	@Override
+	public Page<CompanyUser> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
+        Page<CompanyUser> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
+            companyUserDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -1,70 +0,0 @@
-package com.jpsoft.picc.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.picc.modules.base.dao.JobsDAO;
-import com.jpsoft.picc.modules.base.entity.Jobs;
-import com.jpsoft.picc.modules.base.service.JobsService;
-import com.github.pagehelper.Page;
-import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="jobsService")
-public class JobsServiceImpl implements JobsService {
-	@Resource(name="jobsDAO")
-	private JobsDAO jobsDAO;
-
-	@Override
-	public Jobs get(String id) {
-		// TODO Auto-generated method stub
-		return jobsDAO.get(id);
-	}
-
-	@Override
-	public int insert(Jobs model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return jobsDAO.insert(model);
-	}
-
-	@Override
-	public int update(Jobs model) {
-		// TODO Auto-generated method stub
-		return jobsDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return jobsDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = jobsDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Jobs> list() {
-		// TODO Auto-generated method stub
-		return jobsDAO.list();
-	}
-		
-	@Override
-	public Page<Jobs> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<Jobs> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            jobsDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

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

@@ -1,18 +1,25 @@
 package com.jpsoft.picc.modules.business.dao;
 
-import java.util.List;
-import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
-import java.util.Map;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface ApplicationPolicyDAO {
-	int insert(ApplicationPolicy entity);
-	int update(ApplicationPolicy entity);
-	int exist(String id);
-	ApplicationPolicy get(String id);
-	int delete(String id);
-	List<ApplicationPolicy> list();
-	List<ApplicationPolicy> search(Map<String,Object> searchParams,List<Sort> sortList);
+    int insert(ApplicationPolicy entity);
+
+    int update(ApplicationPolicy entity);
+
+    int exist(String id);
+
+    ApplicationPolicy get(String id);
+
+    int delete(String id);
+
+    List<ApplicationPolicy> list();
+
+    List<ApplicationPolicy> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -1,18 +1,25 @@
 package com.jpsoft.picc.modules.business.dao;
 
-import java.util.List;
-import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
-import java.util.Map;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface InsuranceApplicationDAO {
-	int insert(InsuranceApplication entity);
-	int update(InsuranceApplication entity);
-	int exist(String id);
-	InsuranceApplication get(String id);
-	int delete(String id);
-	List<InsuranceApplication> list();
-	List<InsuranceApplication> search(Map<String,Object> searchParams,List<Sort> sortList);
+    int insert(InsuranceApplication entity);
+
+    int update(InsuranceApplication entity);
+
+    int exist(String id);
+
+    InsuranceApplication get(String id);
+
+    int delete(String id);
+
+    List<InsuranceApplication> list();
+
+    List<InsuranceApplication> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -1,18 +1,25 @@
 package com.jpsoft.picc.modules.business.dao;
 
-import java.util.List;
-import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
-import java.util.Map;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface InsurancePolicyDAO {
-	int insert(InsurancePolicy entity);
-	int update(InsurancePolicy entity);
-	int exist(String id);
-	InsurancePolicy get(String id);
-	int delete(String id);
-	List<InsurancePolicy> list();
-	List<InsurancePolicy> search(Map<String,Object> searchParams,List<Sort> sortList);
+    int insert(InsurancePolicy entity);
+
+    int update(InsurancePolicy entity);
+
+    int exist(String id);
+
+    InsurancePolicy get(String id);
+
+    int delete(String id);
+
+    List<InsurancePolicy> list();
+
+    List<InsurancePolicy> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -1,18 +1,25 @@
 package com.jpsoft.picc.modules.business.dao;
 
-import java.util.List;
-import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
-import java.util.Map;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface InsurancePolicyMemberDAO {
-	int insert(InsurancePolicyMember entity);
-	int update(InsurancePolicyMember entity);
-	int exist(String id);
-	InsurancePolicyMember get(String id);
-	int delete(String id);
-	List<InsurancePolicyMember> list();
-	List<InsurancePolicyMember> search(Map<String,Object> searchParams,List<Sort> sortList);
+    int insert(InsurancePolicyMember entity);
+
+    int update(InsurancePolicyMember entity);
+
+    int exist(String id);
+
+    InsurancePolicyMember get(String id);
+
+    int delete(String id);
+
+    List<InsurancePolicyMember> list();
+
+    List<InsurancePolicyMember> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -1,18 +1,25 @@
 package com.jpsoft.picc.modules.business.dao;
 
-import java.util.List;
-import org.springframework.stereotype.Repository;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
-import java.util.Map;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface InsurancePolicyRecordDAO {
-	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);
+
+    InsurancePolicyRecord get(String id);
+
+    int delete(String id);
+
+    List<InsurancePolicyRecord> list();
+
+    List<InsurancePolicyRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/ApplicationPolicy.java

@@ -1,61 +1,59 @@
 package com.jpsoft.picc.modules.business.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
-  描述:business_application_policy的实体类
- 投保单和每月投保单关联表
+ * 描述:business_application_policy的实体类
  */
 @ApiModel(value = "business_application_policy的实体类")
 public class ApplicationPolicy {
-	private String id;
-	private String applicationId;
-	private String policyId;
-
-		/**
-	 *获取ID
-	 */
-	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置ID
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-		/**
-	 *获取投保申请ID
-	 */
-	public String getApplicationId(){
-		return applicationId;
-	}
-	
-	/**
-	 *设置投保申请ID
-	 */
-	public void setApplicationId(String applicationId){
-		this.applicationId = applicationId;
-	}
-		/**
-	 *获取每月投保单ID
-	 */
-	public String getPolicyId(){
-		return policyId;
-	}
-	
-	/**
-	 *设置每月投保单ID
-	 */
-	public void setPolicyId(String policyId){
-		this.policyId = policyId;
-	}
+    private String id;
+    private String applicationId;
+    private String policyId;
+
+    /**
+     * 获取ID
+     */
+    @ApiModelProperty(value = "ID")
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置ID
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取投保申请ID
+     */
+    @ApiModelProperty(value = "投保申请ID")
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    /**
+     * 设置投保申请ID
+     */
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+    }
+
+    /**
+     * 获取每月投保单ID
+     */
+    @ApiModelProperty(value = "每月投保单ID")
+    public String getPolicyId() {
+        return policyId;
+    }
+
+    /**
+     * 设置每月投保单ID
+     */
+    public void setPolicyId(String policyId) {
+        this.policyId = policyId;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsuranceApplication.java

@@ -1,255 +1,280 @@
 package com.jpsoft.picc.modules.business.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
-  描述:business_insurance_application的实体类
- 投保单
+ * 描述:business_insurance_application的实体类
  */
 @ApiModel(value = "business_insurance_application的实体类")
 public class InsuranceApplication {
-	private String id;
-	private String companyId;
-	private String definitionId;
-	private String insuredName;
-	private String insuredTel;
-	private Date startTime;
-	private Date endTime;
-	private Integer number;
-	private BigDecimal insuranceFee;
-	private String status;
-	private String processStatus;
-	private String createBy;
-	private Date createTime;
-	private String updateBy;
-	private Date updateTime;
-	private Boolean delFlag;
-
-		/**
-	 *获取ID
-	 */
-	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置ID
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-		/**
-	 *获取企业ID
-	 */
-	public String getCompanyId(){
-		return companyId;
-	}
-	
-	/**
-	 *设置企业ID
-	 */
-	public void setCompanyId(String companyId){
-		this.companyId = companyId;
-	}
-		/**
-	 *获取保险种类
-	 */
-	public String getDefinitionId(){
-		return definitionId;
-	}
-	
-	/**
-	 *设置保险种类
-	 */
-	public void setDefinitionId(String definitionId){
-		this.definitionId = definitionId;
-	}
-		/**
-	 *获取投保人姓名
-	 */
-	public String getInsuredName(){
-		return insuredName;
-	}
-	
-	/**
-	 *设置投保人姓名
-	 */
-	public void setInsuredName(String insuredName){
-		this.insuredName = insuredName;
-	}
-		/**
-	 *获取联系电话
-	 */
-	public String getInsuredTel(){
-		return insuredTel;
-	}
-	
-	/**
-	 *设置联系电话
-	 */
-	public void setInsuredTel(String insuredTel){
-		this.insuredTel = insuredTel;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    private String id;
+    private String companyId;
+    private String definitionId;
+    private String insuredName;
+    private String insuredTel;
+    private Date startTime;
+    private Date endTime;
+    private Integer number;
+    private BigDecimal insuranceFee;
+    private String status;
+    private String processStatus;
+    private String createBy;
+    private Date createTime;
+    private String updateBy;
+    private Date updateTime;
+    private Boolean delFlag;
+
+    /**
+     * 获取ID
+     */
+    @ApiModelProperty(value = "ID")
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置ID
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取企业ID
+     */
+    @ApiModelProperty(value = "企业ID")
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置企业ID
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取保险种类
+     */
+    @ApiModelProperty(value = "保险种类")
+    public String getDefinitionId() {
+        return definitionId;
+    }
+
+    /**
+     * 设置保险种类
+     */
+    public void setDefinitionId(String definitionId) {
+        this.definitionId = definitionId;
+    }
+
+    /**
+     * 获取投保人姓名
+     */
+    @ApiModelProperty(value = "投保人姓名")
+    public String getInsuredName() {
+        return insuredName;
+    }
+
+    /**
+     * 设置投保人姓名
+     */
+    public void setInsuredName(String insuredName) {
+        this.insuredName = insuredName;
+    }
+
+    /**
+     * 获取联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    public String getInsuredTel() {
+        return insuredTel;
+    }
+
+    /**
+     * 设置联系电话
+     */
+    public void setInsuredTel(String insuredTel) {
+        this.insuredTel = insuredTel;
+    }
+
+    /**
+     * 获取保障开始时间
+     */
     @ApiModelProperty(value = "保障开始时间")
-		/**
-	 *获取保障开始时间
-	 */
-	public Date getStartTime(){
-		return startTime;
-	}
-	
-	/**
-	 *设置保障开始时间
-	 */
-	public void setStartTime(Date startTime){
-		this.startTime = startTime;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    /**
+     * 设置保障开始时间
+     */
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    /**
+     * 获取保障结束时间
+     */
     @ApiModelProperty(value = "保障结束时间")
-		/**
-	 *获取保障结束时间
-	 */
-	public Date getEndTime(){
-		return endTime;
-	}
-	
-	/**
-	 *设置保障结束时间
-	 */
-	public void setEndTime(Date endTime){
-		this.endTime = endTime;
-	}
-		/**
-	 *获取保障数量
-	 */
-	public Integer getNumber(){
-		return number;
-	}
-	
-	/**
-	 *设置保障数量
-	 */
-	public void setNumber(Integer number){
-		this.number = number;
-	}
-		/**
-	 *获取保险费合计(总金额)
-	 */
-	public BigDecimal getInsuranceFee(){
-		return insuranceFee;
-	}
-	
-	/**
-	 *设置保险费合计(总金额)
-	 */
-	public void setInsuranceFee(BigDecimal insuranceFee){
-		this.insuranceFee = insuranceFee;
-	}
-		/**
-	 *获取状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100
-	 */
-	public String getStatus(){
-		return status;
-	}
-	
-	/**
-	 *设置状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100
-	 */
-	public void setStatus(String status){
-		this.status = status;
-	}
-		/**
-	 *获取流程审核状态:正常/回退等
-	 */
-	public String getProcessStatus(){
-		return processStatus;
-	}
-	
-	/**
-	 *设置流程审核状态:正常/回退等
-	 */
-	public void setProcessStatus(String processStatus){
-		this.processStatus = processStatus;
-	}
-		/**
-	 *获取创建人
-	 */
-	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    /**
+     * 设置保障结束时间
+     */
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    /**
+     * 获取保障数量
+     */
+    @ApiModelProperty(value = "保障数量")
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * 设置保障数量
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    /**
+     * 获取保险费合计(总金额)
+     */
+    @ApiModelProperty(value = "保险费合计(总金额)")
+    public BigDecimal getInsuranceFee() {
+        return insuranceFee;
+    }
+
+    /**
+     * 设置保险费合计(总金额)
+     */
+    public void setInsuranceFee(BigDecimal insuranceFee) {
+        this.insuranceFee = insuranceFee;
+    }
+
+    /**
+     * 获取状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100
+     */
+    @ApiModelProperty(value = "状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100")
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取流程审核状态:正常/回退等
+     */
+    @ApiModelProperty(value = "流程审核状态:正常/回退等")
+    public String getProcessStatus() {
+        return processStatus;
+    }
+
+    /**
+     * 设置流程审核状态:正常/回退等
+     */
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    /**
+     * 获取创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 设置创建人
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 获取创建时间
+     */
     @ApiModelProperty(value = "创建时间")
-		/**
-	 *获取创建时间
-	 */
-	public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-		/**
-	 *获取更新人
-	 */
-	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置更新人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 设置更新人
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 获取更新时间
+     */
     @ApiModelProperty(value = "更新时间")
-		/**
-	 *获取更新时间
-	 */
-	public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置更新时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
-		/**
-	 *获取是否删除
-	 */
-	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 设置是否删除
+     */
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -1,300 +1,330 @@
 package com.jpsoft.picc.modules.business.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
-  描述:business_insurance_policy的实体类
- 每月投保单
+ * 描述:business_insurance_policy的实体类
  */
-@ApiModel(value = "每月投保单")
+@ApiModel(value = "business_insurance_policy的实体类")
 public class InsurancePolicy {
-	private String id;
-	private String status;
-	private String processStatus;
-	private BigDecimal insuranceFee;
-	private Date startTime;
-	private Date endTime;
-	private Integer number;
-	private String accountBank;
-	private String issuingBank;
-	private String singlNumber;
-	private Date transferTime;
-	private String agentId;
-	private String insurancePolicyFile;
-	private Integer no;
-	private Boolean delFlag;
-	private String createBy;
-	private Date createTime;
-	private String updateBy;
-	private Date updateTime;
-
-		/**
-	 *获取编号
-	 */
-	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置编号
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-		/**
-	 *获取状态:待制单50/待出单60/已出单70
-	 */
-	public String getStatus(){
-		return status;
-	}
-	
-	/**
-	 *设置状态:待制单50/待出单60/已出单70
-	 */
-	public void setStatus(String status){
-		this.status = status;
-	}
-		/**
-	 *获取流程审核状态:正常/回退等
-	 */
-	public String getProcessStatus(){
-		return processStatus;
-	}
-	
-	/**
-	 *设置流程审核状态:正常/回退等
-	 */
-	public void setProcessStatus(String processStatus){
-		this.processStatus = processStatus;
-	}
-		/**
-	 *获取保险费合计(总金额)
-	 */
-	public BigDecimal getInsuranceFee(){
-		return insuranceFee;
-	}
-	
-	/**
-	 *设置保险费合计(总金额)
-	 */
-	public void setInsuranceFee(BigDecimal insuranceFee){
-		this.insuranceFee = insuranceFee;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    private String id;
+    private String status;
+    private String processStatus;
+    private BigDecimal insuranceFee;
+    private Date startTime;
+    private Date endTime;
+    private Integer number;
+    private String accountBank;
+    private String issuingBank;
+    private String singlNumber;
+    private Date transferTime;
+    private String agentId;
+    private String insurancePolicyFile;
+    private Integer no;
+    private Boolean delFlag;
+    private String createBy;
+    private Date createTime;
+    private String updateBy;
+    private Date updateTime;
+
+    /**
+     * 获取编号
+     */
+    @ApiModelProperty(value = "编号")
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置编号
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取状态:待制单50/待出单60/已出单70
+     */
+    @ApiModelProperty(value = "状态:待制单50/待出单60/已出单70")
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态:待制单50/待出单60/已出单70
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取流程审核状态:正常/回退等
+     */
+    @ApiModelProperty(value = "流程审核状态:正常/回退等")
+    public String getProcessStatus() {
+        return processStatus;
+    }
+
+    /**
+     * 设置流程审核状态:正常/回退等
+     */
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    /**
+     * 获取保险费合计(总金额)
+     */
+    @ApiModelProperty(value = "保险费合计(总金额)")
+    public BigDecimal getInsuranceFee() {
+        return insuranceFee;
+    }
+
+    /**
+     * 设置保险费合计(总金额)
+     */
+    public void setInsuranceFee(BigDecimal insuranceFee) {
+        this.insuranceFee = insuranceFee;
+    }
+
+    /**
+     * 获取开始时间
+     */
     @ApiModelProperty(value = "开始时间")
-		/**
-	 *获取开始时间
-	 */
-	public Date getStartTime(){
-		return startTime;
-	}
-	
-	/**
-	 *设置开始时间
-	 */
-	public void setStartTime(Date startTime){
-		this.startTime = startTime;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    /**
+     * 设置开始时间
+     */
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    /**
+     * 获取结束时间
+     */
     @ApiModelProperty(value = "结束时间")
-		/**
-	 *获取结束时间
-	 */
-	public Date getEndTime(){
-		return endTime;
-	}
-	
-	/**
-	 *设置结束时间
-	 */
-	public void setEndTime(Date endTime){
-		this.endTime = endTime;
-	}
-		/**
-	 *获取人数
-	 */
-	public Integer getNumber(){
-		return number;
-	}
-	
-	/**
-	 *设置人数
-	 */
-	public void setNumber(Integer number){
-		this.number = number;
-	}
-		/**
-	 *获取入账银行
-	 */
-	public String getAccountBank(){
-		return accountBank;
-	}
-	
-	/**
-	 *设置入账银行
-	 */
-	public void setAccountBank(String accountBank){
-		this.accountBank = accountBank;
-	}
-		/**
-	 *获取出账银行
-	 */
-	public String getIssuingBank(){
-		return issuingBank;
-	}
-	
-	/**
-	 *设置出账银行
-	 */
-	public void setIssuingBank(String issuingBank){
-		this.issuingBank = issuingBank;
-	}
-		/**
-	 *获取单号
-	 */
-	public String getSinglNumber(){
-		return singlNumber;
-	}
-	
-	/**
-	 *设置单号
-	 */
-	public void setSinglNumber(String singlNumber){
-		this.singlNumber = singlNumber;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    /**
+     * 设置结束时间
+     */
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    /**
+     * 获取人数
+     */
+    @ApiModelProperty(value = "人数")
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * 设置人数
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    /**
+     * 获取入账银行
+     */
+    @ApiModelProperty(value = "入账银行")
+    public String getAccountBank() {
+        return accountBank;
+    }
+
+    /**
+     * 设置入账银行
+     */
+    public void setAccountBank(String accountBank) {
+        this.accountBank = accountBank;
+    }
+
+    /**
+     * 获取出账银行
+     */
+    @ApiModelProperty(value = "出账银行")
+    public String getIssuingBank() {
+        return issuingBank;
+    }
+
+    /**
+     * 设置出账银行
+     */
+    public void setIssuingBank(String issuingBank) {
+        this.issuingBank = issuingBank;
+    }
+
+    /**
+     * 获取单号
+     */
+    @ApiModelProperty(value = "单号")
+    public String getSinglNumber() {
+        return singlNumber;
+    }
+
+    /**
+     * 设置单号
+     */
+    public void setSinglNumber(String singlNumber) {
+        this.singlNumber = singlNumber;
+    }
+
+    /**
+     * 获取转账时间
+     */
     @ApiModelProperty(value = "转账时间")
-		/**
-	 *获取转账时间
-	 */
-	public Date getTransferTime(){
-		return transferTime;
-	}
-	
-	/**
-	 *设置转账时间
-	 */
-	public void setTransferTime(Date transferTime){
-		this.transferTime = transferTime;
-	}
-		/**
-	 *获取保险代理人
-	 */
-	public String getAgentId(){
-		return agentId;
-	}
-	
-	/**
-	 *设置保险代理人
-	 */
-	public void setAgentId(String agentId){
-		this.agentId = agentId;
-	}
-		/**
-	 *获取投保单附件
-	 */
-	public String getInsurancePolicyFile(){
-		return insurancePolicyFile;
-	}
-	
-	/**
-	 *设置投保单附件
-	 */
-	public void setInsurancePolicyFile(String insurancePolicyFile){
-		this.insurancePolicyFile = insurancePolicyFile;
-	}
-		/**
-	 *获取当前第几份
-	 */
-	public Integer getNo(){
-		return no;
-	}
-	
-	/**
-	 *设置当前第几份
-	 */
-	public void setNo(Integer no){
-		this.no = no;
-	}
-		/**
-	 *获取是否删除
-	 */
-	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
-		/**
-	 *获取创建人
-	 */
-	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getTransferTime() {
+        return transferTime;
+    }
+
+    /**
+     * 设置转账时间
+     */
+    public void setTransferTime(Date transferTime) {
+        this.transferTime = transferTime;
+    }
+
+    /**
+     * 获取保险代理人
+     */
+    @ApiModelProperty(value = "保险代理人")
+    public String getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 设置保险代理人
+     */
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 获取投保单附件
+     */
+    @ApiModelProperty(value = "投保单附件")
+    public String getInsurancePolicyFile() {
+        return insurancePolicyFile;
+    }
+
+    /**
+     * 设置投保单附件
+     */
+    public void setInsurancePolicyFile(String insurancePolicyFile) {
+        this.insurancePolicyFile = insurancePolicyFile;
+    }
+
+    /**
+     * 获取当前第几份
+     */
+    @ApiModelProperty(value = "当前第几份")
+    public Integer getNo() {
+        return no;
+    }
+
+    /**
+     * 设置当前第几份
+     */
+    public void setNo(Integer no) {
+        this.no = no;
+    }
+
+    /**
+     * 获取是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 设置是否删除
+     */
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 获取创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 设置创建人
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 获取创建时间
+     */
     @ApiModelProperty(value = "创建时间")
-		/**
-	 *获取创建时间
-	 */
-	public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-		/**
-	 *获取修改人
-	 */
-	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置修改人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 设置修改人
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 获取修改时间
+     */
     @ApiModelProperty(value = "修改时间")
-		/**
-	 *获取修改时间
-	 */
-	public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置修改时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicyMember.java

@@ -1,165 +1,179 @@
 package com.jpsoft.picc.modules.business.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
-  描述:business_insurance_policy_member的实体类
- 每月投保单花名册
+ * 描述:business_insurance_policy_member的实体类
  */
-@ApiModel(value = "每月投保单花名册")
+@ApiModel(value = "business_insurance_policy_member的实体类")
 public class InsurancePolicyMember {
-	private String id;
-	private String policyId;
-	private String memberId;
-	private String status;
-	private Boolean isAdd;
-	private Boolean delFlag;
-	private String createBy;
-	private Date createTime;
-	private String updateBy;
-	private Date updateTime;
-
-		/**
-	 *获取编号
-	 */
-	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置编号
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-		/**
-	 *获取每月投保单ID
-	 */
-	public String getPolicyId(){
-		return policyId;
-	}
-	
-	/**
-	 *设置每月投保单ID
-	 */
-	public void setPolicyId(String policyId){
-		this.policyId = policyId;
-	}
-		/**
-	 *获取企业用户ID
-	 */
-	public String getMemberId(){
-		return memberId;
-	}
-	
-	/**
-	 *设置企业用户ID
-	 */
-	public void setMemberId(String memberId){
-		this.memberId = memberId;
-	}
-		/**
-	 *获取审核状态
-	 */
-	public String getStatus(){
-		return status;
-	}
-	
-	/**
-	 *设置审核状态
-	 */
-	public void setStatus(String status){
-		this.status = status;
-	}
-		/**
-	 *获取是否为增补
-	 */
-	public Boolean getIsAdd(){
-		return isAdd;
-	}
-	
-	/**
-	 *设置是否为增补
-	 */
-	public void setIsAdd(Boolean isAdd){
-		this.isAdd = isAdd;
-	}
-		/**
-	 *获取是否删除
-	 */
-	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
-		/**
-	 *获取创建人
-	 */
-	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    private String id;
+    private String policyId;
+    private String memberId;
+    private String status;
+    private Boolean isAdd;
+    private Boolean delFlag;
+    private String createBy;
+    private Date createTime;
+    private String updateBy;
+    private Date updateTime;
+
+    /**
+     * 获取编号
+     */
+    @ApiModelProperty(value = "编号")
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置编号
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取每月投保单ID
+     */
+    @ApiModelProperty(value = "每月投保单ID")
+    public String getPolicyId() {
+        return policyId;
+    }
+
+    /**
+     * 设置每月投保单ID
+     */
+    public void setPolicyId(String policyId) {
+        this.policyId = policyId;
+    }
+
+    /**
+     * 获取企业用户ID
+     */
+    @ApiModelProperty(value = "企业用户ID")
+    public String getMemberId() {
+        return memberId;
+    }
+
+    /**
+     * 设置企业用户ID
+     */
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * 获取审核状态
+     */
+    @ApiModelProperty(value = "审核状态")
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置审核状态
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取是否为增补
+     */
+    @ApiModelProperty(value = "是否为增补")
+    public Boolean getIsAdd() {
+        return isAdd;
+    }
+
+    /**
+     * 设置是否为增补
+     */
+    public void setIsAdd(Boolean isAdd) {
+        this.isAdd = isAdd;
+    }
+
+    /**
+     * 获取是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 设置是否删除
+     */
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 获取创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 设置创建人
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 获取创建时间
+     */
     @ApiModelProperty(value = "创建时间")
-		/**
-	 *获取创建时间
-	 */
-	public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-		/**
-	 *获取修改人
-	 */
-	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置修改人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 设置修改人
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 获取修改时间
+     */
     @ApiModelProperty(value = "修改时间")
-		/**
-	 *获取修改时间
-	 */
-	public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置修改时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicyRecord.java

@@ -1,151 +1,163 @@
 package com.jpsoft.picc.modules.business.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
-  描述:business_insurance_policy_record的实体类
- 每月投保单审核流水
+ * 描述:business_insurance_policy_record的实体类
  */
-@ApiModel(value = "每月投保单审核流水")
+@ApiModel(value = "business_insurance_policy_record的实体类")
 public class InsurancePolicyRecord {
-	private String id;
-	private String policyId;
-	private String opinion;
-	private String processStatus;
-	private Boolean delFlag;
-	private String createBy;
-	private Date createTime;
-	private String updateBy;
-	private Date updateTime;
-
-		/**
-	 *获取编号
-	 */
-	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置编号
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-		/**
-	 *获取每月投保单申请ID
-	 */
-	public String getPolicyId(){
-		return policyId;
-	}
-	
-	/**
-	 *设置每月投保单申请ID
-	 */
-	public void setPolicyId(String policyId){
-		this.policyId = policyId;
-	}
-		/**
-	 *获取意见
-	 */
-	public String getOpinion(){
-		return opinion;
-	}
-	
-	/**
-	 *设置意见
-	 */
-	public void setOpinion(String opinion){
-		this.opinion = opinion;
-	}
-		/**
-	 *获取流程审核状态:正常/回退等
-	 */
-	public String getProcessStatus(){
-		return processStatus;
-	}
-	
-	/**
-	 *设置流程审核状态:正常/回退等
-	 */
-	public void setProcessStatus(String processStatus){
-		this.processStatus = processStatus;
-	}
-		/**
-	 *获取是否删除
-	 */
-	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
-		/**
-	 *获取创建人
-	 */
-	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    private String id;
+    private String policyId;
+    private String opinion;
+    private String processStatus;
+    private Boolean delFlag;
+    private String createBy;
+    private Date createTime;
+    private String updateBy;
+    private Date updateTime;
+
+    /**
+     * 获取编号
+     */
+    @ApiModelProperty(value = "编号")
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置编号
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取每月投保单申请ID
+     */
+    @ApiModelProperty(value = "每月投保单申请ID")
+    public String getPolicyId() {
+        return policyId;
+    }
+
+    /**
+     * 设置每月投保单申请ID
+     */
+    public void setPolicyId(String policyId) {
+        this.policyId = policyId;
+    }
+
+    /**
+     * 获取意见
+     */
+    @ApiModelProperty(value = "意见")
+    public String getOpinion() {
+        return opinion;
+    }
+
+    /**
+     * 设置意见
+     */
+    public void setOpinion(String opinion) {
+        this.opinion = opinion;
+    }
+
+    /**
+     * 获取流程审核状态:正常/回退等
+     */
+    @ApiModelProperty(value = "流程审核状态:正常/回退等")
+    public String getProcessStatus() {
+        return processStatus;
+    }
+
+    /**
+     * 设置流程审核状态:正常/回退等
+     */
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    /**
+     * 获取是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 设置是否删除
+     */
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 获取创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 设置创建人
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 获取创建时间
+     */
     @ApiModelProperty(value = "创建时间")
-		/**
-	 *获取创建时间
-	 */
-	public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-		/**
-	 *获取修改人
-	 */
-	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置修改人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 设置修改人
+     */
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 获取修改时间
+     */
     @ApiModelProperty(value = "修改时间")
-		/**
-	 *获取修改时间
-	 */
-	public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置修改时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -1,17 +1,24 @@
 package com.jpsoft.picc.modules.business.service;
 
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.List;
+import java.util.Map;
+
 public interface ApplicationPolicyService {
-	ApplicationPolicy get(String id);
-	boolean exist(String id);
-	int insert(ApplicationPolicy model);
-	int update(ApplicationPolicy model);
-	int delete(String id);
-	List<ApplicationPolicy> list();
-	Page<ApplicationPolicy> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+    ApplicationPolicy get(String id);
+
+    boolean exist(String id);
+
+    int insert(ApplicationPolicy model);
+
+    int update(ApplicationPolicy model);
+
+    int delete(String id);
+
+    List<ApplicationPolicy> list();
+
+    Page<ApplicationPolicy> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

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

@@ -1,17 +1,24 @@
 package com.jpsoft.picc.modules.business.service;
 
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.List;
+import java.util.Map;
+
 public interface InsuranceApplicationService {
-	InsuranceApplication get(String id);
-	boolean exist(String id);
-	int insert(InsuranceApplication model);
-	int update(InsuranceApplication model);
-	int delete(String id);
-	List<InsuranceApplication> list();
-	Page<InsuranceApplication> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+    InsuranceApplication get(String id);
+
+    boolean exist(String id);
+
+    int insert(InsuranceApplication model);
+
+    int update(InsuranceApplication model);
+
+    int delete(String id);
+
+    List<InsuranceApplication> list();
+
+    Page<InsuranceApplication> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

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

@@ -1,17 +1,24 @@
 package com.jpsoft.picc.modules.business.service;
 
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.List;
+import java.util.Map;
+
 public interface InsurancePolicyMemberService {
-	InsurancePolicyMember get(String id);
-	boolean exist(String id);
-	int insert(InsurancePolicyMember model);
-	int update(InsurancePolicyMember model);
-	int delete(String id);
-	List<InsurancePolicyMember> list();
-	Page<InsurancePolicyMember> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+    InsurancePolicyMember get(String id);
+
+    boolean exist(String id);
+
+    int insert(InsurancePolicyMember model);
+
+    int update(InsurancePolicyMember model);
+
+    int delete(String id);
+
+    List<InsurancePolicyMember> list();
+
+    Page<InsurancePolicyMember> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

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

@@ -1,17 +1,24 @@
 package com.jpsoft.picc.modules.business.service;
 
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.List;
+import java.util.Map;
+
 public interface InsurancePolicyRecordService {
-	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);
+
+    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);
 }

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

@@ -1,17 +1,24 @@
 package com.jpsoft.picc.modules.business.service;
 
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.common.dto.Sort;
 
+import java.util.List;
+import java.util.Map;
+
 public interface InsurancePolicyService {
-	InsurancePolicy get(String id);
-	boolean exist(String id);
-	int insert(InsurancePolicy model);
-	int update(InsurancePolicy model);
-	int delete(String id);
-	List<InsurancePolicy> list();
-	Page<InsurancePolicy> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+    InsurancePolicy get(String id);
+
+    boolean exist(String id);
+
+    int insert(InsurancePolicy model);
+
+    int update(InsurancePolicy model);
+
+    int delete(String id);
+
+    List<InsurancePolicy> list();
+
+    Page<InsurancePolicy> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

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

@@ -1,70 +1,70 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.ApplicationPolicyDAO;
 import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
 import com.jpsoft.picc.modules.business.service.ApplicationPolicyService;
-import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 @Transactional
-@Component(value="applicationPolicyService")
+@Component(value = "applicationPolicyService")
 public class ApplicationPolicyServiceImpl implements ApplicationPolicyService {
-	@Resource(name="applicationPolicyDAO")
-	private ApplicationPolicyDAO applicationPolicyDAO;
+    @Resource(name = "applicationPolicyDAO")
+    private ApplicationPolicyDAO applicationPolicyDAO;
 
-	@Override
-	public ApplicationPolicy get(String id) {
-		// TODO Auto-generated method stub
-		return applicationPolicyDAO.get(id);
-	}
+    @Override
+    public ApplicationPolicy get(String id) {
+        // TODO Auto-generated method stub
+        return applicationPolicyDAO.get(id);
+    }
 
-	@Override
-	public int insert(ApplicationPolicy model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return applicationPolicyDAO.insert(model);
-	}
+    @Override
+    public int insert(ApplicationPolicy model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(ApplicationPolicy model) {
-		// TODO Auto-generated method stub
-		return applicationPolicyDAO.update(model);		
-	}
+        return applicationPolicyDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return applicationPolicyDAO.delete(id);
-	}
+    @Override
+    public int update(ApplicationPolicy model) {
+        // TODO Auto-generated method stub
+        return applicationPolicyDAO.update(model);
+    }
 
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = applicationPolicyDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<ApplicationPolicy> list() {
-		// TODO Auto-generated method stub
-		return applicationPolicyDAO.list();
-	}
-		
-	@Override
-	public Page<ApplicationPolicy> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<ApplicationPolicy> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            applicationPolicyDAO.search(searchParams,sortList);
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return applicationPolicyDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = applicationPolicyDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<ApplicationPolicy> list() {
+        // TODO Auto-generated method stub
+        return applicationPolicyDAO.list();
+    }
+
+    @Override
+    public Page<ApplicationPolicy> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<ApplicationPolicy> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
+            applicationPolicyDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 }

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

@@ -1,70 +1,70 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.InsuranceApplicationDAO;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
-import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 @Transactional
-@Component(value="insuranceApplicationService")
+@Component(value = "insuranceApplicationService")
 public class InsuranceApplicationServiceImpl implements InsuranceApplicationService {
-	@Resource(name="insuranceApplicationDAO")
-	private InsuranceApplicationDAO insuranceApplicationDAO;
+    @Resource(name = "insuranceApplicationDAO")
+    private InsuranceApplicationDAO insuranceApplicationDAO;
 
-	@Override
-	public InsuranceApplication get(String id) {
-		// TODO Auto-generated method stub
-		return insuranceApplicationDAO.get(id);
-	}
+    @Override
+    public InsuranceApplication get(String id) {
+        // TODO Auto-generated method stub
+        return insuranceApplicationDAO.get(id);
+    }
 
-	@Override
-	public int insert(InsuranceApplication model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return insuranceApplicationDAO.insert(model);
-	}
+    @Override
+    public int insert(InsuranceApplication model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(InsuranceApplication model) {
-		// TODO Auto-generated method stub
-		return insuranceApplicationDAO.update(model);		
-	}
+        return insuranceApplicationDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return insuranceApplicationDAO.delete(id);
-	}
+    @Override
+    public int update(InsuranceApplication model) {
+        // TODO Auto-generated method stub
+        return insuranceApplicationDAO.update(model);
+    }
 
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = insuranceApplicationDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<InsuranceApplication> list() {
-		// TODO Auto-generated method stub
-		return insuranceApplicationDAO.list();
-	}
-		
-	@Override
-	public Page<InsuranceApplication> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<InsuranceApplication> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            insuranceApplicationDAO.search(searchParams,sortList);
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return insuranceApplicationDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = insuranceApplicationDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<InsuranceApplication> list() {
+        // TODO Auto-generated method stub
+        return insuranceApplicationDAO.list();
+    }
+
+    @Override
+    public Page<InsuranceApplication> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<InsuranceApplication> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
+            insuranceApplicationDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 }

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

@@ -1,70 +1,70 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.InsurancePolicyMemberDAO;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
-import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 @Transactional
-@Component(value="insurancePolicyMemberService")
+@Component(value = "insurancePolicyMemberService")
 public class InsurancePolicyMemberServiceImpl implements InsurancePolicyMemberService {
-	@Resource(name="insurancePolicyMemberDAO")
-	private InsurancePolicyMemberDAO insurancePolicyMemberDAO;
+    @Resource(name = "insurancePolicyMemberDAO")
+    private InsurancePolicyMemberDAO insurancePolicyMemberDAO;
 
-	@Override
-	public InsurancePolicyMember get(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyMemberDAO.get(id);
-	}
+    @Override
+    public InsurancePolicyMember get(String id) {
+        // TODO Auto-generated method stub
+        return insurancePolicyMemberDAO.get(id);
+    }
 
-	@Override
-	public int insert(InsurancePolicyMember model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return insurancePolicyMemberDAO.insert(model);
-	}
+    @Override
+    public int insert(InsurancePolicyMember model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(InsurancePolicyMember model) {
-		// TODO Auto-generated method stub
-		return insurancePolicyMemberDAO.update(model);		
-	}
+        return insurancePolicyMemberDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyMemberDAO.delete(id);
-	}
+    @Override
+    public int update(InsurancePolicyMember model) {
+        // TODO Auto-generated method stub
+        return insurancePolicyMemberDAO.update(model);
+    }
 
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = insurancePolicyMemberDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<InsurancePolicyMember> list() {
-		// TODO Auto-generated method stub
-		return insurancePolicyMemberDAO.list();
-	}
-		
-	@Override
-	public Page<InsurancePolicyMember> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<InsurancePolicyMember> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            insurancePolicyMemberDAO.search(searchParams,sortList);
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return insurancePolicyMemberDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = insurancePolicyMemberDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<InsurancePolicyMember> list() {
+        // TODO Auto-generated method stub
+        return insurancePolicyMemberDAO.list();
+    }
+
+    @Override
+    public Page<InsurancePolicyMember> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<InsurancePolicyMember> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
+            insurancePolicyMemberDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 }

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

@@ -1,70 +1,70 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.InsurancePolicyRecordDAO;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyRecordService;
-import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 @Transactional
-@Component(value="insurancePolicyRecordService")
+@Component(value = "insurancePolicyRecordService")
 public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordService {
-	@Resource(name="insurancePolicyRecordDAO")
-	private InsurancePolicyRecordDAO insurancePolicyRecordDAO;
+    @Resource(name = "insurancePolicyRecordDAO")
+    private InsurancePolicyRecordDAO insurancePolicyRecordDAO;
 
-	@Override
-	public InsurancePolicyRecord get(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyRecordDAO.get(id);
-	}
+    @Override
+    public InsurancePolicyRecord get(String id) {
+        // TODO Auto-generated method stub
+        return insurancePolicyRecordDAO.get(id);
+    }
 
-	@Override
-	public int insert(InsurancePolicyRecord model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return insurancePolicyRecordDAO.insert(model);
-	}
+    @Override
+    public int insert(InsurancePolicyRecord model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(InsurancePolicyRecord model) {
-		// TODO Auto-generated method stub
-		return insurancePolicyRecordDAO.update(model);		
-	}
+        return insurancePolicyRecordDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyRecordDAO.delete(id);
-	}
+    @Override
+    public int update(InsurancePolicyRecord model) {
+        // TODO Auto-generated method stub
+        return insurancePolicyRecordDAO.update(model);
+    }
 
-	@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 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);
         });
-        
+
         return page;
-	}
+    }
 }

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

@@ -1,70 +1,70 @@
 package com.jpsoft.picc.modules.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.jpsoft.picc.modules.business.dao.InsurancePolicyDAO;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
-import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 @Transactional
-@Component(value="insurancePolicyService")
+@Component(value = "insurancePolicyService")
 public class InsurancePolicyServiceImpl implements InsurancePolicyService {
-	@Resource(name="insurancePolicyDAO")
-	private InsurancePolicyDAO insurancePolicyDAO;
+    @Resource(name = "insurancePolicyDAO")
+    private InsurancePolicyDAO insurancePolicyDAO;
 
-	@Override
-	public InsurancePolicy get(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyDAO.get(id);
-	}
+    @Override
+    public InsurancePolicy get(String id) {
+        // TODO Auto-generated method stub
+        return insurancePolicyDAO.get(id);
+    }
 
-	@Override
-	public int insert(InsurancePolicy model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return insurancePolicyDAO.insert(model);
-	}
+    @Override
+    public int insert(InsurancePolicy model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
 
-	@Override
-	public int update(InsurancePolicy model) {
-		// TODO Auto-generated method stub
-		return insurancePolicyDAO.update(model);		
-	}
+        return insurancePolicyDAO.insert(model);
+    }
 
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return insurancePolicyDAO.delete(id);
-	}
+    @Override
+    public int update(InsurancePolicy model) {
+        // TODO Auto-generated method stub
+        return insurancePolicyDAO.update(model);
+    }
 
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = insurancePolicyDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<InsurancePolicy> list() {
-		// TODO Auto-generated method stub
-		return insurancePolicyDAO.list();
-	}
-		
-	@Override
-	public Page<InsurancePolicy> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
-        Page<InsurancePolicy> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{
-            insurancePolicyDAO.search(searchParams,sortList);
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return insurancePolicyDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = insurancePolicyDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<InsurancePolicy> list() {
+        // TODO Auto-generated method stub
+        return insurancePolicyDAO.list();
+    }
+
+    @Override
+    public Page<InsurancePolicy> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, List<Sort> sortList) {
+        Page<InsurancePolicy> page = PageHelper.startPage(pageNumber, pageSize).doSelectPage(() -> {
+            insurancePolicyDAO.search(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/common/config/OSSConfig.java

@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Component
-@ConfigurationProperties(prefix = "oss" )
+@ConfigurationProperties(prefix = "oss")
 @Data
 public class OSSConfig {
     private String accessKeyId;

picc-common/src/main/java/com/jpsoft/picc/modules/common/dto/MessageResult.java

@@ -1,49 +1,48 @@
 package com.jpsoft.picc.modules.common.dto;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-@ApiModel(value="返回消息体")
+@ApiModel(value = "返回消息体")
 public class MessageResult<T> {
-	private boolean result;
-	private String message;
-	private T data;
-	private int code = 200;
-
-	@ApiModelProperty(value="返回调用结果")
-	public boolean isResult() {
-		return result;
-	}
-
-	public void setResult(boolean result) {
-		this.result = result;
-	}
-
-	@ApiModelProperty(value="返回消息")
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	@ApiModelProperty(value="返回数据")
-	public T getData() {
-		return data;
-	}
-
-	public void setData(T data) {
-		this.data = data;
-	}
-
-	@ApiModelProperty(value="返回代码")
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
+    private boolean result;
+    private String message;
+    private T data;
+    private int code = 200;
+
+    @ApiModelProperty(value = "返回调用结果")
+    public boolean isResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+
+    @ApiModelProperty(value = "返回消息")
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @ApiModelProperty(value = "返回数据")
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    @ApiModelProperty(value = "返回代码")
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/Base64.java

@@ -2,17 +2,17 @@ package com.jpsoft.picc.modules.common.utils;
 
 public final class Base64 {
 
-    static private final int     BASELENGTH           = 128;
-    static private final int     LOOKUPLENGTH         = 64;
-    static private final int     TWENTYFOURBITGROUP   = 24;
-    static private final int     EIGHTBIT             = 8;
-    static private final int     SIXTEENBIT           = 16;
-    static private final int     FOURBYTE             = 4;
-    static private final int     SIGN                 = -128;
-    static private final char    PAD                  = '=';
-    static private final boolean fDebug               = false;
-    static final private byte[]  base64Alphabet       = new byte[BASELENGTH];
-    static final private char[]  lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+    static private final int BASELENGTH = 128;
+    static private final int LOOKUPLENGTH = 64;
+    static private final int TWENTYFOURBITGROUP = 24;
+    static private final int EIGHTBIT = 8;
+    static private final int SIXTEENBIT = 16;
+    static private final int FOURBYTE = 4;
+    static private final int SIGN = -128;
+    static private final char PAD = '=';
+    static private final boolean fDebug = false;
+    static final private byte[] base64Alphabet = new byte[BASELENGTH];
+    static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
 
     static {
         for (int i = 0; i < BASELENGTH; ++i) {
@@ -252,8 +252,8 @@ public final class Base64 {
     /**
      * remove WhiteSpace from MIME containing encoded Base64 data.
      *
-     * @param data  the byte array of base64 data (with WS)
-     * @return      the new length
+     * @param data the byte array of base64 data (with WS)
+     * @return the new length
      */
     private static int removeWhiteSpace(char[] data) {
         if (data == null) {

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/DES3.java

@@ -7,7 +7,9 @@ import java.io.UnsupportedEncodingException;
 import java.security.Key;
 
 public class DES3 {
-	public String encrypt(byte[] key, byte[] data)  throws Exception {
+    public final static String DEFAULT_KEY = "jpsoft";
+
+    public String encrypt(byte[] key, byte[] data) throws Exception {
 
         Key deskey = null;
         DESedeKeySpec spec = new DESedeKeySpec(key);
@@ -19,9 +21,9 @@ public class DES3 {
 
         return Base64.encode(bOut);
     }
-    
-    public String encrypt(String key, String data)  throws Exception {
-    	return encrypt(getKeyByte(key),data.getBytes("UTF-8"));
+
+    public String encrypt(String key, String data) throws Exception {
+        return encrypt(getKeyByte(key), data.getBytes("UTF-8"));
     }
 
     public String decrypt(byte[] key, byte[] data) throws Exception {
@@ -38,9 +40,9 @@ public class DES3 {
 
         return new String(bOut, "UTF-8");
     }
-    
-    public String decrypt(String key, String data)  throws Exception {
-    	return decrypt(getKeyByte(key), Base64.decode(data));
+
+    public String decrypt(String key, String data) throws Exception {
+        return decrypt(getKeyByte(key), Base64.decode(data));
     }
 
     public byte[] getKeyByte(String key) throws UnsupportedEncodingException {
@@ -55,22 +57,22 @@ public class DES3 {
             for (int i = 0; i < (24 - length); i++) {
                 key += "0";
             }
-            
+
             return key.getBytes("UTF-8");
         }
     }
-    
+
     public static void main(String[] args) {
-    	DES3 des3 = new DES3();
-		String appKey = "8ZZAHLlTMeNRCP6X";
-		
-		try {
-			System.out.println(des3.encrypt(appKey, "ac5c629f-068d-4b8d-8700-3c3d362337f0"));
-
-			System.out.println(des3.decrypt(appKey, "Xkb9FDXbmw8tEybl2ItjvomEK0QrL+pn6wt9yO7/vA7G9jIUiDhFLg=="));
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
+        DES3 des3 = new DES3();
+        String appKey = "8ZZAHLlTMeNRCP6X";
+
+        try {
+            System.out.println(des3.encrypt(appKey, "ac5c629f-068d-4b8d-8700-3c3d362337f0"));
+
+            System.out.println(des3.decrypt(appKey, "Xkb9FDXbmw8tEybl2ItjvomEK0QrL+pn6wt9yO7/vA7G9jIUiDhFLg=="));
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/POIUtils.java

@@ -1,14 +1,9 @@
 package com.jpsoft.picc.modules.common.utils;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.poi.hssf.converter.ExcelToHtmlConverter;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.w3c.dom.Document;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -16,22 +11,22 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.apache.poi.hssf.converter.ExcelToHtmlConverter;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
-import org.w3c.dom.Document;
+import java.io.*;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Description:POI解析Excel获取所有数据(支持xls/xlsx)
- * @author zhjun 2015-11-5
  *
+ * @author zhjun 2015-11-5
  */
 public class POIUtils {
-	InputStream ins = null;
-	Workbook wb = null;
-	List<Object[]> dataList = new ArrayList<Object[]>(100);
-	
+    InputStream ins = null;
+    Workbook wb = null;
+    List<Object[]> dataList = new ArrayList<Object[]>(100);
+
     public static void CreateBorder(CellStyle cellStyle) {
         if (cellStyle != null) {
             cellStyle.setBorderTop(BorderStyle.THIN);
@@ -40,328 +35,332 @@ public class POIUtils {
             cellStyle.setBorderRight(BorderStyle.THIN);
         }
     }
-    
+
     public static Cell setCellValue(Row row, int i, String value) {
-		// TODO Auto-generated method stub
-		Cell cell = row.createCell(i);
-		cell.setCellValue(value);
-		
-		return cell;
-	}
-	
+        // TODO Auto-generated method stub
+        Cell cell = row.createCell(i);
+        cell.setCellValue(value);
+
+        return cell;
+    }
+
     public static Cell setCellValue(Row row, int i, int value) {
-		// TODO Auto-generated method stub
-		Cell cell = row.createCell(i);
-		cell.setCellValue(value);
-		
-		return cell;
-	}
-    
-    public static Cell setCellValue(Row row,int cellIndex,CellStyle cellStyle,Object value) {
-		Cell cell = row.createCell(cellIndex);
-		cell.setCellStyle(cellStyle);
-		
-		if(value!=null) {
-			if (value instanceof BigDecimal) {
-				cell.setCellValue(((BigDecimal)value).doubleValue());				
-			}
-			else if(value instanceof String) {
-				cell.setCellValue(value.toString());
-			}
-			else if(value instanceof Integer) {
-				cell.setCellValue(Double.valueOf(value.toString()));
-			}
-			else if(value instanceof Long) {
-				cell.setCellValue(Double.valueOf(value.toString()));
-			}
-		}
-		
-		return cell;
-	}
-	
-    public static String xls2html(HSSFWorkbook wb){
-    	String result = "";
-    	
-    	try{
-	    	ExcelToHtmlConverter converter = new ExcelToHtmlConverter( DocumentBuilderFactory.newInstance().newDocumentBuilder() .newDocument()); 
-			converter.setOutputColumnHeaders(false);
-			converter.setOutputRowNumbers(false);
-			
-			converter.processWorkbook(wb);
-	
-			Document htmlDocument = converter.getDocument();     
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			DOMSource domSource = new DOMSource(htmlDocument);     
-			StreamResult streamResult = new StreamResult(out);      
-			TransformerFactory tf = TransformerFactory.newInstance();    
-			Transformer serializer = tf.newTransformer();     
-			serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");     
-			serializer.setOutputProperty(OutputKeys.INDENT, "yes");     
-			serializer.setOutputProperty(OutputKeys.METHOD, "html");     
-			serializer.transform(domSource, streamResult);
-			out.close(); 
-			
-			result = new String(out.toByteArray(),"UTF-8");
-    	}
-    	catch(Exception ex){
-    		ex.printStackTrace();
-    	}
-    	
-    	return result;
+        // TODO Auto-generated method stub
+        Cell cell = row.createCell(i);
+        cell.setCellValue(value);
+
+        return cell;
+    }
+
+    public static Cell setCellValue(Row row, int cellIndex, CellStyle cellStyle, Object value) {
+        Cell cell = row.createCell(cellIndex);
+        cell.setCellStyle(cellStyle);
+
+        if (value != null) {
+            if (value instanceof BigDecimal) {
+                cell.setCellValue(((BigDecimal) value).doubleValue());
+            } else if (value instanceof String) {
+                cell.setCellValue(value.toString());
+            } else if (value instanceof Integer) {
+                cell.setCellValue(Double.valueOf(value.toString()));
+            } else if (value instanceof Long) {
+                cell.setCellValue(Double.valueOf(value.toString()));
+            }
+        }
+
+        return cell;
+    }
+
+    public static String xls2html(HSSFWorkbook wb) {
+        String result = "";
+
+        try {
+            ExcelToHtmlConverter converter = new ExcelToHtmlConverter(DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument());
+            converter.setOutputColumnHeaders(false);
+            converter.setOutputRowNumbers(false);
+
+            converter.processWorkbook(wb);
+
+            Document htmlDocument = converter.getDocument();
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            DOMSource domSource = new DOMSource(htmlDocument);
+            StreamResult streamResult = new StreamResult(out);
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer serializer = tf.newTransformer();
+            serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+            serializer.setOutputProperty(OutputKeys.METHOD, "html");
+            serializer.transform(domSource, streamResult);
+            out.close();
+
+            result = new String(out.toByteArray(), "UTF-8");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过流读取
+     *
+     * @param ins
+     */
+    public POIUtils(InputStream ins) {
+        try {
+            wb = WorkbookFactory.create(ins);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (ins != null) {
+                try {
+                    ins.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 通过文件读取
+     *
+     * @param file
+     */
+    public POIUtils(File file) {
+        try {
+            ins = new FileInputStream(file);
+            wb = WorkbookFactory.create(ins);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (ins != null) {
+                try {
+                    ins.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 通过文件路径读取
+     *
+     * @param path
+     */
+    public POIUtils(String path) {
+        try {
+            ins = new FileInputStream(path);
+            wb = WorkbookFactory.create(ins);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (ins != null) {
+                try {
+                    ins.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 
-	/**
-	 * 通过流读取
-	 * @param ins
-	 */
-	public POIUtils(InputStream ins){
-		try{
-			wb = WorkbookFactory.create(ins);
-		}
-		catch(Exception e) {
-			e.printStackTrace();
-		}finally{
-			if(ins != null){
-				try{
-					ins.close();
-				}catch(IOException e){
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 通过文件读取
-	 * @param file
-	 */
-	public POIUtils(File file){
-		try{
-			ins = new FileInputStream(file);
-			wb = WorkbookFactory.create(ins);
-		}catch(Exception e) {
-			e.printStackTrace();
-		}finally{
-			if(ins != null){
-				try{
-					ins.close();
-				}catch(IOException e){
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 通过文件路径读取
-	 * @param path
-	 */
-	public POIUtils(String path){
-		try{
-			ins = new FileInputStream(path);
-			wb = WorkbookFactory.create(ins);
-		}catch(Exception e) {
-			e.printStackTrace();
-		}finally{
-			if(ins != null){
-				try{
-					ins.close();
-				}catch(IOException e){
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-  
-	/**
-	 * 取Excel所有数据，包含header
-	 * @return  List<Object[]>
-	 */
-	public List<Object[]> getAllData(int sheetIndex){
-		int columnNum = 0;
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		if(sheet.getRow(0)!=null){
-			columnNum = sheet.getRow(0).getLastCellNum()-sheet.getRow(0).getFirstCellNum();
-		}
-		if(columnNum>0){
-			for(Row row:sheet){ 
-				Object[] singleRow = new Object[columnNum];
-				int n = 0;
-				
-				for(int i=0;i<columnNum;i++){
-					Cell cell = row.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-					singleRow[n] = getCellValue(cell);					
-					n++;
-				}
-
-				//在后续方法中校验
+    /**
+     * 取Excel所有数据，包含header
+     *
+     * @return List<Object   [   ]>
+     */
+    public List<Object[]> getAllData(int sheetIndex) {
+        int columnNum = 0;
+        Sheet sheet = wb.getSheetAt(sheetIndex);
+        if (sheet.getRow(0) != null) {
+            columnNum = sheet.getRow(0).getLastCellNum() - sheet.getRow(0).getFirstCellNum();
+        }
+        if (columnNum > 0) {
+            for (Row row : sheet) {
+                Object[] singleRow = new Object[columnNum];
+                int n = 0;
+
+                for (int i = 0; i < columnNum; i++) {
+                    Cell cell = row.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                    singleRow[n] = getCellValue(cell);
+                    n++;
+                }
+
+                //在后续方法中校验
 //				if("".equals(singleRow[0])){continue;}//如果第一列为空，跳过
 
-				dataList.add(singleRow);
-			}
-		}
-		return dataList;
-	}  
-	
-	public List<Object[]> getAllData(int sheetIndex,int firstRowNum){
-		int columnNum = 0;
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		if(sheet.getRow(0)!=null){
-			columnNum = sheet.getRow(firstRowNum).getLastCellNum();
-		}
-		if(columnNum>0){
-			for(Row row:sheet){ 
-				Object[] singleRow = new Object[columnNum];
-				int n = 0;
-				for(int i=0;i<columnNum;i++){
-					Cell cell = row.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-					singleRow[n] = getCellValue(cell);					
-					n++;
-				} 
-				if("".equals(singleRow[0])){continue;}//如果第一行为空，跳过
-				dataList.add(singleRow);
-			}
-		}
-		return dataList;
-	}  
-	
-	
-	/**
-	 * 获取列的数据信息
-	 * @param cell
-	 * @return
-	 */
-	private Object getCellValue(Cell cell){
-		Object cellValue = null;
-		FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
-
-
-		switch(cell.getCellType()){
-
-		}
-
-		switch(cell.getCellType()){
-			case BLANK:
-				cellValue = "";
-				break;
-			case BOOLEAN:
-				cellValue = Boolean.toString(cell.getBooleanCellValue());
-				break;
-				//数值
-		case NUMERIC:
-				DecimalFormat df = new DecimalFormat("0");
-				double value = cell.getNumericCellValue();
-				
-				if(value>Math.floor(value)) {
-					df = new DecimalFormat("0.00");
-				}
-				
-				cellValue = df.format(value);				
-				break;
-			case STRING:
-			   cellValue = cell.getStringCellValue().trim();
-			   break;
-			case ERROR:
-			   cellValue = "";
-			   break;  
-			case FORMULA:
-			   CellValue cv = evaluator.evaluate(cell);
-
-			   if (cv.getCellType()==CellType.STRING) {
-				   cellValue = cv.getStringValue();
-			   }
-			   else if(cv.getCellType()==CellType.NUMERIC){
-				   cellValue = cv.getNumberValue();
-			   }
-			   else{
-				   cellValue = cell.getCellFormula();
-			   }
-			   
-			   break;  
-		   default:
-		     cellValue = "";
-		}
-		
-		return cellValue;
-	}
-	
-	
-	/**
-	 * 返回Excel最大行index值，实际行数要加1
-	 * @return
-	 */
-	public int getRowNum(int sheetIndex){
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		return sheet.getLastRowNum();
-	}
-  
-	/**
-	 * 返回数据的列数
-	 * @param sheetIndex
-	 * @return
-	 */
-	public int getColumnNum(int sheetIndex){
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		Row row = sheet.getRow(0);
-		if(row!=null&&row.getLastCellNum()>0){
-			return row.getLastCellNum();
-		}
-		return 0;
-	}
-  
-	/**
-	 * 获取某一行数据
-	 * @param rowIndex 计数从0开始，rowIndex为0代表header行
-	 * @return
-	 */
-	public Object[] getRowData(int sheetIndex,int rowIndex){
-		Object[] dataArray = null;
-		if(rowIndex > this.getColumnNum(sheetIndex)){
-			return dataArray;
-		}else{
+                dataList.add(singleRow);
+            }
+        }
+        return dataList;
+    }
+
+    public List<Object[]> getAllData(int sheetIndex, int firstRowNum) {
+        int columnNum = 0;
+        Sheet sheet = wb.getSheetAt(sheetIndex);
+        if (sheet.getRow(0) != null) {
+            columnNum = sheet.getRow(firstRowNum).getLastCellNum();
+        }
+        if (columnNum > 0) {
+            for (Row row : sheet) {
+                Object[] singleRow = new Object[columnNum];
+                int n = 0;
+                for (int i = 0; i < columnNum; i++) {
+                    Cell cell = row.getCell(i, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                    singleRow[n] = getCellValue(cell);
+                    n++;
+                }
+                if ("".equals(singleRow[0])) {
+                    continue;
+                }//如果第一行为空，跳过
+                dataList.add(singleRow);
+            }
+        }
+        return dataList;
+    }
+
+
+    /**
+     * 获取列的数据信息
+     *
+     * @param cell
+     * @return
+     */
+    private Object getCellValue(Cell cell) {
+        Object cellValue = null;
+        FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+
+
+        switch (cell.getCellType()) {
+
+        }
+
+        switch (cell.getCellType()) {
+            case BLANK:
+                cellValue = "";
+                break;
+            case BOOLEAN:
+                cellValue = Boolean.toString(cell.getBooleanCellValue());
+                break;
+            //数值
+            case NUMERIC:
+                DecimalFormat df = new DecimalFormat("0");
+                double value = cell.getNumericCellValue();
+
+                if (value > Math.floor(value)) {
+                    df = new DecimalFormat("0.00");
+                }
+
+                cellValue = df.format(value);
+                break;
+            case STRING:
+                cellValue = cell.getStringCellValue().trim();
+                break;
+            case ERROR:
+                cellValue = "";
+                break;
+            case FORMULA:
+                CellValue cv = evaluator.evaluate(cell);
+
+                if (cv.getCellType() == CellType.STRING) {
+                    cellValue = cv.getStringValue();
+                } else if (cv.getCellType() == CellType.NUMERIC) {
+                    cellValue = cv.getNumberValue();
+                } else {
+                    cellValue = cell.getCellFormula();
+                }
+
+                break;
+            default:
+                cellValue = "";
+        }
+
+        return cellValue;
+    }
+
+
+    /**
+     * 返回Excel最大行index值，实际行数要加1
+     *
+     * @return
+     */
+    public int getRowNum(int sheetIndex) {
+        Sheet sheet = wb.getSheetAt(sheetIndex);
+        return sheet.getLastRowNum();
+    }
+
+    /**
+     * 返回数据的列数
+     *
+     * @param sheetIndex
+     * @return
+     */
+    public int getColumnNum(int sheetIndex) {
+        Sheet sheet = wb.getSheetAt(sheetIndex);
+        Row row = sheet.getRow(0);
+        if (row != null && row.getLastCellNum() > 0) {
+            return row.getLastCellNum();
+        }
+        return 0;
+    }
+
+    /**
+     * 获取某一行数据
+     *
+     * @param rowIndex 计数从0开始，rowIndex为0代表header行
+     * @return
+     */
+    public Object[] getRowData(int sheetIndex, int rowIndex) {
+        Object[] dataArray = null;
+        if (rowIndex > this.getColumnNum(sheetIndex)) {
+            return dataArray;
+        } else {
 //			dataArray = new Object[this.getColumnNum(sheetIndex)];
-			return this.dataList.get(rowIndex);
-		}
-	}
-
-  
-	/**
-	 * 获取某一列数据
-	 * @param colIndex
-	 * @return
-	 */
-	public Object[] getColumnData(int sheetIndex,int colIndex){
-		Object[] dataArray = null;
-		if(colIndex>this.getColumnNum(sheetIndex)){
-			return dataArray;
-		}else{   
-			if(this.dataList!=null&&this.dataList.size()>0){
-				dataArray = new Object[this.getRowNum(sheetIndex)+1];
-				int index = 0;
-				for(Object[] rowData:dataList){
-					if(rowData!=null){
-						dataArray[index] = rowData[colIndex];
-						index++;
-					}
-				}
-			}
-		}
-		
-		return dataArray;
-	}
-	
-	public static void main(String[] args){
-    	POIUtils re = new POIUtils("D:\\fpb.xlsx");
-    	
-    	List<Object[]> objList = re.getAllData(0);
-    	
-    	for(int i=0; i < objList.size(); i++){
-    		String result = "";
-    		for(int j = 0; j < objList.get(i).length; j++){
-    			result += objList.get(i)[j] + "_";
-    		}
-    		
-    		System.out.println(result);
-    	}
-	}
+            return this.dataList.get(rowIndex);
+        }
+    }
+
+
+    /**
+     * 获取某一列数据
+     *
+     * @param colIndex
+     * @return
+     */
+    public Object[] getColumnData(int sheetIndex, int colIndex) {
+        Object[] dataArray = null;
+        if (colIndex > this.getColumnNum(sheetIndex)) {
+            return dataArray;
+        } else {
+            if (this.dataList != null && this.dataList.size() > 0) {
+                dataArray = new Object[this.getRowNum(sheetIndex) + 1];
+                int index = 0;
+                for (Object[] rowData : dataList) {
+                    if (rowData != null) {
+                        dataArray[index] = rowData[colIndex];
+                        index++;
+                    }
+                }
+            }
+        }
+
+        return dataArray;
+    }
+
+    public static void main(String[] args) {
+        POIUtils re = new POIUtils("D:\\fpb.xlsx");
+
+        List<Object[]> objList = re.getAllData(0);
+
+        for (int i = 0; i < objList.size(); i++) {
+            String result = "";
+            for (int j = 0; j < objList.get(i).length; j++) {
+                result += objList.get(i)[j] + "_";
+            }
+
+            System.out.println(result);
+        }
+    }
 }

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/PojoUtils.java

@@ -3,7 +3,6 @@ package com.jpsoft.picc.modules.common.utils;
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;
 import com.github.pagehelper.Page;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,25 +29,23 @@ public class PojoUtils {
 
     public static <T> Map<String, Object> pojo2map(T t) {
         // TODO Auto-generated method stub
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
 
-        try{
-            BeanInfo beanInfo  = Introspector.getBeanInfo(t.getClass());
+        try {
+            BeanInfo beanInfo = Introspector.getBeanInfo(t.getClass());
             PropertyDescriptor[] props = beanInfo.getPropertyDescriptors();
 
             for (PropertyDescriptor pd : props) {
-                if (pd.getReadMethod()!=null) {
+                if (pd.getReadMethod() != null) {
                     try {
                         Object srcValue = pd.getReadMethod().invoke(t);
                         map.put(pd.getName(), srcValue);
-                    }
-                    catch (Exception ex){
-                        logger.error(ex.getMessage(),ex);
+                    } catch (Exception ex) {
+                        logger.error(ex.getMessage(), ex);
                     }
                 }
             }
-        }
-        catch(Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
         }
 
@@ -56,18 +53,18 @@ public class PojoUtils {
     }
 
 
-    public static Map pageWrapper(Page page){
-        Map<String,Object> pageMap = new HashMap<>();
+    public static Map pageWrapper(Page page) {
+        Map<String, Object> pageMap = new HashMap<>();
 
         //记录总数
-        pageMap.put("recordsTotal",page.getTotal());
-        pageMap.put("recordsFiltered",page.getTotal());
+        pageMap.put("recordsTotal", page.getTotal());
+        pageMap.put("recordsFiltered", page.getTotal());
         //总页数
-        pageMap.put("totalPage",page.getPages());
+        pageMap.put("totalPage", page.getPages());
         //当前页
-        pageMap.put("pageNumber",page.getPageNum());
+        pageMap.put("pageNumber", page.getPageNum());
         //每页条数
-        pageMap.put("pageSize",page.getPageSize());
+        pageMap.put("pageSize", page.getPageSize());
         //本页数据
         pageMap.put("data", page.getResult());
 

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/Uploader.java

@@ -4,7 +4,6 @@ import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.PutObjectResult;
 import com.jpsoft.picc.modules.common.config.OSSConfig;
-import com.jpsoft.picc.modules.common.dto.MessageResult;
 
 import java.io.InputStream;
 import java.util.Calendar;
@@ -13,7 +12,7 @@ import java.util.Date;
 public class Uploader {
     public static String ossUpload(OSSConfig ossConfig,
                                    String subFolder, String fileName,
-                                   InputStream fileInputStream){
+                                   InputStream fileInputStream) {
         Date now = new Date();
 
         Calendar cal = Calendar.getInstance();
@@ -21,13 +20,13 @@ public class Uploader {
 
         String savePath = ossConfig.getObjectPre();
 
-        if(!subFolder.startsWith("/")){
+        if (!subFolder.startsWith("/")) {
             savePath += "/";
         }
 
         savePath += subFolder;
 
-        savePath = savePath + "/" + cal.get(Calendar.YEAR) + "/" +  (cal.get(Calendar.MONTH)+1) + "/";
+        savePath = savePath + "/" + cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/";
 
         OSS ossClient = new OSSClientBuilder().build(ossConfig.getEndpoint(), ossConfig.getAccessKeyId(), ossConfig.getAccessKeySecret());
 

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

@@ -90,7 +90,7 @@ id_,company_id,application_id,status_,create_by,create_time,update_by,update_tim
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -5,37 +5,34 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.CompanyDAO">
 	<resultMap id="CompanyMap" type="com.jpsoft.picc.modules.base.entity.Company">
 		<id property="id" column="id_" />
-		<result property="name" column="name_" />
-		<result property="realName" column="real_name" />
-		<result property="passWord" column="pass_word" />
-		<result property="legalName" column="legal_name" />
-		<result property="legalCard" column="legal_card" />
-		<result property="legalCardFile" column="legal_card_file" />
-		<result property="usccCode" column="uscc_code" />
-		<result property="usccFiles" column="uscc_files" />
-		<result property="type" column="type_" />
-		<result property="businessNature" column="business_nature" />
-		<result property="businessScope" column="business_scope" />
-		<result property="industryType" column="industry_type" />
-		<result property="employeesNumber" column="employees_number" />
-		<result property="insuredNumber" column="insured_number" />
-		<result property="person" column="person_" />
-		<result property="tel" column="tel_" />
-		<result property="mail" column="mail_" />
-		<result property="postal" column="postal_" />
-		<result property="address" column="address_" />
-		<result property="companyStampFile" column="company_stamp_file" />
-		<result property="promoter" column="promoter_" />
-		<result property="remark" column="remark_" />
-		<result property="openId" column="open_id" />
-		<result property="buyId" column="buy_id" />
-		<result property="status" column="status_" />
-		<result property="createBy" column="create_by" />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy" column="update_by" />
-		<result property="updateTime" column="update_time" />
-		<result property="delFlag" column="del_flag" />
-	</resultMap>
+			<result property="name" column="name_" />
+			<result property="legalName" column="legal_name" />
+			<result property="legalCard" column="legal_card" />
+			<result property="legalCardFile" column="legal_card_file" />
+			<result property="usccCode" column="uscc_code" />
+			<result property="usccFiles" column="uscc_files" />
+			<result property="type" column="type_" />
+			<result property="businessNature" column="business_nature" />
+			<result property="businessScope" column="business_scope" />
+			<result property="industryType" column="industry_type" />
+			<result property="employeesNumber" column="employees_number" />
+			<result property="insuredNumber" column="insured_number" />
+			<result property="person" column="person_" />
+			<result property="tel" column="tel_" />
+			<result property="mail" column="mail_" />
+			<result property="postal" column="postal_" />
+			<result property="address" column="address_" />
+			<result property="companyStampFile" column="company_stamp_file" />
+			<result property="promoter" column="promoter_" />
+			<result property="remark" column="remark_" />
+			<result property="buyId" column="buy_id" />
+			<result property="status" column="status_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.Company">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -44,13 +41,11 @@
 	-->
 	<![CDATA[
 		insert into base_company
-	    (id_,name_,real_name,pass_word,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,business_nature,business_scope,industry_type,employees_number,insured_number,person_,tel_,mail_,postal_,address_,company_stamp_file,promoter_,remark_,open_id,buy_id,status_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,name_,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,business_nature,business_scope,industry_type,employees_number,insured_number,person_,tel_,mail_,postal_,address_,company_stamp_file,promoter_,remark_,buy_id,status_,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{name,jdbcType=VARCHAR}
-,#{realName,jdbcType=VARCHAR}
-,#{passWord,jdbcType=VARCHAR}
 ,#{legalName,jdbcType=VARCHAR}
 ,#{legalCard,jdbcType=VARCHAR}
 ,#{legalCardFile,jdbcType=VARCHAR}
@@ -70,7 +65,6 @@
 ,#{companyStampFile,jdbcType=VARCHAR}
 ,#{promoter,jdbcType=VARCHAR}
 ,#{remark,jdbcType=VARCHAR}
-,#{openId,jdbcType=VARCHAR}
 ,#{buyId,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{createBy,jdbcType=VARCHAR}
@@ -89,12 +83,6 @@
 		<set>
 				<if test="name!=null">
 		name_=#{name,jdbcType=VARCHAR},
-		</if>
-				<if test="realName!=null">
-		real_name=#{realName,jdbcType=VARCHAR},
-		</if>
-				<if test="passWord!=null">
-		pass_word=#{passWord,jdbcType=VARCHAR},
 		</if>
 				<if test="legalName!=null">
 		legal_name=#{legalName,jdbcType=VARCHAR},
@@ -152,9 +140,6 @@
 		</if>
 				<if test="remark!=null">
 		remark_=#{remark,jdbcType=VARCHAR},
-		</if>
-				<if test="openId!=null">
-		open_id=#{openId,jdbcType=VARCHAR},
 		</if>
 				<if test="buyId!=null">
 		buy_id=#{buyId,jdbcType=VARCHAR},
@@ -182,7 +167,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="CompanyMap">
 		select 
-id_,name_,real_name,pass_word,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,business_nature,business_scope,industry_type,employees_number,insured_number,person_,tel_,mail_,postal_,address_,company_stamp_file,promoter_,remark_,open_id,buy_id,status_,create_by,create_time,update_by,update_time,del_flag		from base_company where id_=#{0}
+id_,name_,legal_name,legal_card,legal_card_file,uscc_code,uscc_files,type_,business_nature,business_scope,industry_type,employees_number,insured_number,person_,tel_,mail_,postal_,address_,company_stamp_file,promoter_,remark_,buy_id,status_,create_by,create_time,update_by,update_time,del_flag		from base_company where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_company where id_=#{0}

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

@@ -6,7 +6,7 @@
 	<resultMap id="CompanyMemberMap" type="com.jpsoft.picc.modules.base.entity.CompanyMember">
 		<id property="id" column="id_" />
 			<result property="companyId" column="company_id" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="cardType" column="card_type" />
 			<result property="cardNo" column="card_no" />
 			<result property="sex" column="sex_" />
@@ -34,7 +34,7 @@
 		(
 #{id,jdbcType=VARCHAR}
 ,#{companyId,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{cardType,jdbcType=VARCHAR}
 ,#{cardNo,jdbcType=VARCHAR}
 ,#{sex,jdbcType= NUMERIC }
@@ -60,8 +60,8 @@
 				<if test="companyId!=null">
 		company_id=#{companyId,jdbcType=VARCHAR},
 		</if>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="cardType!=null">
 		card_type=#{cardType,jdbcType=VARCHAR},
@@ -128,7 +128,7 @@ id_,company_id,name_,card_type,card_no,sex_,age_,jobs_id,health_status,card_file
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.picc.modules.base.dao.CompanyUserDAO">
+	<resultMap id="CompanyUserMap" type="com.jpsoft.picc.modules.base.entity.CompanyUser">
+		<id property="id" column="id_" />
+			<result property="userName" column="user_name" />
+			<result property="password" column="password_" />
+			<result property="phone" column="phone_" />
+			<result property="openId" column="open_id" />
+			<result property="profession" column="profession_" />
+			<result property="summary" column="summary_" />
+			<result property="companyId" column="company_id" />
+			<result property="status" column="status_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.CompanyUser">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_company_user
+	    (id_,user_name,password_,phone_,open_id,profession_,summary_,company_id,status_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
+,#{password,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{openId,jdbcType=VARCHAR}
+,#{profession,jdbcType=VARCHAR}
+,#{summary,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_company_user where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.picc.modules.base.entity.CompanyUser">
+		update base_company_user
+		<set>
+				<if test="userName!=null">
+		user_name=#{userName,jdbcType=VARCHAR},
+		</if>
+				<if test="password!=null">
+		password_=#{password,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="openId!=null">
+		open_id=#{openId,jdbcType=VARCHAR},
+		</if>
+				<if test="profession!=null">
+		profession_=#{profession,jdbcType=VARCHAR},
+		</if>
+				<if test="summary!=null">
+		summary_=#{summary,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="CompanyUserMap">
+		select 
+id_,user_name,password_,phone_,open_id,profession_,summary_,company_id,status_,create_by,create_time,update_by,update_time,del_flag		from base_company_user where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_company_user where id_=#{0}
+	</select>
+	<select id="list" resultMap="CompanyUserMap">
+		select * from base_company_user
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="CompanyUserMap">
+		<![CDATA[
+			select * from base_company_user
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.InsuranceAgentDAO">
 	<resultMap id="InsuranceAgentMap" type="com.jpsoft.picc.modules.base.entity.InsuranceAgent">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="status" column="status_" />
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
@@ -25,7 +25,7 @@
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
@@ -41,8 +41,8 @@
 	<update id="update" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceAgent">
 		update base_insurance_agent
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="status!=null">
 		status_=#{status,jdbcType=VARCHAR},
@@ -85,7 +85,7 @@ id_,name_,status_,del_flag,create_by,create_time,update_by,update_time		from bas
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO">
 	<resultMap id="InsuranceDefinitionMap" type="com.jpsoft.picc.modules.base.entity.InsuranceDefinition">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="insuranceDescription" column="insurance_description" />
 			<result property="clause" column="clause_" />
 			<result property="status" column="status_" />
@@ -27,7 +27,7 @@
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{insuranceDescription,jdbcType=VARCHAR}
 ,#{clause,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
@@ -45,8 +45,8 @@
 	<update id="update" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceDefinition">
 		update base_insurance_definition
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="insuranceDescription!=null">
 		insurance_description=#{insuranceDescription,jdbcType=VARCHAR},
@@ -95,7 +95,7 @@ id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,u
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -6,7 +6,7 @@
 	<resultMap id="InsuranceDefinitionLimitMap" type="com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit">
 		<id property="id" column="id_" />
 			<result property="definitionId" column="definition_id" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="limit" column="limit_" />
 			<result property="unit" column="unit_" />
 			<result property="status" column="status_" />
@@ -29,7 +29,7 @@
 		(
 #{id,jdbcType=VARCHAR}
 ,#{definitionId,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{limit,jdbcType=VARCHAR}
 ,#{unit,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
@@ -50,8 +50,8 @@
 				<if test="definitionId!=null">
 		definition_id=#{definitionId,jdbcType=VARCHAR},
 		</if>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="limit!=null">
 		limit_=#{limit,jdbcType=VARCHAR},
@@ -100,7 +100,7 @@ id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,upda
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -90,7 +90,7 @@ id_,jobs_id,definition_id,charges_,del_flag,create_by,create_time,update_by,upda
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -6,7 +6,7 @@
 	<resultMap id="JobsMap" type="com.jpsoft.picc.modules.base.entity.Jobs">
 		<id property="id" column="id_" />
 			<result property="definitionId" column="definition_id" />
-			<result property="name" column="name_" />
+			<result property="userName" column="name_" />
 			<result property="content" column="content_" />
 			<result property="status" column="status_" />
 			<result property="delFlag" column="del_flag" />
@@ -28,7 +28,7 @@
 		(
 #{id,jdbcType=VARCHAR}
 ,#{definitionId,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
 ,#{content,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{delFlag,jdbcType= NUMERIC }
@@ -48,8 +48,8 @@
 				<if test="definitionId!=null">
 		definition_id=#{definitionId,jdbcType=VARCHAR},
 		</if>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="userName!=null">
+		name_=#{userName,jdbcType=VARCHAR},
 		</if>
 				<if test="content!=null">
 		content_=#{content,jdbcType=VARCHAR},
@@ -95,7 +95,7 @@ id_,definition_id,name_,content_,status_,del_flag,create_by,create_time,update_b
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -100,7 +100,7 @@ id_,title_,content_,sender_id,recipient_id,status_,create_by,create_time,update_
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -110,7 +110,7 @@ id_,company_id,transaction_number,amount_,order_no,payment_status,buy_type,payme
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -60,7 +60,7 @@ id_,application_id,policy_id		from business_application_policy where id_=#{0}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -125,7 +125,7 @@ id_,company_id,definition_id,insured_name,insured_tel,start_time,end_time,number
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -140,7 +140,7 @@ id_,status_,process_status,insurance_fee,start_time,end_time,number_,account_ban
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -95,7 +95,7 @@ id_,policy_id,member_id,status_,is_add,del_flag,create_by,create_time,update_by,
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

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

@@ -90,7 +90,7 @@ id_,policy_id,opinion_,process_status,del_flag,create_by,create_time,update_by,u
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
+	        ${sort.userName} ${sort.order}
 	 	</foreach>
 	</select>
 </mapper>

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/AttachmentController.java

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-
 @Api(description="附件管理")
 @RestController
 @RequestMapping("/auth/attachment")

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Api(description="企业人员管理")
@@ -95,7 +94,7 @@ public class CompanyMemberController {
 
     @ApiOperation(value="添加企业人员")
     @PostMapping("add")
-    public MessageResult<CompanyMember> add(@RequestBody CompanyMember companyMember,@RequestAttribute String subject){
+    public MessageResult<CompanyMember> add(@RequestBody CompanyMember companyMember, @RequestAttribute String subject){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/CompanyController.java

@@ -1,4 +0,0 @@
-package com.jpsoft.picc.modules.pub.controller;
-
-public class CompanyController {
-}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/CompanyUserController.java

@@ -0,0 +1,301 @@
+package com.jpsoft.picc.modules.pub.controller;
+
+import cn.hutool.core.util.RandomUtil;
+import com.alibaba.druid.util.StringUtils;
+import com.jpsoft.picc.modules.base.entity.Company;
+import com.jpsoft.picc.modules.base.entity.CompanyUser;
+import com.jpsoft.picc.modules.base.service.CompanyService;
+import com.jpsoft.picc.modules.base.service.CompanyUserService;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.utils.DES3;
+import com.jpsoft.picc.modules.common.utils.PojoUtils;
+import com.jpsoft.picc.modules.pub.dto.CompanyInfoDTO;
+import com.jpsoft.picc.modules.pub.dto.PersonalInfoDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.UUID;
+
+@RestController
+@Api(description = "企业用户操作")
+@RequestMapping("/companyUser")
+public class CompanyUserController {
+    @Autowired
+    private CompanyUserService companyUserService;
+    @Autowired
+    private CompanyService companyService;
+
+    @GetMapping(value="sendVerificationCode")
+    @ApiOperation(value = "发送6位验证码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "phone",value = "注册手机号", required = true, paramType = "form")
+    })
+    public MessageResult<Integer> sendVerificationCode(String phone, HttpSession session){
+        MessageResult<Integer> messageResult = new MessageResult<>();
+
+        int rndInt = RandomUtil.randomInt(100000,1000000);
+
+        messageResult.setResult(true);
+        messageResult.setData(rndInt);
+
+        session.setAttribute("valCode",rndInt);
+
+        return messageResult;
+    }
+
+    @PostMapping(value="quickRegister")
+    @ApiOperation(value = "快速注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "phone",value = "注册手机号", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "code",value = "验证码", required = true, paramType = "form"),
+    })
+    public MessageResult<String> quickRegister(@RequestParam String phone,
+                                               @RequestParam Integer code,
+                                               HttpSession session){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        if (code.equals(session.getAttribute("valCode"))){
+            CompanyUser companyUser = new CompanyUser();
+            companyUser.setId(UUID.randomUUID().toString());
+            companyUser.setPhone(phone);
+            companyUser.setCreateTime(new Date());
+            companyUser.setCreateBy(companyUser.getId());
+            companyUser.setDelFlag(false);
+            companyUser.setStatus("0");
+
+            companyUserService.insert(companyUser);
+
+            session.setAttribute("regCompanyUserId",companyUser.getId());
+
+            messageResult.setData(companyUser.getId());
+            messageResult.setResult(true);
+        }
+        else{
+            messageResult.setMessage("验证码错误!");
+            messageResult.setResult(false);
+        }
+
+        return messageResult;
+    }
+    
+    @PostMapping(value="improveAccountInformation")
+    @ApiOperation(value = "完善账户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyUserId",value = "企业用户编号", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "userName",value = "用户名", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "password",value = "密码", required = true, paramType = "form"),
+    })
+    public MessageResult<String> improveAccountInformation(String companyUserId,String userName,String password){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            CompanyUser companyUser = companyUserService.get(companyUserId);
+
+            if (StringUtils.isEmpty(companyUser.getUserName())
+                    && StringUtils.isEmpty(companyUser.getPassword())){
+                companyUser.setUserName(userName);
+
+                DES3 des3 = new DES3();
+                companyUser.setPassword(des3.encrypt(DES3.DEFAULT_KEY, password));
+
+                companyUser.setUpdateBy(companyUserId);
+                companyUser.setUpdateTime(new Date());
+                companyUser.setStatus("1");
+
+                companyUserService.update(companyUser);
+
+                messageResult.setResult(true);
+            }
+            else{
+                messageResult.setResult(false);
+                messageResult.setMessage("账户信息已存在!");
+            }
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @GetMapping(value="getPersonalInformation")
+    @ApiOperation(value = "获取个人信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "企业用户编号",value = "companyUserId", required = true, paramType = "query"),
+    })
+    public MessageResult<PersonalInfoDTO> getPersonalInformation(String companyUserId){
+        MessageResult<PersonalInfoDTO> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            CompanyUser companyUser = companyUserService.get(companyUserId);
+
+            PersonalInfoDTO personalInfo = new PersonalInfoDTO();
+            PojoUtils.map(companyUser,personalInfo);
+
+            messageResult.setData(personalInfo);
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping(value="updatePersonalInformation")
+    @ApiOperation(value = "更新个人信息")
+    public MessageResult<String> updatePersonalInformation(PersonalInfoDTO personalInfo){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            CompanyUser companyUser = companyUserService.get(personalInfo.getId());
+            PojoUtils.map(personalInfo,companyUser);
+
+            companyUserService.update(companyUser);
+
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @GetMapping(value="getCompanyInformation")
+    @ApiOperation(value = "获取企业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId",value = "企业用户编号", required = true, paramType = "query"),
+    })
+    public MessageResult<CompanyInfoDTO> getCompanyInformation(String companyId){
+        MessageResult<CompanyInfoDTO> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            Company company = companyService.get(companyId);
+
+            CompanyInfoDTO companyInfoDTO = new CompanyInfoDTO();
+            PojoUtils.map(company,companyInfoDTO);
+
+            messageResult.setData(companyInfoDTO);
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping(value="saveCompanyInformation")
+    @ApiOperation(value = "保存企业信息")
+    public MessageResult<String> saveCompanyInformation(CompanyInfoDTO companyInfoDTO){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            if (StringUtils.isEmpty(companyInfoDTO.getId())){
+                Company company = new Company();
+
+                PojoUtils.map(companyInfoDTO, company);
+
+                company.setId(UUID.randomUUID().toString());
+                company.setCreateTime(new Date());
+
+                companyService.insert(company);
+
+                messageResult.setData(company.getId());
+            }
+            else {
+                Company company = companyService.get(companyInfoDTO.getId());
+                PojoUtils.map(companyInfoDTO, company);
+                company.setUpdateTime(new Date());
+
+                companyService.update(company);
+
+                messageResult.setData(company.getId());
+            }
+
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping(value="updatePhoneNumber")
+    @ApiOperation(value = "更新账户手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyUserId",value = "企业用户编号", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "newPhoneNumber",value = "新手机号", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "code",value = "验证码", required = true, paramType = "form")
+    })
+    public MessageResult<String> updatePhoneNumber(String companyUserId,String newPhoneNumber,String code,HttpSession session){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            if (code.equals(session.getAttribute("valCode"))){
+                CompanyUser companyUser = companyUserService.get(companyUserId);
+
+                companyUser.setPhone(newPhoneNumber);
+                companyUser.setUpdateTime(new Date());
+                companyUser.setUpdateBy(companyUserId);
+
+                companyUserService.update(companyUser);
+            }
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping(value="updatePassword")
+    @ApiOperation(value = "更新密码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyUserId",value = "企业用户编号", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "newPassword",value = "新密码", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "code",value = "验证码", required = true, paramType = "form")
+    })
+    public MessageResult<String> updatePassword(String companyUserId,String newPassword,String code,HttpSession session){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            //todo
+            if (code.equals(session.getAttribute("valCode"))){
+                CompanyUser companyUser = companyUserService.get(companyUserId);
+
+                DES3 des3 = new DES3();
+                companyUser.setPassword(des3.encrypt(DES3.DEFAULT_KEY,newPassword));
+                companyUser.setUpdateTime(new Date());
+                companyUser.setUpdateBy(companyUserId);
+
+                companyUserService.update(companyUser);
+            }
+        }
+        catch (Exception ex){
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/CompanyInfoDTO.java

@@ -0,0 +1,30 @@
+package com.jpsoft.picc.modules.pub.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "企业信息")
+public class CompanyInfoDTO {
+    @ApiModelProperty(value = "企业编号")
+    private String id;
+    @ApiModelProperty(value = "企业名称")
+    private String name;
+    @ApiModelProperty(value = "联系人")
+    private String person;
+    @ApiModelProperty(value = "联系人手机")
+    private String tel;
+    @ApiModelProperty(value = "法人代表")
+    private String legalName;
+    @ApiModelProperty(value = "法人代表身份证")
+    private String legalCard;
+    @ApiModelProperty(value = "法人代表身份证照片")
+    private String legalCardFile;
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String usccCode;
+    @ApiModelProperty(value = "营业执照")
+    private String usccFiles;
+    @ApiModelProperty(value = "企业公章(附件)")
+    private String companyStampFile;
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/PersonalInfoDTO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.picc.modules.pub.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "用户信息")
+public class PersonalInfoDTO {
+    @ApiModelProperty(value = "用户编号")
+    private String id;
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+    @ApiModelProperty(value = "职业介绍")
+    private String profession;
+    @ApiModelProperty(value = "简介")
+    private String summary;
+}