修改企业人员后台接口。

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

@@ -15,5 +15,4 @@ public interface CompanyMemberDAO {
 	int delete(String id);
 	List<CompanyMember> list();
 	List<CompanyMember> search(Map<String, Object> searchParams, List<Sort> sortList);
-	List<CompanyMember> search2(Map<String, Object> searchParams, List<Sort> sortList);
 }

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

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +14,7 @@ import io.swagger.annotations.ApiModel;
 /**
   描述:base_company_member的实体类
  */
+@Data
 @ApiModel(value = "base_company_member的实体类")
 public class CompanyMember {
     @ApiModelProperty(value = "ID")
@@ -28,8 +31,10 @@ public class CompanyMember {
 	private Boolean sex;
     @ApiModelProperty(value = "年龄")
 	private Integer age;
-    @ApiModelProperty(value = "行业ID")
+    @ApiModelProperty(value = "岗位ID")
 	private String jobsId;
+	@ApiModelProperty(value = "岗位名称")
+	private String jobName;
     @ApiModelProperty(value = "健康状态")
 	private String healthStatus;
     @ApiModelProperty(value = "身份证附件")
@@ -46,217 +51,4 @@ public class CompanyMember {
 	private Date updateTime;
     @ApiModelProperty(value = "是否删除")
 	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 getName(){
-		return name;
-	}
-	
-	/**
-	 *设置姓名
-	 */
-	public void setName(String name){
-		this.name = name;
-	}
-	/**
-	 *获取证件类型
-	 */
-    	public String getCardType(){
-		return cardType;
-	}
-	
-	/**
-	 *设置证件类型
-	 */
-	public void setCardType(String cardType){
-		this.cardType = cardType;
-	}
-	/**
-	 *获取证件编号
-	 */
-    	public String getCardNo(){
-		return cardNo;
-	}
-	
-	/**
-	 *设置证件编号
-	 */
-	public void setCardNo(String cardNo){
-		this.cardNo = cardNo;
-	}
-	/**
-	 *获取性别
-	 */
-    	public Boolean getSex(){
-		return sex;
-	}
-	
-	/**
-	 *设置性别
-	 */
-	public void setSex(Boolean sex){
-		this.sex = sex;
-	}
-	/**
-	 *获取年龄
-	 */
-    	public Integer getAge(){
-		return age;
-	}
-	
-	/**
-	 *设置年龄
-	 */
-	public void setAge(Integer age){
-		this.age = age;
-	}
-	/**
-	 *获取行业ID
-	 */
-    	public String getJobsId(){
-		return jobsId;
-	}
-	
-	/**
-	 *设置行业ID
-	 */
-	public void setJobsId(String jobsId){
-		this.jobsId = jobsId;
-	}
-	/**
-	 *获取健康状态
-	 */
-    	public String getHealthStatus(){
-		return healthStatus;
-	}
-	
-	/**
-	 *设置健康状态
-	 */
-	public void setHealthStatus(String healthStatus){
-		this.healthStatus = healthStatus;
-	}
-	/**
-	 *获取身份证附件
-	 */
-    	public String getCardFiles(){
-		return cardFiles;
-	}
-	
-	/**
-	 *设置身份证附件
-	 */
-	public void setCardFiles(String cardFiles){
-		this.cardFiles = cardFiles;
-	}
-	/**
-	 *获取状态
-	 */
-    	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/resources/mapper/base/CompanyMember.xml

@@ -12,6 +12,7 @@
 			<result property="sex" column="sex_" />
 			<result property="age" column="age_" />
 			<result property="jobsId" column="jobs_id" />
+			<result property="jobName" column="job_name" />
 			<result property="healthStatus" column="health_status" />
 			<result property="cardFiles" column="card_files" />
 			<result property="status" column="status_" />
@@ -106,25 +107,34 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="CompanyMemberMap">
-		select 
-id_,company_id,name_,card_type,card_no,sex_,age_,jobs_id,health_status,card_files,status_,create_by,create_time,update_by,update_time,del_flag		from base_company_member where id_=#{0}
+		select t1.*,t2.name_ as job_name from base_company_member t1 left join base_jobs t2 on t1.jobs_id=t2.id_
+		where t1.id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_company_member where id_=#{0}
+		select count(*) from base_company_member t1 where t1.id_=#{0}
 	</select>
 	<select id="list" resultMap="CompanyMemberMap">
-		select * from base_company_member
+		select t1.*,t2.name_ as job_name from base_company_member t1 left join base_jobs t2 on t1.jobs_id=t2.id_
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="CompanyMemberMap">
 		<![CDATA[
-			select * from base_company_member
+			select * from (
+				select t1.*,t2.name_ as job_name from base_company_member t1
+				left join base_jobs t2 on t1.jobs_id=t2.id_
+			) as t
 		]]>
 		<where>
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
 			<if test="searchParams.companyId != null">
-				and company_id like #{searchParams.companyId}
+				and company_id = #{searchParams.companyId}
+			</if>
+			<if test="searchParams.memberName != null">
+				and name_ like #{searchParams.memberName}
+			</if>
+			<if test="searchParams.jobsId != null">
+				and jobs_id = #{searchParams.jobsId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -83,7 +83,7 @@ id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,u
 		select count(*) from base_insurance_definition where id_=#{0}
 	</select>
 	<select id="list" resultMap="InsuranceDefinitionMap">
-		select * from base_insurance_definition where del_flag=false
+		select * from base_insurance_definition where del_flag=0
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsuranceDefinitionMap">
 		<![CDATA[

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

@@ -78,7 +78,7 @@ id_,name_,content_,status_,del_flag,create_by,create_time,update_by,update_time
 		select count(*) from base_jobs where id_=#{0}
 	</select>
 	<select id="list" resultMap="JobsMap">
-		select * from base_jobs where del_flag = false
+		select * from base_jobs where del_flag = 0
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="JobsMap">
 		<![CDATA[

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

@@ -41,30 +41,36 @@ public class CompanyMemberController {
 
     @ApiOperation(value="读取企业人员列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
-    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String")
-    })
-    public MessageResult<Map> list(//@RequestParam(value="companyId",defaultValue="") String companyId,
+    public MessageResult<List<CompanyMember>> list(
                                    HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
 
-        MessageResult<Map> msgResult = new MessageResult<>();
+        MessageResult<List<CompanyMember>> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
-        searchParams.put("delFlag",false);
+        try {
+            if (company==null){
+                throw new Exception("当前用户未填写企业信息!");
+            }
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("delFlag", false);
 
-        if (StringUtils.isNotEmpty(company.getId())) {
-            searchParams.put("companyId",company.getId());
-        }
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time", "asc"));
 
-        Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,1000,sortList);
+            searchParams.put("companyId", company.getId());
 
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
+            Page<CompanyMember> page = companyMemberService.pageSearch(searchParams, 1, 1000, sortList);
+
+            msgResult.setResult(true);
+            msgResult.setData(page.getResult());
+        }
+        catch (Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
+        }
 
         return msgResult;
     }
@@ -72,10 +78,12 @@ public class CompanyMemberController {
     @ApiOperation(value="读取企业人员分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-//            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String")
+            @ApiImplicitParam(name = "memberName",value = "人员姓名", required = false, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "jobsId",value = "岗位编号", required = false, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(
-//            @RequestParam(value="companyId",defaultValue="") String companyId,
+            @RequestParam(value="memberName",defaultValue="") String memberName,
+            @RequestParam(value="jobsId",defaultValue="") String jobsId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -84,20 +92,37 @@ public class CompanyMemberController {
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
-        searchParams.put("delFlag",false);
+        try {
+            if (company == null) {
+                throw new Exception("当前用户未填写企业信息!");
+            }
+
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("delFlag", false);
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time", "asc"));
 
-        if (StringUtils.isNotEmpty(company.getId())) {
-            searchParams.put("companyId",company.getId());
-        }
+            searchParams.put("companyId", company.getId());
 
-        Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+            if(StringUtils.isNotEmpty(jobsId)) {
+                searchParams.put("jobsId", jobsId);
+            }
 
-        msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
+            if(StringUtils.isNotEmpty(memberName)){
+                searchParams.put("memberName", "%" + memberName + "%");
+            }
+
+            Page<CompanyMember> page = companyMemberService.pageSearch(searchParams, pageIndex, pageSize, sortList);
+
+            msgResult.setResult(true);
+            msgResult.setData(PojoUtils.pageWrapper(page));
+        }
+        catch (Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setMessage(ex.getMessage());
+            msgResult.setResult(false);
+        }
 
         return msgResult;
     }
@@ -109,12 +134,11 @@ public class CompanyMemberController {
             @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 = "sex",value = "性别(男:true,女:false)", 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")
+            @ApiImplicitParam(name = "cardFiles",value = "身份证件附件", required = false, paramType = "form",dataType = "String")
     })
     public MessageResult<CompanyMember> add(//@RequestParam(value="companyId",defaultValue="") String companyId,
                                             @RequestParam(value="name",defaultValue="") String name,
@@ -125,7 +149,6 @@ public class CompanyMemberController {
                                             @RequestParam(value="jobsId",defaultValue="") String jobsId,
                                             @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
                                             @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
-                                            @RequestParam(value="status",defaultValue="") String status,
                                             HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
@@ -144,7 +167,7 @@ public class CompanyMemberController {
             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);
+//            if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
             companyMember.setDelFlag(false);
             companyMember.setCreateBy(principal.getName());
             companyMember.setCreateTime(new Date());
@@ -170,11 +193,11 @@ public class CompanyMemberController {
     }
 
     @ApiOperation(value="获取企业人员")
-    @RequestMapping(value = "edit",method = RequestMethod.POST)
+    @RequestMapping(value = "detail",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<CompanyMember> edit(@RequestParam(value="id",defaultValue="") String id){
+    public MessageResult<CompanyMember> detail(@RequestParam(value="id",defaultValue="") String id){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {
@@ -202,16 +225,14 @@ public class CompanyMemberController {
     @PostMapping("update")
     @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 = "sex",value = "性别(男:true,女:false)", 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")
+            @ApiImplicitParam(name = "cardFiles",value = "身份证件附件", required = false, paramType = "form",dataType = "String")
     })
     public MessageResult<CompanyMember> update(@RequestParam(value="id",defaultValue="") String id,
 //                                               @RequestParam(value="companyId",defaultValue="") String companyId,
@@ -223,7 +244,6 @@ public class CompanyMemberController {
                                                @RequestParam(value="jobsId",defaultValue="") String jobsId,
                                                @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
                                                @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
-                                               @RequestParam(value="status",defaultValue="") String status,
                                                HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
@@ -242,7 +262,7 @@ public class CompanyMemberController {
             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);
+//            if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
             companyMember.setUpdateBy(principal.getName());
             companyMember.setUpdateTime(new Date());
 

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +28,7 @@ import java.util.Map;
 @Api(description="险种信息")
 @RestController
 @RequestMapping("/auth/insuranceDefinition")
+@Slf4j
 public class InsuranceDefinitionController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -35,18 +37,13 @@ public class InsuranceDefinitionController {
 
     @ApiOperation(value="所有险种列表")
     @RequestMapping(value = "list",method = RequestMethod.POST)
-    public MessageResult<Map> list(){
-        MessageResult<Map> msgResult = new MessageResult<>();
+    public MessageResult<List<InsuranceDefinition>> list(){
+        MessageResult<List<InsuranceDefinition>> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
-
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
-
-        Page<InsuranceDefinition> page = insuranceDefinitionService.pageSearch(searchParams,1,1000,sortList);
+        List<InsuranceDefinition> list = insuranceDefinitionService.list();
 
         msgResult.setResult(true);
-        msgResult.setData(PojoUtils.pageWrapper(page));
+        msgResult.setData(list);
 
         return msgResult;
     }

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

@@ -0,0 +1,43 @@
+package com.jpsoft.picc.modules.auth.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
+import com.jpsoft.picc.modules.base.entity.Jobs;
+import com.jpsoft.picc.modules.base.service.JobsService;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.dto.Sort;
+import com.jpsoft.picc.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(description="职业管理")
+@RestController
+@RequestMapping("/auth/jobs")
+@Slf4j
+public class JobsController {
+    @Autowired
+    private JobsService jobsService;
+
+    @ApiOperation(value="所有岗位列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<Jobs>> list(){
+        MessageResult<List<Jobs>> msgResult = new MessageResult<>();
+
+        List<Jobs> list = jobsService.list();
+
+        msgResult.setResult(true);
+        msgResult.setData(list);
+
+        return msgResult;
+    }
+}