企业人员管理-未完成

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

@@ -10,4 +10,4 @@ spring:
 
 logger:
   level: WARN
-  dir: H:\\projects\\picc\\logs\\picc-admin-server\\
+  dir: D:\\Logs\\picc\\picc-admin-server\\

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

@@ -31,10 +31,10 @@ 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="id",defaultValue="") String id,
             @RequestParam(value="companyId",defaultValue="") String companyId,
             @RequestAttribute String subject){
         //当前用户ID
@@ -49,7 +49,7 @@ public class CompanyMemberController {
         sortList.add(new Sort("id_","asc"));
 
         if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("companyId",id);
+            searchParams.put("companyId",companyId);
         }
 
         Page<CompanyMember> page = companyMemberService.pageSearch(searchParams,1,1000,sortList);
@@ -63,10 +63,10 @@ public class CompanyMemberController {
     @ApiOperation(value="读取企业人员分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form")
+            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(
-            String id,
+            @RequestParam(value="id",defaultValue="") String id,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -95,11 +95,44 @@ 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,
+                                            @RequestAttribute String subject){
         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.setCreateTime(new Date());
@@ -127,7 +160,7 @@ public class CompanyMemberController {
     @ApiOperation(value="获取企业人员")
     @GetMapping("edit")
     @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){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
@@ -155,10 +188,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,
+                                               @RequestAttribute String subject){
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {
+            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());
 
@@ -185,7 +254,7 @@ 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){
@@ -216,4 +285,51 @@ public class CompanyMemberController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="导入企业人员")
+    @PostMapping("importXls")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "status",value = "状态", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<CompanyMember> importXls(@RequestParam(value="companyId",defaultValue="") String companyId,
+                                            @RequestAttribute String subject){
+        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.setCreateTime(new Date());
+
+            int affectCount = companyMemberService.insert(companyMember);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(companyMember);
+            } 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,4 +17,4 @@ cas:
 
 logger:
   level: WARN
-  dir: H:\\projects\\picc\\logs\\picc-enterprise-server\\
+  dir: D:\\Logs\\picc\\picc-enterprise-server\\