生物安全车辆修改6

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+@RestController
+@RequestMapping("/bill-goods-inventory")
+public class BillGoodsInventoryController {
+
+}

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

@@ -0,0 +1,56 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_goods_inventory")
+public class BillGoodsInventory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 物资类型
+     */
+    private String goodsType;
+
+    /**
+     * 物资数量
+     */
+    private String goodsNums;
+
+    /**
+     * 申请单id
+     */
+    private Integer billAdmission;
+
+    /**
+     * 当前位置
+     */
+    private String currentLocation;
+
+    /**
+     * 当前位置 id
+     */
+    private Integer currentLocationId;
+
+
+}

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

@@ -5,6 +5,7 @@ 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;
@@ -113,7 +114,7 @@ public class BillPersonnelAdmission implements Serializable {
      * 处理时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
-    private LocalDateTime passDate;
+    private Date passDate;
 
     /**
      * 处理人

huimv-admin/src/main/java/com/huimv/admin/mapper/BillGoodsInventoryMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillGoodsInventory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+public interface BillGoodsInventoryMapper extends BaseMapper<BillGoodsInventory> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillGoodsInventory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+public interface IBillGoodsInventoryService extends IService<BillGoodsInventory> {
+
+}

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

@@ -56,6 +56,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private UploadImage uploadImage;
     @Autowired
     private BillDryMapper dryMapper;
+    @Autowired
+    private BillPersonnelAdmissionMapper admissionMapper;
 
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -92,27 +94,42 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 queryWrapper.eq("bill_status", 1);
             }
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
+        } else if (type.equals("4")) {
+            Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 5).orderByDesc("sub_date")
+                    .eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));
+
+            if ("0".equals(data)) {
+                queryWrapper.in("bill_status", 0, 1, 2);
+            }
+            if ("1".equals(data)) {
+                queryWrapper.eq("bill_status", 0);
+            }
+            if ("2".equals(data)) {
+                queryWrapper.eq("bill_status", 1);
+            }
+            return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper));
         } else {
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             if ("0".equals(data)) {
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","),TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","), TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             ArrayList<String> arrayList = new ArrayList<>();
             if ("1".equals(data)) {
                 arrayList.add("0");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s,TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             if ("2".equals(data)) {
                 arrayList.add("1");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s,TokenSign.getWorkIdByJwtToken(httpServletRequest));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s, TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }
 
-
     }
 
     @Override
@@ -257,6 +274,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     @Resource
     private BillCleanMapper billCleanMapper;
 
+
     @Override
     public Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNo = paramsMap.get("pageNum");
@@ -336,6 +354,21 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             String s = s1 + s2 + s3 + s4 + s5;
             billClean.setImgUrl(s);
             cleanMapper.updateById(billClean);
+            //物资车生成二次申请
+            if (billClean.getTestLocationId() == 47 || billClean.getTestLocationId() == 50) {
+                if (billClean.getDestId() > 47 || billClean.getDestId() > 50) {
+                    Integer processId = billClean.getProcessId();
+                    QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.eq("farm_id", farmId).eq("process_id", processId);
+                    BillPersonnelAdmission admission = admissionMapper.selectOne(queryWrapper1);
+                    admission.setBillStatus(3);
+                    admission.setPassDate(sdf.parse(sdf.format(new Date())));
+                    admission.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    admission.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
+                    admissionMapper.updateById(admission);
+                }
+
+            }
         } else {
             BillDry billClean = dryMapper.selectById(id);//某条烘干记录
             System.out.println("洗消记录的id:" + billClean.getTestLocationId());

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillGoodsInventory;
+import com.huimv.admin.mapper.BillGoodsInventoryMapper;
+import com.huimv.admin.service.IBillGoodsInventoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+@Service
+public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventoryMapper, BillGoodsInventory> implements IBillGoodsInventoryService {
+
+}

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

@@ -5,19 +5,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 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.BaseLocation;
-import com.huimv.admin.entity.BaseProcess;
-import com.huimv.admin.entity.BillClean;
+import com.huimv.admin.entity.*;
 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.BaseLocationMapper;
-import com.huimv.admin.mapper.BaseProcessMapper;
-import com.huimv.admin.mapper.BillCleanMapper;
-import com.huimv.admin.mapper.BillPcrMapper;
+import com.huimv.admin.mapper.*;
 import com.huimv.admin.service.IBillPcrService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +62,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     private BaseLocationMapper locationMapper;
     @Autowired
     private BillCleanMapper cleanMapper;
+    @Autowired
+    private BillGoodsInventoryMapper goodsInventoryMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -142,6 +138,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                     billPcr.setCheckDate(sdf.parse(date));
                     billPcr.setPassDate(sdf.parse(sdf.format(new Date())));
 
+
                     //通过生成洗消记录
                     BillClean billClean = new BillClean();
                     billClean.setVistitType(billPcr.getVistitType());

huimv-admin/src/main/resources/mapper/BillGoodsInventoryMapper.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.admin.mapper.BillGoodsInventoryMapper">
+
+</mapper>