Merge branch 'master' of http://223.75.76.159:9090/zq/picc

 Conflicts:

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:log4jdbc:mysql://127.0.0.1:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: root
   devtools:
     add-properties: false
     restart:
@@ -10,12 +10,4 @@ spring:
 
 logger:
   level: WARN
-  dir: J:\\projects\\picc\\logs\\picc-admin-server\\
-
-oss:
-  accessKeyId: LTAILGOo7bwpkvnq
-  accessKeySecret: ZGsaTO5klbSHxULr2Q3s2PiqKDzN15
-  endpoint: http://oss-cn-hangzhou.aliyuncs.com
-  bucketName: wzzgh2out
-  urlPrefix: http://vod.wzgh.org
-  objectPre: picc
+  dir: D:\\Logs\\picc\\picc-admin-server\\

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

@@ -31,11 +31,7 @@ public class InsuranceAgent {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
     	public String getId(){
@@ -48,9 +44,8 @@ public class InsuranceAgent {
 	public void setId(String id){
 		this.id = id;
 	}
+
 	/**
-	@ApiModelProperty(value = "姓名")
-		/**
 	 *获取姓名
 	 */
     	public String getName(){
@@ -63,11 +58,8 @@ public class InsuranceAgent {
 	public void setName(String name){
 		this.name = name;
 	}
-	/**
-
-	@ApiModelProperty(value = "审核状态")
-		/**
 
+	/**
 	 *获取审核状态
 	 */
     	public String getStatus(){
@@ -80,11 +72,8 @@ public class InsuranceAgent {
 	public void setStatus(String status){
 		this.status = status;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -97,11 +86,8 @@ public class InsuranceAgent {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
     	public String getCreateBy(){
@@ -129,11 +115,9 @@ public class InsuranceAgent {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+
+
 	/**
-=======
-	@ApiModelProperty(value = "修改人")
-		/**
->>>>>>> Stashed changes
 	 *获取修改人
 	 */
     	public String getUpdateBy(){

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

@@ -35,11 +35,7 @@ public class InsuranceDefinition {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-	/**
-=======
-	@ApiModelProperty(value = "编号")
-		/**
->>>>>>> Stashed changes
+    /**
 	 *获取编号
 	 */
     	public String getId(){
@@ -52,11 +48,8 @@ public class InsuranceDefinition {
 	public void setId(String id){
 		this.id = id;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "险种")
-		/**
->>>>>>> Stashed changes
 	 *获取险种
 	 */
     	public String getName(){
@@ -70,10 +63,6 @@ public class InsuranceDefinition {
 		this.name = name;
 	}
 	/**
-=======
-	@ApiModelProperty(value = "投保声明")
-		/**
->>>>>>> Stashed changes
 	 *获取投保声明
 	 */
     	public String getInsuranceDescription(){
@@ -86,11 +75,8 @@ public class InsuranceDefinition {
 	public void setInsuranceDescription(String insuranceDescription){
 		this.insuranceDescription = insuranceDescription;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "雇主责任险条款")
-		/**
->>>>>>> Stashed changes
 	 *获取雇主责任险条款
 	 */
     	public String getClause(){
@@ -103,11 +89,8 @@ public class InsuranceDefinition {
 	public void setClause(String clause){
 		this.clause = clause;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "状态")
-		/**
->>>>>>> Stashed changes
 	 *获取状态
 	 */
     	public String getStatus(){
@@ -120,11 +103,8 @@ public class InsuranceDefinition {
 	public void setStatus(String status){
 		this.status = status;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "是否删除")
-		/**
->>>>>>> Stashed changes
 	 *获取是否删除
 	 */
     	public Boolean getDelFlag(){
@@ -137,14 +117,11 @@ public class InsuranceDefinition {
 	public void setDelFlag(Boolean delFlag){
 		this.delFlag = delFlag;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "创建人")
-		/**
->>>>>>> Stashed changes
 	 *获取创建人
 	 */
-    	public String getCreateBy(){
+	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -169,14 +146,11 @@ public class InsuranceDefinition {
 	public void setCreateTime(Date createTime){
 		this.createTime = createTime;
 	}
+
 	/**
-=======
-	@ApiModelProperty(value = "修改人")
-		/**
->>>>>>> Stashed changes
 	 *获取修改人
 	 */
-    	public String getUpdateBy(){
+	public String getUpdateBy(){
 		return updateBy;
 	}
 	

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

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

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

@@ -33,11 +33,10 @@ public class InsuranceJobs {
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 
-	@ApiModelProperty(value = "编号")
-		/**
+    /**
 	 *获取编号
 	 */
-    	public String getId(){
+    public String getId(){
 		return id;
 	}
 	
@@ -47,11 +46,11 @@ public class InsuranceJobs {
 	public void setId(String id){
 		this.id = id;
 	}
-	@ApiModelProperty(value = "行业ID")
-		/**
+
+	/**
 	 *获取行业ID
 	 */
-    	public String getJobsId(){
+	public String getJobsId(){
 		return jobsId;
 	}
 	
@@ -62,11 +61,10 @@ public class InsuranceJobs {
 		this.jobsId = jobsId;
 	}
 
-	@ApiModelProperty(value = "险种信息ID")
-		/**
+	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
+	public String getDefinitionId(){
 		return definitionId;
 	}
 	
@@ -77,11 +75,10 @@ public class InsuranceJobs {
 		this.definitionId = definitionId;
 	}
 
-	@ApiModelProperty(value = "收费标准(月)")
-		/**
+	/**
 	 *获取收费标准(月)
 	 */
-    	public BigDecimal getCharges(){
+	public BigDecimal getCharges(){
 		return charges;
 	}
 	
@@ -91,11 +88,11 @@ public class InsuranceJobs {
 	public void setCharges(BigDecimal charges){
 		this.charges = charges;
 	}
-	@ApiModelProperty(value = "是否删除")
-		/**
+
+	/**
 	 *获取是否删除
 	 */
-    	public Boolean getDelFlag(){
+	public Boolean getDelFlag(){
 		return delFlag;
 	}
 	
@@ -106,11 +103,10 @@ public class InsuranceJobs {
 		this.delFlag = delFlag;
 	}
 
-	@ApiModelProperty(value = "创建人")
-		/**
+	/**
 	 *获取创建人
 	 */
-    	public String getCreateBy(){
+	public String getCreateBy(){
 		return createBy;
 	}
 	
@@ -123,7 +119,7 @@ public class InsuranceJobs {
 	/**
 	 *获取创建时间
 	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 		public Date getCreateTime(){
 		return createTime;
@@ -136,8 +132,7 @@ public class InsuranceJobs {
 		this.createTime = createTime;
 	}
 
-	@ApiModelProperty(value = "修改人")
-		/**
+	/**
 	 *获取修改人
 	 */
     	public String getUpdateBy(){
@@ -150,15 +145,16 @@ public class InsuranceJobs {
 	public void setUpdateBy(String updateBy){
 		this.updateBy = updateBy;
 	}
+
 	/**
 	 *获取修改时间
 	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 		public Date getUpdateTime(){
 		return updateTime;
 	}
-	
+
 	/**
 	 *设置修改时间
 	 */

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

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

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

@@ -9,19 +9,12 @@ 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> historyList(String policy_id);
+	List<InsurancePolicyRecord> search(Map<String,Object> searchParams,List<Sort> sortList);
 }

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

@@ -8,20 +8,12 @@ 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();
 	List<InsurancePolicyRecord> historyList(String policy_id);
-
+	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/impl/InsurancePolicyRecordServiceImpl.java

@@ -45,20 +45,20 @@ public class InsurancePolicyRecordServiceImpl implements InsurancePolicyRecordSe
         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 boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = insurancePolicyRecordDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+
 	@Override
 	public List<InsurancePolicyRecord> historyList(String policy_id){
 		return insurancePolicyRecordDAO.historyList(policy_id);

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

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

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

@@ -1,10 +1,12 @@
 package com.jpsoft.picc.modules.auth.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.CompanyMember;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
+import com.jpsoft.picc.modules.common.utils.POIUtils;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -15,7 +17,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.util.*;
 
 @Api(description="企业人员管理")
@@ -30,15 +35,9 @@ public class CompanyMemberController {
     @ApiOperation(value="读取企业人员列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form")
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<Map> list(
-            String id,
-            @RequestParam(value="companyId",defaultValue="") String companyId,
-            @RequestAttribute String subject){
-        //当前用户ID
-        System.out.println(subject);
-
+    public MessageResult<Map> list(@RequestParam(value="companyId",defaultValue="") String companyId){
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
@@ -47,8 +46,8 @@ public class CompanyMemberController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("companyId",id);
+        if (StringUtils.isNotEmpty(companyId)) {
+            searchParams.put("companyId",companyId);
         }
 
         Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,1000,sortList);
@@ -62,26 +61,22 @@ public class CompanyMemberController {
     @ApiOperation(value="读取企业人员分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form")
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(
-            String id,
+            @RequestParam(value="companyId",defaultValue="") String companyId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            @RequestAttribute String subject){
-
-        //当前用户ID
-        System.out.println(subject);
-
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize){
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("delFlag",false);
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id",id);
+        if (StringUtils.isNotEmpty(companyId)) {
+            searchParams.put("companyId",companyId);
         }
 
         Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,pageIndex,pageSize,sortList);
@@ -94,13 +89,45 @@ public class CompanyMemberController {
 
     @ApiOperation(value="添加企业人员")
     @PostMapping("add")
-    public MessageResult<CompanyMember> add(@RequestBody CompanyMember companyMember, @RequestAttribute String subject){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "name",value = "姓名", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardType",value = "证件类型", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardNo",value = "证件编号", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "sex",value = "性别", required = true, paramType = "form",dataType = "Boolean"),
+            @ApiImplicitParam(name = "age",value = "年龄", required = true, paramType = "form",dataType = "int"),
+            @ApiImplicitParam(name = "jobsId",value = "行业ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "healthStatus",value = "健康状态", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardFiles",value = "身份证件附件", required = false, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "status",value = "状态", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<CompanyMember> add(@RequestParam(value="companyId",defaultValue="") String companyId,
+                                            @RequestParam(value="name",defaultValue="") String name,
+                                            @RequestParam(value="cardType",defaultValue="") String cardType,
+                                            @RequestParam(value="cardNo",defaultValue="") String cardNo,
+                                            @RequestParam(value="sex",defaultValue="null") Boolean sex,
+                                            @RequestParam(value="age",defaultValue="0") Integer age,
+                                            @RequestParam(value="jobsId",defaultValue="") String jobsId,
+                                            @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
+                                            @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
+                                            @RequestParam(value="status",defaultValue="") String status){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
+        CompanyMember companyMember = new CompanyMember();
 
         try {
             companyMember.setId(UUID.randomUUID().toString());
+            if(StringUtils.isNotEmpty(companyId)) companyMember.setCompanyId(companyId);
+            if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
+            if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
+            if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+            if(sex != null) companyMember.setSex(sex);
+            if(age != 0) companyMember.setAge(age);
+            if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
+            if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+            if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+            if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
             companyMember.setDelFlag(false);
-            companyMember.setCreateBy(subject);
+//            companyMember.setCreateBy(subject);
             companyMember.setCreateTime(new Date());
 
             int affectCount = companyMemberService.insert(companyMember);
@@ -124,11 +151,11 @@ public class CompanyMemberController {
     }
 
     @ApiOperation(value="获取企业人员")
-    @GetMapping("edit")
+    @RequestMapping(value = "edit",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form")
+            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<CompanyMember> edit(@RequestParam(value="编号",defaultValue="") String id){
+    public MessageResult<CompanyMember> edit(@RequestParam(value="id",defaultValue="") String id){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {
@@ -154,11 +181,46 @@ public class CompanyMemberController {
 
     @ApiOperation(value="更新企业人员")
     @PostMapping("update")
-    public MessageResult<CompanyMember> update(@RequestBody CompanyMember companyMember,@RequestAttribute String subject){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "name",value = "姓名", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardType",value = "证件类型", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardNo",value = "证件编号", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "sex",value = "性别", required = true, paramType = "form",dataType = "Boolean"),
+            @ApiImplicitParam(name = "age",value = "年龄", required = true, paramType = "form",dataType = "int"),
+            @ApiImplicitParam(name = "jobsId",value = "行业ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "healthStatus",value = "健康状态", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "cardFiles",value = "身份证件附件", required = false, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "status",value = "状态", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<CompanyMember> update(@RequestParam(value="id",defaultValue="") String id,
+                                               @RequestParam(value="companyId",defaultValue="") String companyId,
+                                               @RequestParam(value="name",defaultValue="") String name,
+                                               @RequestParam(value="cardType",defaultValue="") String cardType,
+                                               @RequestParam(value="cardNo",defaultValue="") String cardNo,
+                                               @RequestParam(value="sex",defaultValue="null") Boolean sex,
+                                               @RequestParam(value="age",defaultValue="0") Integer age,
+                                               @RequestParam(value="jobsId",defaultValue="") String jobsId,
+                                               @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
+                                               @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
+                                               @RequestParam(value="status",defaultValue="") String status){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {
-            companyMember.setUpdateBy(subject);
+            CompanyMember companyMember = companyMemberService.get(id);
+
+            if(StringUtils.isNotEmpty(companyId)) companyMember.setCompanyId(companyId);
+            if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
+            if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
+            if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+            if(sex != null) companyMember.setSex(sex);
+            if(age != 0) companyMember.setAge(age);
+            if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
+            if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+            if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+            if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
+//            companyMember.setUpdateBy(subject);
             companyMember.setUpdateTime(new Date());
 
             int affectCount = companyMemberService.update(companyMember);
@@ -184,16 +246,15 @@ public class CompanyMemberController {
     @ApiOperation(value="删除企业人员")
     @PostMapping("delete")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form")
+            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<Integer> delete(@RequestParam(value="编号",defaultValue="") String id,
-                                         @RequestAttribute String subject){
+    public MessageResult<Integer> delete(@RequestParam(value="id",defaultValue="") String id){
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
             CompanyMember companyMember = companyMemberService.get(id);
             companyMember.setDelFlag(true);
-            companyMember.setUpdateBy(subject);
+//            companyMember.setUpdateBy(subject);
             companyMember.setUpdateTime(new Date());
 
             int affectCount = companyMemberService.update(companyMember);
@@ -215,4 +276,66 @@ public class CompanyMemberController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="导入企业人员")
+    @PostMapping("importXls")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "uploadFile",value = "上传文件", required = true,paramType="form", dataType = "__file")
+    })
+    public MessageResult<String> importXls(MultipartFile uploadFile){
+        MessageResult<String> msgResult = new MessageResult<>();
+        CompanyMember companyMember = new CompanyMember();
+
+        try {
+            POIUtils aaa = new POIUtils(uploadFile.getInputStream());
+            List<Object[]> list = aaa.getAllData(0);
+
+            int affectCount = 0;
+            for(Object[] array : list){
+                String name = array[1].toString();
+                String cardType = array[2].toString();
+                String cardNo = array[3].toString();
+                Boolean sex = Convert.toBool(array[3]);
+                int age = Convert.toInt(array[3]);
+                String jobsId = array[3].toString();
+                String healthStatus = array[3].toString();
+
+                companyMember.setId(UUID.randomUUID().toString());
+//                if(StringUtils.isNotEmpty(companyId)) companyMember.setCompanyId(companyId);
+                if(StringUtils.isNotEmpty(name)) companyMember.setName(name);
+                if(StringUtils.isNotEmpty(cardType)) companyMember.setCardType(cardType);
+                if(StringUtils.isNotEmpty(cardNo)) companyMember.setCardNo(cardNo);
+                if(sex != null) companyMember.setSex(sex);
+                if(age != 0) companyMember.setAge(age);
+                if(StringUtils.isNotEmpty(jobsId)) companyMember.setJobsId(jobsId);
+                if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
+//                if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
+//                if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
+                companyMember.setDelFlag(false);
+//            companyMember.setCreateBy(subject);
+                companyMember.setCreateTime(new Date());
+
+                if(companyMemberService.insert(companyMember) > 0) {
+                    affectCount++;
+                }
+            }
+
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData("成功导入" + affectCount + "条记录。");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

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

@@ -17,12 +17,4 @@ cas:
 
 logger:
   level: WARN
-  dir: H:\\projects\\picc\\logs\\picc-enterprise-server\\
-
-oss:
-  accessKeyId: LTAILGOo7bwpkvnq
-  accessKeySecret: ZGsaTO5klbSHxULr2Q3s2PiqKDzN15
-  endpoint: http://oss-cn-hangzhou.aliyuncs.com
-  bucketName: wzzgh2out
-  urlPrefix: http://vod.wzgh.org
-  objectPre: picc
+  dir: D:\\Logs\\picc\\picc-enterprise-server\\