人脸门禁和闸机

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

@@ -0,0 +1,52 @@
+package com.huimv.receive.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.entity.BillAccessDoor;
+import com.huimv.receive.entity.BillGate;
+import com.huimv.receive.service.IBillAccessDoorService;
+import com.huimv.receive.service.IBillGateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@RestController
+@RequestMapping("/bill-access-door")
+@CrossOrigin
+public class BillAccessDoorController {
+
+    @Autowired
+    private IBillAccessDoorService doorService;
+    @Autowired
+    private IBillGateService gateService;
+    @RequestMapping("/listById")
+    public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");//1为人脸门禁 2为车辆闸机
+        String id = paramsMap.get("id");
+        if ("1".equals(type)) {
+            BillAccessDoor doorServiceOne = doorService.getOne(new QueryWrapper<BillAccessDoor>().eq("farm_id", farmId).eq("id", id));
+            return new Result(ResultCode.SUCCESS, doorServiceOne);
+        } else {
+            BillGate gate = gateService.getOne(new QueryWrapper<BillGate>().eq("farm_id", farmId).eq("id", id));
+            return new Result(ResultCode.SUCCESS, gate);
+        }
+
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.receive.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@RestController
+@RequestMapping("/bill-gate")
+public class BillGateController {
+
+}

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

@@ -197,4 +197,9 @@ public class BillPersonnelAdmissionController {
     public Result allCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return admissionService.allCount(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listDoor")
+    public Result listDoor(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.listDoor(httpServletRequest, paramsMap);
+    }
 }

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

@@ -0,0 +1,70 @@
+package com.huimv.receive.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 车辆闸机信息记录
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_access_door")
+public class BillAccessDoor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0未通过 1通过
+     */
+    private Integer billStatus;
+
+    /**
+     * 检测时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date checkDate;
+
+    /**
+     * 检测地点
+     */
+    private String checkLocation;
+
+    private Integer locationId;
+
+    /**
+     * 照片
+     */
+    private String urlImg;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    private Integer farmId;
+
+
+}

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

@@ -113,4 +113,6 @@ public class BillClean implements Serializable {
     private String imgUrl;
 
     private Integer imgStatus;
+
+    private String cleanTime;
 }

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

@@ -126,5 +126,9 @@ public class BillDry implements Serializable {
 
     private Integer imgStatus;
 
+    private String dryTime;
+
+    private String dryTem;
+
 
 }

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

@@ -0,0 +1,70 @@
+package com.huimv.receive.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 车辆闸机信息记录
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_gate")
+public class BillGate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0未通过 1通过
+     */
+    private Integer billStatus;
+
+    /**
+     * 检测时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date checkDate;
+
+    /**
+     * 检测地点
+     */
+    private String checkLocation;
+
+    private Integer locationId;
+
+    /**
+     * 车牌
+     */
+    private String carNum;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    private Integer farmId;
+
+
+}

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

@@ -93,4 +93,7 @@ public class CleanAndDryVo2 {
 
     private Integer imgStatus;
     private Integer type;
+    private String cleanTime;
+    private String dryTime;
+    private String dryTem;
 }

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

