小程序修改1

huimv-receive/src/main/java/com/huimv/receive/controller/BaseLocationController.java

@@ -15,7 +15,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
@@ -31,7 +31,7 @@ public class BaseLocationController {
     private IExistService existService;
 
     @PostMapping("/listAll")
-    public Result listAll(@RequestBody Map<String, String> paramsMap){
+    public Result listAll(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String vistitType = paramsMap.get("vistitType");
         QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
@@ -39,28 +39,28 @@ public class BaseLocationController {
         Exist one = existService.getOne(queryWrapper);
         if (one.getExist() == 1 && vistitType.equals("0")) {
             return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("farm_id", farmId).eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id",3)));
+                    .eq("vistit_type", vistitType)
+                    .ne("location_type", 0).ne("id", 3)));
         }
         if (one.getExist() == 1 && vistitType.equals("3")) {
             return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("farm_id", farmId).eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id",7)));
+                    .eq("vistit_type", vistitType)
+                    .ne("location_type", 0).ne("id", 7)));
         }
         if (one.getExist() == 1 && vistitType.equals("5")) {
             return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("farm_id", farmId).eq("vistit_type", vistitType)
-                    .eq("id",9)));
+                    .eq("vistit_type", vistitType)
+                    .eq("id", 9)));
         }
         return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                .eq("farm_id", farmId).eq("vistit_type", vistitType)
+                .eq("vistit_type", vistitType)
                 .ne("location_type", 0)));
     }
 
     @PostMapping("/listLuggageLocation")
-    public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap){
+    public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id",farmId)
-                .eq("vistit_type",0).eq("parent_id",0)));
+        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+                .eq("vistit_type", 0).eq("parent_id", 0)));
     }
 }

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -3,26 +3,23 @@ package com.huimv.receive.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
 import com.huimv.receive.entity.pojo.UserPagePojo;
+import com.huimv.receive.entity.vo.UserVo;
 import com.huimv.receive.service.ISysAccountMultilevelService;
 import com.huimv.receive.service.ISysUserService;
-import com.huimv.receive.service.IUserService;
 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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -171,7 +168,7 @@ public class SysUserController {
     }
 
     @PostMapping("/update")
