外来人员

huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java

@@ -1,9 +1,14 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.service.IBillCleanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,19 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-clean")
+@CrossOrigin
 public class BillCleanController {
+    @Autowired
+    private IBillCleanService billCleanService;
+
+    @PostMapping("/listPersonalClean")
+    public Result listPersonalClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billCleanService.listPersonalClean(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));
+    }
 
 }

huimv-admin/src/main/java/com/huimv/admin/controller/BillIsolateController.java

@@ -1,9 +1,14 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.service.IBillIsolateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,19 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-isolate")
+@CrossOrigin
 public class BillIsolateController {
+    @Autowired
+    private IBillIsolateService billIsolateService;
+
+    @PostMapping("/listPersonalIsolate")
+    public Result listPersonalIsolate(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billIsolateService.listPersonalIsolate(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billIsolateService.getById(paramsMap.get("id")));
+    }
 
 }

huimv-admin/src/main/java/com/huimv/admin/controller/BillLuggageController.java

@@ -1,9 +1,16 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.service.IBillLuggageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +22,29 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-luggage")
+@CrossOrigin
 public class BillLuggageController {
+    @Autowired
+    private IBillLuggageService billLuggageService;
 
+    @PostMapping("/addLuggage")
+    public Result addLuggage(HttpServletRequest httpServletRequest, @RequestParam("userName") String userName,
+                             @RequestParam("phone") String phone,
+                             @RequestParam("luggageDate") String luggageDate,
+                             @RequestParam("luggageLocation") String luggageLocation,
+                             @RequestParam("luggageLocationId") String luggageLocationId,
+                             @RequestParam("luggageNum") Integer luggageNum,
+                             @RequestParam("img") MultipartFile img) throws IOException {
+        return billLuggageService.addLuggage(httpServletRequest,userName,phone,luggageDate,luggageLocation,luggageLocationId,luggageNum,img);
+    }
+
+    @PostMapping("/listPersonalLuggage")
+    public Result listPersonalLuggage(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billLuggageService.listPersonalLuggage(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,billLuggageService.getById(paramsMap.get("id")));
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/BillPcrController.java

@@ -1,9 +1,14 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.service.IBillPcrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +20,20 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-pcr")
+@CrossOrigin
 public class BillPcrController {
 
+    @Autowired
+    private IBillPcrService billPcrService;
+
+    @PostMapping("/listPersonalPcr")
+    public Result listPersonalPcr(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return billPcrService.listPersonalPcr(httpServletRequest,paramsMap);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS, billPcrService.getById(paramsMap.get("id")));
+    }
+
 }

huimv-admin/src/main/java/com/huimv/admin/controller/SysAccountMultilevelController.java

@@ -2,6 +2,7 @@ package com.huimv.admin.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.UploadImage;
 import com.huimv.admin.entity.AccountGroup;
 import com.huimv.admin.entity.SysAccountMultilevel;
 import com.huimv.admin.service.IAccountGroupService;
@@ -10,9 +11,13 @@ import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +38,8 @@ public class SysAccountMultilevelController {
 
     @Autowired
     private IAccountGroupService accountGroupService;
-
+    @Autowired
+    private UploadImage uploadImage;
 
 
     @PostMapping("/list")
@@ -106,4 +112,48 @@ public class SysAccountMultilevelController {
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         return  accountMultilevelService.getLastFarmId(userId);
     }
+
+    @PostMapping("/editImg")
+    @Transactional(rollbackFor = Exception.class)
+    public Result editImg(HttpServletRequest httpServletRequest, @RequestParam("img") MultipartFile img) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        if (uploadImage.getImageCom(img).equals("上传失败")) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001,"图片上传失败",false);
+        }
+        sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updateUserName")
+    public Result updateUserName(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        sysAccountMultilevel.setUserName(paramsMap.get("userName"));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updatePaper")
+    public Result updatePaper(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        sysAccountMultilevel.setPapersType(paramsMap.get("papersType"));
+        sysAccountMultilevel.setPapersCode(paramsMap.get("papersCode"));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updateUser")
+    public Result updateUser(HttpServletRequest httpServletRequest,
+                             @RequestParam(value = "img", required = false) MultipartFile img,
+                             @RequestParam(value = "userName", required = false) String userName,
+                             @RequestParam(value = "phone", required = false) String phone,
+                             @RequestParam(value = "workPost", required = false) Integer workPost,
+                             @RequestParam(value = "workLocation", required = false) String workLocation,
+                             @RequestParam(value = "workLocationId", required = false) String workLocationId,
+                             @RequestParam(value = "workName", required = false) String workName,
+                             @RequestParam(value = "papersType", required = false) String papersType,
+                             @RequestParam(value = "papersCode", required = false) String papersCode) throws IOException {
+        return accountMultilevelService.updateUser(httpServletRequest,img,userName,phone,workPost,workLocation,workLocationId,workName,papersType,papersCode);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/BillLuggage.java

@@ -49,6 +49,8 @@ public class BillLuggage implements Serializable {
 
     private Integer luggageLocationId;
 
+    private Integer luggageNum;
+
     /**
      * 照片地址
      */

huimv-admin/src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java

@@ -60,5 +60,4 @@ public class SysAccountMultilevel extends Model {
     private String papersType;
     private String papersCode;
 
-
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillCleanService.java

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillClean;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillCleanService extends IService<BillClean> {
 
+    Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillIsolateService.java

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillIsolate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 隔离 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillIsolateService extends IService<BillIsolate> {
 
+    Result listPersonalIsolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillLuggageService.java

@@ -1,7 +1,13 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillLuggage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +19,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillLuggageService extends IService<BillLuggage> {
 
+    Result addLuggage(HttpServletRequest httpServletRequest, String userName, String phone, String luggageDate, String luggageLocation, String luggageLocationId,Integer luggageNum, MultipartFile img) throws IOException;
+
+    Result listPersonalLuggage(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBillPcrService.java

@@ -1,8 +1,12 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.BillPcr;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * pcr 表 服务类
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBillPcrService extends IService<BillPcr> {
 
+    Result listPersonalPcr(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/ISysAccountMultilevelService.java

@@ -3,7 +3,10 @@ package com.huimv.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.SysAccountMultilevel;
 import com.huimv.admin.common.utils.Result;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -30,4 +33,5 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     Result listSubordinateByFarm(String farmId, Integer userId);
 
+    Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone, Integer workPost, String workLocation, String workLocationId, String workName, String papersType, String papersCode) throws IOException;
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BillClean;
 import com.huimv.admin.mapper.BillCleanMapper;
 import com.huimv.admin.service.IBillCleanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 洗消表 服务实现类
@@ -17,4 +26,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean> implements IBillCleanService {
 
+    @Resource
+    private BillCleanMapper billCleanMapper;
+
+    @Override
+    public Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BillClean> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,billCleanMapper.selectPage(page,new QueryWrapper<BillClean>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date")));
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillIsolateServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BillIsolate;
 import com.huimv.admin.mapper.BillIsolateMapper;
 import com.huimv.admin.service.IBillIsolateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 隔离 服务实现类
@@ -17,4 +26,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillIsolate> implements IBillIsolateService {
 
+    @Resource
+    private BillIsolateMapper billIsolateMapper;
+    @Override
+    public Result listPersonalIsolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BillIsolate> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,billIsolateMapper.selectPage(page,new QueryWrapper<BillIsolate>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("isolate_start_date")));
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillLuggageServiceImpl.java

@@ -1,10 +1,26 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.common.utils.UploadImage;
 import com.huimv.admin.entity.BillLuggage;
 import com.huimv.admin.mapper.BillLuggageMapper;
 import com.huimv.admin.service.IBillLuggageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +33,37 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillLuggageServiceImpl extends ServiceImpl<BillLuggageMapper, BillLuggage> implements IBillLuggageService {
 
+    @Autowired
+    private UploadImage uploadImage;
+    @Resource
+    private BillLuggageMapper billLuggageMapper;
+
+    @Override
+    public Result addLuggage(HttpServletRequest httpServletRequest, String userName, String phone, String luggageDate, String luggageLocation, String luggageLocationId,Integer luggageNum, MultipartFile img) throws IOException {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        BillLuggage billLuggage = new BillLuggage();
+        billLuggage.setUserName(userName);
+        billLuggage.setUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        billLuggage.setPhone(phone);
+        billLuggage.setLuggageDate(LocalDateTime.parse(luggageDate,dateTimeFormatter));
+        billLuggage.setLuggageNum(luggageNum);
+        billLuggage.setLuggageLocation(luggageLocation);
+        billLuggage.setLuggageLocationId(Integer.parseInt(luggageLocationId));
+        if (uploadImage.getImageCom(img).equals("上传失败")) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001,"图片上传失败",false);
+        }
+        billLuggage.setArticlePicUrl(uploadImage.getImageCom(img));
+        billLuggageMapper.insert(billLuggage);
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result listPersonalLuggage(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BillLuggage> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BillLuggage> billLuggagePage = billLuggageMapper.selectPage(page, new QueryWrapper<BillLuggage>().eq("user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("luggage_date"));
+        return new Result(ResultCode.SUCCESS,billLuggagePage);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPcrServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BillPcr;
 import com.huimv.admin.mapper.BillPcrMapper;
 import com.huimv.admin.service.IBillPcrService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * pcr 表 服务实现类
@@ -17,4 +26,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> implements IBillPcrService {
 
+    @Resource
+    private BillPcrMapper billPcrMapper;
+
+    @Override
+    public Result listPersonalPcr(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNo = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BillPcr> page = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        Page<BillPcr> billPcrPage = billPcrMapper.selectPage(page, new QueryWrapper<BillPcr>().eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
+        return new Result(ResultCode.SUCCESS,billPcrPage);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.*;
-import com.huimv.admin.entity.BaseLocation;
-import com.huimv.admin.entity.BaseProcess;
-import com.huimv.admin.entity.BillPcr;
-import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.huimv.admin.entity.*;
 import com.huimv.admin.entity.vo.FactoryDirectorVo;
 import com.huimv.admin.mapper.*;
 import com.huimv.admin.service.IBillPersonnelAdmissionService;
@@ -51,7 +48,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     private BillIsolateMapper billIsolateMapper;
     @Resource
     private BillCleanMapper billCleanMapper;
-
+    @Resource
+    private SysAccountMultilevelMapper sysAccountMultilevelMapper;
     @Autowired
     private UploadImage uploadImage;
 
@@ -85,6 +83,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new Result(10001,"图片上传失败",false);
         }
+        SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
+        sysAccountMultilevel.setPapersType(papersType);
+        sysAccountMultilevel.setPapersCode(papersCode);
+        sysAccountMultilevel.setUserName(userName);
+        sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(imgUrl));
+        sysAccountMultilevel.setWorkName(workName);
+        sysAccountMultilevelMapper.updateById(sysAccountMultilevel);
+
         billPersonnelAdmission.setImgUrl(uploadImage.getImageCom(imgUrl));
         billPersonnelAdmission.setVistitReson(vistitReson);
         billPersonnelAdmission.setFarmId(Integer.parseInt(farmId));

huimv-admin/src/main/java/com/huimv/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -1,18 +1,23 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.*;
 import com.huimv.admin.entity.SysAccountMultilevel;
 import com.huimv.admin.mapper.SysAccountMultilevelMapper;
 import com.huimv.admin.service.ISysAccountMultilevelService;
-import com.huimv.admin.common.utils.Result;
-import com.huimv.admin.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,6 +34,8 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
     @Autowired
     private SysAccountMultilevelMapper accountMultilevelMapper;
+    @Autowired
+    private UploadImage uploadImage;
 
     @Override
     public Result findUserAccount(String searchStr, int pageNum, int pageSize, Integer userId) {
@@ -124,4 +131,50 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return new Result(ResultCode.SUCCESS,page);
     }
 
+    @Override
+    public Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone, Integer workPost, String workLocation, String workLocationId, String workName, String papersType, String papersCode) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        if (ObjectUtil.isNotEmpty(img)){
+            if (uploadImage.getImageCom(img).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001,"图片上传失败",false);
+            }
+            sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
+        }
+        if (ObjectUtil.isNotEmpty(userName)){
+            sysAccountMultilevel.setUserName(userName);
+        }
+        if (ObjectUtil.isNotEmpty(phone)){
+            if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001,"手机号格式错误！",false);
+            }
+            sysAccountMultilevel.setPhone(phone);
+        }
+        if (ObjectUtil.isNotEmpty(workPost)){
+            sysAccountMultilevel.setWorkPost(workPost.toString());
+        }
+        if (ObjectUtil.isNotEmpty(workLocation)){
+            sysAccountMultilevel.setWorkLocation(workLocation);
+        }
+        if (ObjectUtil.isNotEmpty(workLocationId)){
+            sysAccountMultilevel.setWorkLocationId(workLocationId);
+        }
+        if (ObjectUtil.isNotEmpty(workName)){
+            sysAccountMultilevel.setWorkName(workName);
+        }
+        if (ObjectUtil.isNotEmpty(papersType)){
+            if (papersType.equals("0")){
+                if (!IDCardValidator.isValidIDCard(papersCode)){
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return new Result(10001,"身份证号格式错误!",false);
+                }
+            }
+            sysAccountMultilevel.setPapersType(papersType);
+            sysAccountMultilevel.setPapersCode(papersCode);
+        }
+        accountMultilevelMapper.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
 }