@@ -28,4 +28,5 @@ public class FactoryDirectorVo {
     private String destName;
     private Integer type;
     private Integer count;
+    private Integer processId;
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BillAccessDoorMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.mapper;
+
+import com.huimv.receive.entity.BillAccessDoor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+public interface BillAccessDoorMapper extends BaseMapper<BillAccessDoor> {
+
+}

huimv-receive/src/main/java/com/huimv/receive/mapper/BillGateMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.mapper;
+
+import com.huimv.receive.entity.BillGate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+public interface BillGateMapper extends BaseMapper<BillGate> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.receive.service;
+
+import com.huimv.receive.entity.BillAccessDoor;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+public interface IBillAccessDoorService extends IService<BillAccessDoor> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.receive.service;
+
+import com.huimv.receive.entity.BillGate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+public interface IBillGateService extends IService<BillGate> {
+
+}

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

@@ -52,6 +52,9 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
 
     Result getDetail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    //车辆闸机和人脸门禁
+    Result listDoor(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     //后台入场申请报表
     Result countAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
     //提交申请排名

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

@@ -0,0 +1,20 @@
+package com.huimv.receive.service.impl;
+
+import com.huimv.receive.entity.BillAccessDoor;
+import com.huimv.receive.mapper.BillAccessDoorMapper;
+import com.huimv.receive.service.IBillAccessDoorService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@Service
+public class BillAccessDoorServiceImpl extends ServiceImpl<BillAccessDoorMapper, BillAccessDoor> implements IBillAccessDoorService {
+
+}

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

@@ -263,6 +263,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                billClean.setCleanTime("10");
 
                 if (exist.getExist() == 0) {
                     if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
@@ -459,6 +460,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                billClean.setCleanTime("10");
 
 
                 if (baseProcess.getDestId() == 1) {
@@ -533,6 +535,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             billClean.setTestLocationId(baseLocation.getId());
             billClean.setCheckDate(sdf.parse(date));
             billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+            billClean.setCleanTime("10");
 
             baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
             baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -621,6 +624,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             billClean.setTestLocationId(baseLocation.getId());
             billClean.setCheckDate(sdf.parse(data));
             billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+            billClean.setCleanTime("10");
             String s1 = "";
             String s2 = "";
             String s3 = "";
@@ -689,6 +693,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             billClean.setTestLocationId(baseLocation.getId());
             billClean.setCheckDate(sdf.parse(data));
             billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+            billClean.setDryTem("70");
+            billClean.setDryTime("10");
             String s1 = "";
             String s2 = "";
             String s3 = "";
@@ -853,6 +859,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
                     billClean.setImgUrl(s);
                     billClean.setImgStatus(1);
+                    billClean.setCleanTime("10");
                     cleanMapper.updateById(billClean);
 
                     if (billClean.getDestId() == 11) {
@@ -956,6 +963,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     billClean.setTestLocationId(baseLocation.getId());
                     billClean.setCheckDate(sdf.parse(date));
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setCleanTime("10");
                     cleanMapper.updateById(billClean);
 
                     baseProcess.setProcessType(2);
@@ -1013,6 +1021,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setTestLocationId(baseLocation.getId());
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                billClean.setCleanTime("10");
 
                 String status1 = baseProcess.getAllLocationStatus();
                 String[] split = status1.split(",");
@@ -1076,6 +1085,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     billClean.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     billClean.setTestLocation(baseLocation.getLocationName());
                     billClean.setTestLocationId(baseLocation.getId());
+                    billClean.setDryTime("10");
+                    billClean.setDryTem("70");
                     dryMapper.updateById(billClean);
 
                     baseProcess.setProcessType(1);
@@ -1098,6 +1109,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     billClean.setTestLocationId(baseLocation.getId());
                     billClean.setCheckDate(sdf.parse(date));
                     billClean.setPassDate(sdf.parse(sdf.format(new Date())));
+                    billClean.setDryTime("10");
+                    billClean.setDryTem("70");
                     dryMapper.updateById(billClean);
 
                     baseProcess.setProcessType(2);

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

@@ -0,0 +1,20 @@
+package com.huimv.receive.service.impl;
+
+import com.huimv.receive.entity.BillGate;
+import com.huimv.receive.mapper.BillGateMapper;
+import com.huimv.receive.service.IBillGateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆闸机信息记录 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-25
+ */
+@Service
+public class BillGateServiceImpl extends ServiceImpl<BillGateMapper, BillGate> implements IBillGateService {
+
+}

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

@@ -67,6 +67,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     private BillGoodsInventoryMapper billGoodsInventoryMapper;
     @Resource
     private ExistMapper existMapper;
+    @Autowired
+    private BillGateMapper gateMapper;
+    @Autowired
+    private BillAccessDoorMapper doorMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -249,7 +253,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         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("farm_id",farmId)
+        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>()
@@ -414,15 +418,18 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String farmId = paramsMap.get("farmId");
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+//        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("farm_id", farmId);
         Page<FactoryDirectorVo> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         IPage<FactoryDirectorVo> factoryDirectorList;
+//        factoryDirectorList = billPersonnelAdmissionMapper.listAll(queryWrapper,page);
         if (type.equals("0")) {
             factoryDirectorList = billPersonnelAdmissionMapper.listAll(type, farmId, page);
         } else {
             factoryDirectorList = billPersonnelAdmissionMapper.listCarAll(type, farmId, page);
         }
 
-        return new Result(ResultCode.SUCCESS, factoryDirectorList, factoryDirectorList.getSize());
+        return new Result(ResultCode.SUCCESS, factoryDirectorList/*, factoryDirectorList.getSize()*/);
     }
 
     @Override
@@ -448,6 +455,45 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     }
 
     @Override
+    public Result listDoor(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");//1为车辆 2为闸机
+        String status = paramsMap.get("status");//0为全部 1为通过 2为不通过
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "10";
+        }
+        if ("".equals(status) || null == status) {
+            status = "0";
+        }
+        if ("1".equals(type)) {
+            QueryWrapper<BillAccessDoor> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            if ("1".equals(status)) {
+                queryWrapper.eq("bill_status", 1);
+            } else if ("2".equals(status)) {
+                queryWrapper.eq("bill_status", 0);
+            }
+            Page<BillAccessDoor> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper));
+        } else {
+            QueryWrapper<BillGate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            if ("1".equals(status)) {
+                queryWrapper.eq("bill_status", 1);
+            } else if ("2".equals(status)) {
+                queryWrapper.eq("bill_status", 0);
+            }
+            Page<BillGate> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, gateMapper.selectPage(page, queryWrapper));
+        }
+    }
+
+    @Override
     public Result countAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");