-    public Result update(@RequestBody SysUser sysUser) {
+    public Result update(@RequestBody UserVo sysUser) {
         String cardType = sysUser.getCardType();
         String cardNum = sysUser.getCardNum();
 
@@ -194,8 +191,47 @@ public class SysUserController {
         if (ObjectUtil.isNotEmpty(sysUser.getBirthday())){
             sysUser.setAge(DateUtil.ageOfNow(sysUser.getBirthday()));
         }
-        sysUserService.updateById(sysUser);
-        accountMultilevelService.updateByUser(sysUser);
+        SysUser user = new SysUser();
+        user.setId(sysUser.getId());
+        user.setAge(sysUser.getAge());
+        user.setBirthday(sysUser.getBirthday());
+        user.setCardNum(sysUser.getCardNum());
+        user.setCardType(sysUser.getCardType());
+        user.setDepartment(sysUser.getDepartment());
+        user.setEducationalLevel(sysUser.getEducationalLevel());
+        user.setEmergentUser(sysUser.getEmergentUser());
+        user.setEmergentUserPhone(sysUser.getEmergentUserPhone());
+        user.setEntryTime(sysUser.getEntryTime());
+        user.setFarmId(sysUser.getFarmId());
+        user.setGender(sysUser.getGender());
+        user.setNation(sysUser.getNation());
+        user.setNativePlace(sysUser.getNativePlace());
+        user.setPeopleType(sysUser.getPeopleType());
+        user.setPoliticsPace(sysUser.getPoliticsPace());
+        user.setProbation(sysUser.getProbation());
+        user.setPublicMali(sysUser.getPublicMali());
+        user.setPublicPhone(sysUser.getPublicPhone());
+        user.setSheng(sysUser.getSheng());
+        user.setShi(sysUser.getShi());
+        user.setUserId(sysUser.getUserId());
+        user.setUserMali(sysUser.getUserMali());
+        user.setUserName(sysUser.getUserName());
+        user.setUserPhone(sysUser.getUserPhone());
+        user.setWorkLocation(sysUser.getWorkLocation());
+        user.setWorkLocationType(sysUser.getWorkLocationType());
+        user.setXxdz(sysUser.getXxdz());
+        user.setYzbm(sysUser.getYzbm());
+        user.setImgUrl(sysUser.getImgUrl());
+        user.setJobType(sysUser.getJobType());
+        String s = "";
+        List<String> job = sysUser.getJob();
+        for (String s1 : job) {
+            s = s+s1 + ",";
+        }
+        user.setJob(s.substring(0, s.length() - 1));
+        sysUserService.updateById(user);
+
+        accountMultilevelService.updateByUser(user);
         return new Result(10000,"修改成功",true);
     }
 

huimv-receive/src/main/java/com/huimv/receive/entity/BaseLocation.java

@@ -34,7 +34,7 @@ public class BaseLocation implements Serializable {
     private String locationName;
 
 
-    private Integer farmId;
+    /*private Integer farmId;*/
 
     /**
      * 0检测地点，1 工作地点

huimv-receive/src/main/java/com/huimv/receive/entity/vo/UserVo.java

@@ -0,0 +1,164 @@
+package com.huimv.receive.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user")
+public class UserVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 员工工号
+     */
+    private String userId;
+
+    /**
+     * 员工姓名
+     */
+    private String userName;
+
+    /**
+     * 0 男  1女
+     */
+    private Integer gender;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 籍贯
+     */
+    private String nativePlace;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 政治面貌
+     */
+    private String politicsPace;
+
+    /**
+     * 户口类型
+     */
+    private String peopleType;
+
+    /**
+     * 教育水平
+     */
+    private String educationalLevel;
+
+    /**
+     * 证件类型
+     */
+    private String cardType;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 证件号码
+     */
+    private String cardNum;
+
+    /**
+     * 个人电话
+     */
+    private String userPhone;
+
+    /**
+     * 办公电话
+     */
+    private String publicPhone;
+
+    /**
+     * 个人邮箱
+     */
+    private String userMali;
+
+    /**
+     * 办公邮箱
+     */
+    private String publicMali;
+
+    /**
+     * 入职时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date entryTime;
+
+    /**
+     * 试用期
+     */
+    private String probation;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 工作岗位 1 场长，3生物安全负责人 ，4 pcr 检测人员，5洗消站点工作人员
+     */
+    private List<String> job;
+
+
+    /**
+     * 工作性质
+     */
+    private String jobType;
+
+    /**
+     * 工作地点
+     */
+    private String workLocation;
+
+    /**
+     * 1人员初级洗消站 2净区 3人员二级洗消站 4场内 5生产区 6车辆初级洗消站 7车辆二级洗消站 8中转料塔外围 9车辆三级洗消站 10销售中转站 11环保区洗消中心 12环保区净区 13洗消中心净区
+     */
+    private Integer workLocationType;
+    private String farmId;
+    private String emergentUser;
+    private String emergentUserPhone;
+    private String sheng;
+    private String shi;
+    private String xxdz;
+    private String yzbm;
+    private String imgUrl;
+
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
+import com.huimv.receive.entity.vo.UserVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -84,7 +84,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         if (type.equals("0")) {
 
             QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
             List<Integer> ids = new ArrayList<>();
             for (BaseLocation baseLocation : baseLocations) {
@@ -130,7 +130,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+            queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
             List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", type);
@@ -238,7 +238,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
 
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        locationQueryWrapper.eq("id", billClean.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
         QueryWrapper<Configuration> queryWrapper3 = new QueryWrapper<>();
@@ -603,7 +603,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());
             Integer testId = billClean.getTestLocationId();
             QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-            locationQueryWrapper.eq("farm_id", farmId).eq("id", testId);
+            locationQueryWrapper.eq("id", testId);
             BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
             QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
@@ -671,7 +671,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());
             Integer testId = billClean.getTestLocationId();
             QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-            locationQueryWrapper.eq("farm_id", farmId).eq("id", testId);
+            locationQueryWrapper.eq("id", testId);
             BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
             QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
@@ -835,7 +835,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
             BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
             QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-            locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+            locationQueryWrapper.eq("id", billClean.getTestLocationId());
             BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
 
             if (billClean.getDestId() >= billClean.getTestLocationId() || billClean.getDestId() == 7) { //不是目的地
@@ -1055,7 +1055,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
             BaseProcess baseProcess = processMapper.selectOne(queryWrapper);//某条进程
             QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-            locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+            locationQueryWrapper.eq("id", billClean.getTestLocationId());
             BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前所在的位置
             if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
                 return new Result(10001, "修改失败！该申请已提前结束或者被拒绝", false);

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

@@ -278,7 +278,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("farm_id", farmId).eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+        queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
         List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
         List<Integer> ids = new ArrayList<>();
         for (BaseLocation baseLocation : baseLocations) {
@@ -355,7 +355,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
 
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billPcr.getTestLocationId());
+        locationQueryWrapper.eq("id", billPcr.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前pcr检测所在的位置
 
         QueryWrapper<Configuration> queryWrapper = new QueryWrapper<>();

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

@@ -149,12 +149,12 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setAllLocationId("26,9");
             }
         } else {
-            queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("location_type");
+            queryWrapper.eq("vistit_type", vistitType).orderByAsc("location_type");
             List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
             if (admissionType.equals("1")) {
                 baseProcess.setAllLocation("场外," + destName);
                 QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("farm_id", farmId).eq("vistit_type", vistitType).eq("location_type", 0);
+                queryWrapper1.eq("vistit_type", vistitType).eq("location_type", 0);
                 baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
                 baseProcess.setAllLocationStatus("1,0");
             } else {
@@ -206,7 +206,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         if (vistitType.equals("5")) {
             baseLocation = baseLocationMapper.selectById(destId);
         } else {
-            baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).eq("parent_id", 0));
+            baseLocation = baseLocationMapper.selectOne(new QueryWrapper<BaseLocation>().eq("vistit_type", vistitType).eq("parent_id", 0));
         }
         if (ObjectUtil.isEmpty(baseLocation)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -243,13 +243,20 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
     @Override
     public Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         String vistitType = paramsMap.get("vistitType");
         Page<BillPersonnelAdmission> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
-        Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page, new QueryWrapper<BillPersonnelAdmission>().eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest)).orderByDesc("sub_date"));
+        queryWrapper.eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType).eq("farm_id",farmId)
+                .eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest))
+                .orderByDesc("sub_date");
+        Page<BillPersonnelAdmission> billPersonnelAdmissionPage = billPersonnelAdmissionMapper.selectPage(page, new QueryWrapper<BillPersonnelAdmission>()
+                .eq(StringUtils.isNotBlank(vistitType), "vistit_type", vistitType)
+                .eq("admission_user_id", TokenSign.getMemberIdByJwtToken(httpServletRequest))
+                .eq("farm_id", farmId)
+                .orderByDesc("sub_date"));
         return new Result(ResultCode.SUCCESS, billPersonnelAdmissionPage, billPersonnelAdmissionMapper.selectCount(queryWrapper));
     }
 
@@ -808,7 +815,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
 
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billPcr.getTestLocationId());
+        locationQueryWrapper.eq("id", billPcr.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前pcr检测所在的位置
 
 
@@ -1085,7 +1092,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         BillIsolate billIsolate = isolateMapper.selectById(id);
         BaseProcess baseProcess = processMapper.selectById(billIsolate.getProcessId());
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq(StringUtils.isNotBlank(farmId), "farm_id", farmId).eq("id", billIsolate.getIsolateLocationId());
+        locationQueryWrapper.eq("id", billIsolate.getIsolateLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前隔离所在的位置
 
         QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
@@ -1256,7 +1263,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
 
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        locationQueryWrapper.eq("id", billClean.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
@@ -1509,7 +1516,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         BaseProcess baseProcess = processMapper.selectOne(processQueryWrapper);//进程
 
         QueryWrapper<BaseLocation> locationQueryWrapper = new QueryWrapper<>();
-        locationQueryWrapper.eq("farm_id", farmId).eq("id", billClean.getTestLocationId());
+        locationQueryWrapper.eq("id", billClean.getTestLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前洗消检测所在的位置
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         if (billClean.getBillStatus() != 0) {

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

@@ -11,6 +11,7 @@ import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
 import com.huimv.receive.entity.vo.AccountVo;
+import com.huimv.receive.entity.vo.UserVo;
 import com.huimv.receive.mapper.SysAccountMultilevelMapper;
 import com.huimv.receive.mapper.SysUserMapper;
 import com.huimv.receive.service.ISysAccountMultilevelService;

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillPersonnelAdmissionMapper.xml

@@ -27,23 +27,23 @@
         <result column="process_id" property="processId"/>
     </resultMap>
     <select id="listAll" resultType="com.huimv.receive.entity.vo.FactoryDirectorVo">
-        select * from (SELECT count(*) count,id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+        SELECT id,admission_user_name AS 'userName', bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
 FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT count(*) count,id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
 FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT count(*) count, id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName', bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
 FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT count(*) count, id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
-FROM bill_personnel_admission )  WHERE farm_id = #{farmId} AND vistit_type = #{type}
+SELECT  id,admission_user_name AS 'userName', bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
 ORDER BY sub_date DESC
     </select>