@@ -639,7 +685,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("admission_type", 1).orderByDesc("sub_date")
-        .last(" limit 10");
+                .last(" limit 10");
         return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectList(queryWrapper));
     }
 

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

@@ -51,7 +51,7 @@
     </select>
 
     <select id="CleanAndDry" resultType="com.huimv.receive.entity.vo.CleanAndDryVo2">
-        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        select *,null,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
         and test_location_id in
         <foreach collection="locations" item="location" separator="," open="(" close=")">
             #{location}
@@ -75,14 +75,14 @@
 
 
     <select id="CleanAndDry2" resultType="com.huimv.receive.entity.vo.CleanAndDryVo2">
-        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,clean_time,null,1 AS 'type' from bill_clean where farm_id=#{farmId} and
         vistit_type in (1,2,3,4,5,6) and img_status=1
         and bill_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
         union all
-        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,dry_time,dry_tem,2 AS 'type' from bill_dry where farm_id=#{farmId} and
         vistit_type in (1,2,3,4,5,6) and img_status=1
         and bill_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">

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

@@ -27,49 +27,49 @@
         <result column="process_id" property="processId"/>
     </resultMap>
     <select id="listAll" resultType="com.huimv.receive.entity.vo.FactoryDirectorVo">
-        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}
+        SELECT id,admission_user_name AS 'userName',process_id processId, 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 = '7'
 
 UNION ALL
 
-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}
+SELECT id,admission_user_name AS 'userName',process_id processId, 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 = '7'
 
 UNION ALL
 
-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}
+SELECT id,admission_user_name AS 'userName',process_id processId, 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 = '7'
 
 UNION ALL
 
-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
+SELECT  id,admission_user_name AS 'userName',process_id processId, 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>
 
 
     <select id="listCarAll" resultType="com.huimv.receive.entity.vo.FactoryDirectorVo">
-SELECT id,admission_user_name AS 'userName',car_num, 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}
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, 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 = '7'
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName',car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
-FROM bill_dry WHERE farm_id = #{farmId} AND vistit_type = #{type} AND img_status = 1
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
+FROM bill_dry WHERE farm_id = #{farmId} AND vistit_type = '7' AND img_status = 1
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName',car_num, 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} AND img_status = 1
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, 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 = '7' AND img_status = 1
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName',car_num, 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}
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, 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 = '7'
 
 UNION ALL
 
-SELECT id,admission_user_name AS 'userName',car_num, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName',process_id processId,car_num, 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>

huimv-receive/src/main/resources/mapper/BillAccessDoorMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.receive.mapper.BillAccessDoorMapper">
+
+</mapper>

huimv-receive/src/main/resources/mapper/BillGateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.receive.mapper.BillGateMapper">
+
+</mapper>