判断是否有二级洗消站修改

huimv-receive/src/main/java/com/huimv/receive/common/utils/Print.java

@@ -261,13 +261,13 @@ public class Print {
             userVo.setPhone(user.getUserPhone());
             userVo.setUserName(user.getUserName());
             userVo.setUserNum(user.getUserId());
-            if (user.getJob() == 1) {
+            if (user.getJob().equals("1")) {
                 userVo.setWorkName("场长");
-            } else if (user.getJob() == 3) {
+            } else if (user.getJob().equals("3")) {
                 userVo.setWorkName("生物安全负责人");
-            } else if (user.getJob() == 4) {
+            } else if (user.getJob().equals("4")) {
                 userVo.setWorkName("pcr检测人员");
-            } else if (user.getJob() == 5) {
+            } else if (user.getJob().equals("5")) {
                 userVo.setWorkName("洗消点工作人员");
             }
             if (user.getGender() == 0) {

huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -31,6 +31,11 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/secureApi/bill-luggage/printLuggage"
                         ,"/secureApi/admin/user/printUser"
                         ,"/secureApi/admin/accountMultilevel/printAccount"
-                        ,"/secureApi/base-device/printDevice");
+                        ,"/secureApi/base-device/printDevice"
+
+                        ,"/secureApi/bill-personnel-admission/jingJiAdmission"
+                        ,"/secureApi/bill-personnel-admission/allCount"
+                        ,"/secureApi/bill-pcr/pcrList"
+                        ,"/secureApi/bill-goods-inventory/listAll");
     }
 }

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

@@ -5,7 +5,9 @@ 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.BaseLocation;
+import com.huimv.receive.entity.Exist;
 import com.huimv.receive.service.IBaseLocationService;
+import com.huimv.receive.service.IExistService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,17 +27,40 @@ import java.util.Map;
 public class BaseLocationController {
     @Autowired
     private IBaseLocationService baseLocationService;
+    @Autowired
+    private IExistService existService;
 
     @PostMapping("/listAll")
     public Result listAll(@RequestBody Map<String, String> paramsMap){
         String farmId = paramsMap.get("farmId");
         String vistitType = paramsMap.get("vistitType");
-        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>().eq("farm_id", farmId).eq("vistit_type", vistitType).ne("location_type", 0)));
+        QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        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)));
+        }
+        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",6)));
+        }
+        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)));
+        }
+        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
+                .eq("farm_id", farmId).eq("vistit_type", vistitType)
+                .ne("location_type", 0)));
     }
 
     @PostMapping("/listLuggageLocation")
     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("farm_id",farmId)
+                .eq("vistit_type",0).eq("parent_id",0)));
     }
 }

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

@@ -42,44 +42,44 @@ public class BillCleanController {
     private IBillDryService billDryService;
 
     @PostMapping("/listPersonalClean")
-    public Result listPersonalClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billCleanService.listPersonalClean(httpServletRequest,paramsMap);
+    public Result listPersonalClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanService.listPersonalClean(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/listPersonalCleanAndDry")
-    public Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billCleanService.listPersonalCleanAndDry(httpServletRequest,paramsMap);
+    public Result listPersonalCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanService.listPersonalCleanAndDry(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/getDetail")
-    public Result getDetail(@RequestBody Map<String, String> paramsMap){
-        return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));
+    public Result getDetail(@RequestBody Map<String, String> paramsMap) {
+        return new Result(ResultCode.SUCCESS, billCleanService.getById(paramsMap.get("id")));
     }
 
     @PostMapping("/listCleanAndDry")
-    public Result listCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
-        return billCleanService.listCleanAndDry(httpServletRequest,paramsMap);
+    public Result listCleanAndDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return billCleanService.listCleanAndDry(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/getCleanAndDryDetail")
-    public Result getCleanAndDryDetail(@RequestBody Map<String, String> paramsMap){
+    public Result getCleanAndDryDetail(@RequestBody Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
-        if(StringUtils.isBlank(type)){
+        if (StringUtils.isBlank(type)) {
             BillClean billClean = billCleanService.getById(paramsMap.get("id"));
-            if (ObjectUtil.isEmpty(billClean.getImgUrl())){
+            if (ObjectUtil.isEmpty(billClean.getImgUrl())) {
                 billClean.setImgUrl("");
             }
             return new Result(ResultCode.SUCCESS, billClean);
         }
-        if ("1".equals(type)){
+        if ("1".equals(type)) {
             BillClean billClean = billCleanService.getById(paramsMap.get("id"));
-            if (ObjectUtil.isEmpty(billClean.getImgUrl())){
+            if (ObjectUtil.isEmpty(billClean.getImgUrl())) {
                 billClean.setImgUrl("");
             }
             return new Result(ResultCode.SUCCESS, billClean);
-        }else {
+        } else {
             BillDry billDry = billDryService.getById(paramsMap.get("id"));
-            if (ObjectUtil.isEmpty(billDry.getImgUrl())){
+            if (ObjectUtil.isEmpty(billDry.getImgUrl())) {
                 billDry.setImgUrl("");
             }
             return new Result(ResultCode.SUCCESS, billDry);
@@ -96,6 +96,7 @@ public class BillCleanController {
     public Result listClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listAll(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listById(httpServletRequest, paramsMap);
@@ -105,35 +106,45 @@ public class BillCleanController {
     public Result listByIdDry(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.listByIdDry(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/editClean")
-    public Result editClean(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return cleanService.commitClean(httpServletRequest, paramsMap);
+    public Result editClean(HttpServletRequest httpServletRequest,
+                            @RequestParam("farmId") String farmId,
+                            @RequestParam("id") String id,
+                            @RequestParam("date") String date,
+                            @RequestParam("result") String result,
+                            @RequestParam(value = "img1",required = false) MultipartFile img1,
+                            @RequestParam(value = "img2",required = false) MultipartFile img2,
+                            @RequestParam(value = "img3",required = false) MultipartFile img3
+    ) throws ParseException, IOException {
+        return cleanService.commitClean(httpServletRequest, farmId, id, date, result, img1,img2,img3);
     }
+
     @PostMapping("/carCommit")
     public Result addAdmission(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
                                @RequestParam("data") String data,
-                               @RequestParam(value = "img1",required = false) MultipartFile img1,
-                               @RequestParam(value = "img2",required = false) MultipartFile img2,
-                               @RequestParam(value = "img3",required = false) MultipartFile img3,
-                               @RequestParam(value = "img4",required = false) MultipartFile img4,
-                               @RequestParam(value = "img5",required = false) MultipartFile img5,
+                               @RequestParam(value = "img1", required = false) MultipartFile img1,
+                               @RequestParam(value = "img2", required = false) MultipartFile img2,
+                               @RequestParam(value = "img3", required = false) MultipartFile img3,
+                               @RequestParam(value = "img4", required = false) MultipartFile img4,
+                               @RequestParam(value = "img5", required = false) MultipartFile img5,
                                @RequestParam("farmId") String farmId,
                                @RequestParam("type") String type) throws IOException, ParseException {
-        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5,type);
+        return cleanService.carClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type);
     }
 
     @PostMapping("/goodsCarClean")
     public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
-                               @RequestParam("data") String data,
-                               @RequestParam(value = "img1",required = false) MultipartFile img1,
-                               @RequestParam(value = "img2",required = false) MultipartFile img2,
-                               @RequestParam(value = "img3",required = false) MultipartFile img3,
-                               @RequestParam(value = "img4",required = false) MultipartFile img4,
-                               @RequestParam(value = "img5",required = false) MultipartFile img5,
-                               @RequestParam("farmId") String farmId,
-                               @RequestParam("type") String type,
+                                @RequestParam("data") String data,
+                                @RequestParam(value = "img1", required = false) MultipartFile img1,
+                                @RequestParam(value = "img2", required = false) MultipartFile img2,
+                                @RequestParam(value = "img3", required = false) MultipartFile img3,
+                                @RequestParam(value = "img4", required = false) MultipartFile img4,
+                                @RequestParam(value = "img5", required = false) MultipartFile img5,
+                                @RequestParam("farmId") String farmId,
+                                @RequestParam("type") String type,
                                 @RequestParam("result") String result) throws IOException, ParseException {
-        return cleanService.goodsCarClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5,type,result);
+        return cleanService.goodsCarClean(httpServletRequest, farmId, id, data, img1, img2, img3, img4, img5, type, result);
     }
 
 
@@ -144,12 +155,12 @@ public class BillCleanController {
     }
 
     @PostMapping("/allList")
-    public Result listAll(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.AllClean(httpServletRequest, paramsMap);
     }
 
     @PostMapping("/CleanSelect")
-    public Result CleanSelect(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+    public Result CleanSelect(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return cleanService.CleanSelect(httpServletRequest, paramsMap);
     }
 
@@ -161,17 +172,19 @@ public class BillCleanController {
         String path = "/opt/huatong/clean.xls";
         PdfUtil.returnPdfStream3(response, path, "洗消详情列表");
     }
+
     @PostMapping("/delete")
-    public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
             billCleanService.removeById(s);
         }
-        return new Result(10000,"删除成功！",true);
+        return new Result(10000, "删除成功！", true);
     }
+
     @PostMapping("/editTime")
-    public Result editTime(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+    public Result editTime(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String time = paramsMap.get("time");
         String farmId = paramsMap.get("farmId");
         String hum = paramsMap.get("hum");
@@ -181,6 +194,6 @@ public class BillCleanController {
         configuration.setClean(Integer.parseInt(time));
         configuration.setDry(Integer.parseInt(hum));
         configurationService.updateById(configuration);
-        return new Result(10000,"保存成功！",true);
+        return new Result(10000, "保存成功！", true);
     }
 }

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

@@ -1,12 +1,20 @@
 package com.huimv.receive.controller;
 
 
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.service.IBillGoodsInventoryService;
+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
@@ -14,6 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/bill-goods-inventory")
+@CrossOrigin
 public class BillGoodsInventoryController {
 
+    @Autowired
+    private IBillGoodsInventoryService goodsInventoryService;
+
+    @RequestMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return goodsInventoryService.listAll(httpServletRequest, paramsMap);
+    }
 }

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

@@ -11,9 +11,11 @@ import com.huimv.receive.service.IBillPcrService;
 import com.huimv.receive.service.IConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 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.ParseException;
 import java.util.HashMap;
 import java.util.List;
@@ -46,8 +48,15 @@ public class BillPcrController {
         return pcrService.listById(httpServletRequest, paramsMap);
     }
     @RequestMapping("/editPcr")
-    public Result editPcr(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return pcrService.edit(httpServletRequest, paramsMap);
+    public Result editPcr(HttpServletRequest httpServletRequest,
+                          @RequestParam("farmId") String farmId,
+                          @RequestParam("id") String id,
+                          @RequestParam("date") String date,
+                          @RequestParam("result") String result,
+                          @RequestParam(value = "img1",required = false) MultipartFile img1,
+                          @RequestParam(value = "img2",required = false) MultipartFile img2,
+                          @RequestParam(value = "img3",required = false) MultipartFile img3) throws ParseException, IOException {
+        return pcrService.edit(httpServletRequest, farmId,id,date,result,img1,img2,img3);
     }
     @Autowired
     private IBillPcrService billPcrService;
@@ -121,4 +130,8 @@ public class BillPcrController {
         String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS,configurationService.getOne(new QueryWrapper<Configuration>().eq("farm_id", farmId)));
     }
+    @PostMapping("/pcrList")
+    public Result PcrList(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return billPcrService.PcrList(httpServletRequest, paramsMap);
+    }
 }

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

@@ -189,4 +189,12 @@ public class BillPersonnelAdmissionController {
         PdfUtil.returnPdfStream3(response, path, "人员管理列表");
     }
 
+    @RequestMapping("/jingJiAdmission")
+    public Result jingJiAdmission(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.jingJiAdmission(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/allCount")
+    public Result allCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return admissionService.allCount(httpServletRequest, paramsMap);
+    }
 }

huimv-receive/src/main/java/com/huimv/receive/controller/ExistController.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-08
+ */
+@RestController
+@RequestMapping("/exist")
+public class ExistController {
+
+}

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

@@ -3,11 +3,13 @@ package com.huimv.receive.entity;
 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 java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -59,5 +61,8 @@ public class BillGoodsInventory implements Serializable {
      */
     private Integer currentLocationId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
 
 }

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

@@ -120,4 +120,8 @@ public class BillPcr implements Serializable {
     private String carNum;
 
     private Integer qualifiedDate;
+
+    private String imgUrl;
+
+    private Integer imgStatus;
 }

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

@@ -0,0 +1,38 @@
+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.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("exist")
+public class Exist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 是否存在二级洗消站 0存在 1不存在
+     */
+    private Integer exist;
+
+    private String farmId;
+
+
+}

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

@@ -0,0 +1,31 @@
+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 java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-22
+ */
+@Data
+public class BillGoodsInventoryVo {
+
+    private Integer count;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date dateTime;
+
+
+}

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

@@ -1,7 +1,14 @@
 package com.huimv.receive.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.receive.entity.BillGoodsInventory;
+import com.huimv.receive.entity.BillPcr;
+import com.huimv.receive.entity.vo.BillGoodsInventoryVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +19,5 @@ import com.huimv.receive.entity.BillGoodsInventory;
  * @since 2023-08-22
  */
 public interface BillGoodsInventoryMapper extends BaseMapper<BillGoodsInventory> {
-
+    List<BillGoodsInventoryVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillGoodsInventory> queryWrapper);
 }

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

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

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

@@ -26,7 +26,7 @@ public interface IBillCleanService extends IService<BillClean> {
 
     Result listByIdDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result commitClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+    Result commitClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, String result, MultipartFile img1, MultipartFile img2, MultipartFile img3) throws ParseException, IOException;
     Result listPersonalClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     //环保车

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

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillGoodsInventory;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +16,5 @@ import com.huimv.receive.entity.BillGoodsInventory;
  * @since 2023-08-22
  */
 public interface IBillGoodsInventoryService extends IService<BillGoodsInventory> {
-
+    Result listAll(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

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

@@ -3,9 +3,11 @@ package com.huimv.receive.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BillPcr;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.Map;
 
@@ -22,7 +24,8 @@ public interface IBillPcrService extends IService<BillPcr> {
 
     Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+    Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date, String result,
+                MultipartFile img1, MultipartFile img2, MultipartFile img3) throws ParseException, IOException;
     Result listPersonalPcr(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     //后台总体概况
@@ -38,4 +41,7 @@ public interface IBillPcrService extends IService<BillPcr> {
 
     //导出
     void printPcr(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
+
+    //大屏
+    Result PcrList(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -66,5 +66,10 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     //导出
     void printAdmission(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
 
+    //大屏
+    Result jingJiAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result allCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     Result uploadImgAndAdmissin(MultipartFile imgUrl, Integer id) throws IOException;
 }

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

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

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

@@ -59,6 +59,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     private BillPersonnelAdmissionMapper admissionMapper;
     @Autowired
     private ConfigurationMapper configurationMapper;
+    @Autowired
+    private ExistMapper existMapper;
 
     @Override
     public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -194,16 +196,42 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     }
 
     @Override
-    public Result commitClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String result = paramsMap.get("result");// 结果
-        String farmId = paramsMap.get("farmId");
-        String id = paramsMap.get("id");
-        String date = paramsMap.get("date");
+    public Result commitClean(HttpServletRequest httpServletRequest,String farmId, String id, String date, String result
+            , MultipartFile img1, MultipartFile img2, MultipartFile img3) throws ParseException, IOException {
+
+        String s1 = "";
+        String s2 = "";
+        String s3 = "";
+        if (ObjectUtil.isNotEmpty(img1)) {
+            if (uploadImage.getImageCom(img1).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片1上传失败", false);
+            }
+            s1 = uploadImage.uploadImg(img1);
+        }
+        if (ObjectUtil.isNotEmpty(img2)) {
+            if (uploadImage.getImageCom(img2).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片2上传失败", false);
+            }
+            s2 = "," + uploadImage.uploadImg(img2);
+        }
+        if (ObjectUtil.isNotEmpty(img3)) {
+            if (uploadImage.getImageCom(img3).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片3上传失败", false);
+            }
+            s3 = "," + uploadImage.uploadImg(img3);
+        }
+        String s = s1 + s2 + s3 ;
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
         }
         BillClean billClean = cleanMapper.selectById(id);//某条洗消记录
+        billClean.setImgUrl(s);
+        billClean.setImgStatus(1);
 
         QueryWrapper<BaseProcess> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("id", billClean.getProcessId());
@@ -217,6 +245,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         queryWrapper3.eq("farm_id", farmId);
         Configuration configuration = configurationMapper.selectOne(queryWrapper3);
 
+        QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
+        existQueryWrapper.eq("farm_id", farmId);
+        Exist exist = existMapper.selectOne(existQueryWrapper);//判断是否有二级洗消站
+
+
         if (billClean.getBillStatus() != 0) {
             return new Result(10001, "该订单已通过，无需再次提交！", false);
         }
@@ -231,53 +264,79 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 billClean.setCheckDate(sdf.parse(date));
                 billClean.setPassDate(sdf.parse(sdf.format(new Date())));
 
-                if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
-                    //生成pcr检测申请
-                    BillPcr billPcr = new BillPcr();
-                    billPcr.setPcrType(0);
-                    billPcr.setPhone(billClean.getPhone());
-                    billPcr.setVistitType(billClean.getVistitType());
-                    billPcr.setDestName(billClean.getDestName());
-                    billPcr.setDestId(billClean.getDestId());
-                    billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
-                    billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
-                    billPcr.setVistitDate(billClean.getVistitDate());
-                    billPcr.setSubDate(LocalDateTime.now());
-                    billPcr.setBillStatus(0);
-                    billPcr.setProcessId(billClean.getProcessId());
-                    billPcr.setFarmId(billClean.getFarmId());
-                    billPcr.setTestLocation("人员二级洗消站");
-                    billPcr.setTestLocationId(3);
-                    billPcr.setQualifiedDate(configuration.getPcr());
-                    pcrMapper.insert(billPcr);
+                if (exist.getExist() == 0) {
+                    if (baseLocation.getId() == 1 && baseProcess.getDestId() > 2) {
+                        //生成pcr检测申请
+                        BillPcr billPcr = new BillPcr();
+                        billPcr.setPcrType(0);
+                        billPcr.setPhone(billClean.getPhone());
+                        billPcr.setVistitType(billClean.getVistitType());
+                        billPcr.setDestName(billClean.getDestName());
+                        billPcr.setDestId(billClean.getDestId());
+                        billPcr.setAdmissionUserName(billClean.getAdmissionUserName());
+                        billPcr.setAdmissionUserId(billClean.getAdmissionUserId());
+                        billPcr.setVistitDate(billClean.getVistitDate());
+                        billPcr.setSubDate(LocalDateTime.now());
+                        billPcr.setBillStatus(0);
+                        billPcr.setProcessId(billClean.getProcessId());
+                        billPcr.setFarmId(billClean.getFarmId());
+                        billPcr.setTestLocation("人员二级洗消站");
+                        billPcr.setTestLocationId(3);
+                        billPcr.setQualifiedDate(configuration.getPcr());
+                        pcrMapper.insert(billPcr);
 
-                    String status = baseProcess.getAllLocationStatus();
-                    String[] split1 = status.split(",");
-                    split1[0] = "2";
-                    split1[1] = "2";
-                    split1[2] = "2";
-                    split1[3] = "1";
-                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
-                }
-                if (baseLocation.getId() == 3) {
-                    //生成隔离申请
-                    BillIsolate isolate = new BillIsolate();
-                    isolate.setPhone(billClean.getPhone());
-                    isolate.setVistitType(billClean.getVistitType());
-                    isolate.setDestName(billClean.getDestName());
-                    isolate.setDestId(billClean.getDestId());
-                    isolate.setAdmissionUserName(billClean.getAdmissionUserName());
-                    isolate.setAdmissionUserId(billClean.getAdmissionUserId());
-                    isolate.setVistitDate(billClean.getVistitDate());
-                    isolate.setSubDate(billClean.getSubDate());
-                    isolate.setFarmId(billClean.getFarmId());
-                    isolate.setBillStatus(0);
-                    isolate.setIsolateDayNum("");
-                    isolate.setProcessId(billClean.getProcessId());
-                    isolate.setIsolateLocation(baseLocation.getLocationName());
-                    isolate.setIsolateLocationId(baseLocation.getId());
-                    isolateMapper.insert(isolate);
+                        String status = baseProcess.getAllLocationStatus();
+                        String[] split1 = status.split(",");
+                        split1[0] = "2";
+                        split1[1] = "2";
+                        split1[2] = "2";
+                        split1[3] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                    }
+                    if (baseLocation.getId() == 3) {
+                        //生成隔离申请
+                        BillIsolate isolate = new BillIsolate();
+                        isolate.setPhone(billClean.getPhone());
+                        isolate.setVistitType(billClean.getVistitType());
+                        isolate.setDestName(billClean.getDestName());
+                        isolate.setDestId(billClean.getDestId());
+                        isolate.setAdmissionUserName(billClean.getAdmissionUserName());
+                        isolate.setAdmissionUserId(billClean.getAdmissionUserId());
+                        isolate.setVistitDate(billClean.getVistitDate());
+                        isolate.setSubDate(billClean.getSubDate());
+                        isolate.setFarmId(billClean.getFarmId());
+                        isolate.setBillStatus(0);
+                        isolate.setIsolateDayNum("");
+                        isolate.setProcessId(billClean.getProcessId());
+                        isolate.setIsolateLocation(baseLocation.getLocationName());
+                        isolate.setIsolateLocationId(baseLocation.getId());
+                        isolateMapper.insert(isolate);
 
+                        String status = baseProcess.getAllLocationStatus();
+                        String[] split1 = status.split(",");
+                        split1[0] = "2";
+                        split1[1] = "2";
+                        split1[2] = "2";
+                        split1[3] = "1";
+                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                    }
+                }
+                if (exist.getExist() == 1 && billClean.getDestId() >= 4 && baseLocation.getId() == 1) {
+                    BillClean billClean1 = new BillClean();
+                    billClean1.setVistitType(billClean.getVistitType());
+                    billClean1.setDestName(billClean.getDestName());
+                    billClean1.setDestId(billClean.getDestId());
+                    billClean1.setAdmissionUserId(billClean.getAdmissionUserId());
+                    billClean1.setAdmissionUserName(billClean.getAdmissionUserName());
+                    billClean1.setVistitDate(billClean.getVistitDate());
+                    billClean1.setSubDate(LocalDateTime.now());
+                    billClean1.setFarmId(billClean.getFarmId());
+                    billClean1.setBillStatus(0);
+                    billClean1.setProcessId(billClean.getProcessId());
+                    billClean1.setPhone(billClean.getPhone());
+                    billClean1.setTestLocation("场内");
+                    billClean1.setTestLocationId(4);
+                    billCleanMapper.insert(billClean1);
                     String status = baseProcess.getAllLocationStatus();
                     String[] split1 = status.split(",");
                     split1[0] = "2";
@@ -287,6 +346,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
                 }
 
+
+
                 if (baseLocation.getId() == 4) {
                     QueryWrapper<BillPcr> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("farm_id", farmId).eq("process_id", baseProcess.getId()).eq("test_location_id", 4);
@@ -310,14 +371,25 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setQualifiedDate(configuration.getPcr());
                         pcrMapper.insert(billPcr);
 
-                        String status = baseProcess.getAllLocationStatus();
-                        String[] split1 = status.split(",");
-                        split1[0] = "2";
-                        split1[1] = "2";
-                        split1[2] = "2";
-                        split1[3] = "2";
-                        split1[4] = "1";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
+                        if (exist.getExist() == 0) {
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "2";
+                            split1[4] = "1";
+                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
+                        }else {
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "1";
+                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3]  + status.substring(7));
+                        }
+
                     } else {
                         //生成隔离申请
                         BillIsolate isolate = new BillIsolate();
@@ -337,14 +409,25 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setIsolateLocationId(baseLocation.getNextId());
                         isolateMapper.insert(isolate);
 
-                        String status = baseProcess.getAllLocationStatus();
-                        String[] split1 = status.split(",");
-                        split1[0] = "2";
-                        split1[1] = "2";
-                        split1[2] = "2";
-                        split1[3] = "2";
-                        split1[4] = "2";
-                        baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + "," + "1");
+                        if (exist.getExist()==0) {
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "2";
+                            split1[4] = "2";
+                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + "," + "1");
+                        }else {
+                            String status = baseProcess.getAllLocationStatus();
+                            String[] split1 = status.split(",");
+                            split1[0] = "2";
+                            split1[1] = "2";
+                            split1[2] = "2";
+                            split1[3] = "2";
+                            baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3]  + "," + "1");
+                        }
+
 
                     }
                 }
@@ -411,6 +494,15 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     split1[4] = "3";
                     baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + "," + split1[4] + status.substring(9));
                 }
+                if (exist.getExist() == 1 && baseProcess.getDestId() > 2) {
+                    String status = baseProcess.getAllLocationStatus();
+                    String[] split1 = status.split(",");
+                    split1[0] = "2";
+                    split1[1] = "2";
+                    split1[2] = "2";
+                    split1[3] = "3";
+                    baseProcess.setAllLocationStatus(split1[0] + "," + split1[1] + "," + split1[2] + "," + split1[3] + status.substring(7));
+                }
 
                 baseProcess.setProcessType(2);
                 baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
@@ -446,17 +538,17 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             String substring = status.substring(0, status.length() - 1);
             baseProcess.setCurrentStatus(substring + "1");
 
-            String s = baseProcess.getAllLocationId();
-            String[] split = s.split(",");
-            Integer s2 = 0;
+            String ids = baseProcess.getAllLocationId();
+            String[] split = ids.split(",");
+            Integer s22 = 0;
             for (int i = 0; i < split.length; i++) {
                 if (Integer.parseInt(split[i]) == baseLocation.getId()) {
-                    s2 = i;
+                    s22 = i;
                 }
             }
             String status1 = baseProcess.getAllLocationStatus();
             StringBuilder split1 = new StringBuilder(status1);
-            split1.replace(s2, s2 + 1, "3");
+            split1.replace(s22, s22 + 1, "3");
             baseProcess.setAllLocationStatus(split1.toString());
 
             if (baseProcess.getDestId() == 1) {
@@ -682,6 +774,11 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     public Result goodsCarClean(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img1,
                                 MultipartFile img2, MultipartFile img3, MultipartFile img4, MultipartFile img5, String type, String result
     ) throws ParseException, IOException {
+
+        QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
+        existQueryWrapper.eq("farm_id", farmId);
+        Exist exist = existMapper.selectOne(existQueryWrapper);//判断是否有二级洗消站
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
@@ -785,7 +882,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                     }
 
                     //第一次通过生成洗消
-                    if (billClean.getTestLocationId() == 6) {
+                    if (billClean.getTestLocationId() == 6 && exist.getExist() == 0) {
+
                         BillClean clean = new BillClean();
                         clean.setVistitType(billClean.getVistitType());
                         clean.setVistitDate(billClean.getVistitDate());
@@ -809,6 +907,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             baseProcess.setAllLocationStatus("2,2,1,0");
                         }
                     }
+                    if (billClean.getTestLocationId() == 6 && exist.getExist() == 1) {
+                        if (baseProcess.getDestId() > 6) {
+                            baseProcess.setAllLocationStatus("2,2,2");
+                        } else {
+                            baseProcess.setAllLocationStatus("2,2");
+                        }
+                    }
 
                     if (billClean.getTestLocationId() == 7) {
                         //生成烘干申请

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

@@ -1,11 +1,21 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.BillGoodsInventory;
+import com.huimv.receive.entity.vo.BillGoodsInventoryVo;
 import com.huimv.receive.mapper.BillGoodsInventoryMapper;
 import com.huimv.receive.service.IBillGoodsInventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +27,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventoryMapper, BillGoodsInventory> implements IBillGoodsInventoryService {
 
+    @Autowired
+    private BillGoodsInventoryMapper inventoryMapper;
+
+    @Override
+    public Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        QueryWrapper<BillGoodsInventory> queryWrapper = new QueryWrapper<>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+        queryWrapper.ge("create_date", calendar.getTime());
+//        queryWrapper.groupBy("create_date");
+//        queryWrapper.orderByAsc("create_date");
+        List<BillGoodsInventoryVo> billGoodsInventoryVos = inventoryMapper.listAll(queryWrapper);
+//        List<BillGoodsInventory> billGoodsInventories = inventoryMapper.selectList(queryWrapper);
+
+        return new Result(ResultCode.SUCCESS, billGoodsInventoryVos);
+    }
 }

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

@@ -1,14 +1,13 @@
 package com.huimv.receive.service.impl;
 
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.receive.common.token.TokenSign;
-import com.huimv.receive.common.utils.DataUill;
-import com.huimv.receive.common.utils.Print;
-import com.huimv.receive.common.utils.Result;
-import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.*;
 import com.huimv.receive.entity.dto.PcrDto;
 import com.huimv.receive.entity.vo.PcrVo;
@@ -17,10 +16,14 @@ import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBillPcrService;
 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 javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -217,6 +220,34 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         Print.printPcr(list);
     }
 
+    @Override
+    public Result PcrList(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Date timesmorning = DataUill.getTimesmorning();
+        queryWrapper.ge("sub_date", timesmorning);
+        Integer integer = pcrMapper.selectCount(queryWrapper);//检测总数
+        queryWrapper.in("bill_status", 1,3);
+        Integer integer1 = pcrMapper.selectCount(queryWrapper);//合格总数
+        DecimalFormat def = new DecimalFormat("0.00");
+        String rank;
+        if (integer == 0 || integer == null) {
+            Double ranks  = Double.valueOf("0.00");
+            rank = ranks.toString();
+        } else {
+            Double ranks = (Double.valueOf(integer1.toString()) / Double.valueOf(integer.toString())) * 100;
+            rank = def.format(ranks);
+        }
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("allCount", integer);
+        jsonObject.put("passCount", integer1);
+        jsonObject.put("rank", rank);
+        jsonObject.put("pcrList", pcrMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
     @Autowired
     private BillPcrMapper pcrMapper;
     @Autowired
@@ -229,6 +260,10 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     private BillGoodsInventoryMapper goodsInventoryMapper;
     @Autowired
     private ConfigurationMapper configurationMapper;
+    @Autowired
+    private UploadImage uploadImage;
+    @Autowired
+    private ExistMapper existMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -278,18 +313,43 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
     }
 
     @Override
-    public Result edit(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String result = paramsMap.get("result");//1为合格2为异常
-        String id = paramsMap.get("id");
-        String farmId = paramsMap.get("farmId");
-        String date = paramsMap.get("date");
-
+    public Result edit(HttpServletRequest httpServletRequest,String farmId, String id, String date, String result,
+                       MultipartFile img1, MultipartFile img2, MultipartFile img3) throws ParseException, IOException {
+      //1为合格2为异常
+        String s1 = "";
+        String s2 = "";
+        String s3 = "";
+        if (ObjectUtil.isNotEmpty(img1)) {
+            if (uploadImage.getImageCom(img1).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片1上传失败", false);
+            }
+            s1 = uploadImage.uploadImg(img1);
+        }
+        if (ObjectUtil.isNotEmpty(img2)) {
+            if (uploadImage.getImageCom(img2).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片2上传失败", false);
+            }
+            s2 = "," + uploadImage.uploadImg(img2);
+        }
+        if (ObjectUtil.isNotEmpty(img3)) {
+            if (uploadImage.getImageCom(img3).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片3上传失败", false);
+            }
+            s3 = "," + uploadImage.uploadImg(img3);
+        }
+        String s = s1 + s2 + s3 ;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
         if (StringUtils.isBlank(date)) {
             date = sdf.format(new Date());
         }
         BillPcr billPcr = pcrMapper.selectById(id);
+        billPcr.setImgUrl(s);
+        billPcr.setImgStatus(1);
+
 
         QueryWrapper<BaseProcess> processQueryWrapper = new QueryWrapper<>();
         processQueryWrapper.eq("farm_id", farmId).eq("id", billPcr.getProcessId());
@@ -303,6 +363,10 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
         queryWrapper.eq("farm_id", farmId);
         Configuration configuration = configurationMapper.selectOne(queryWrapper);
 
+        QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
+        existQueryWrapper.eq("farm_id", farmId);
+        Exist exist = existMapper.selectOne(existQueryWrapper);//判断是否有二级洗消站
+
         if (billPcr.getBillStatus() != 0) {
             return new Result(10001, "该订单已通过，无需再次提交！", false);
         }
@@ -417,7 +481,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         split[3] = "3";
                         baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + status1.substring(7));
                     }
-                    if (baseLocation.getId() == 4) {
+                    if (baseLocation.getId() == 4&&exist.getExist()==0) {
                         //第三次不合格
                         baseProcess.setProcessType(2);
                         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
@@ -431,6 +495,19 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         split[4] = "3";
                         baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + "," + split[4] + status1.substring(9));
                     }
+                    if (baseLocation.getId() == 4&&exist.getExist()==1) {
+                        //第三次不合格
+                        baseProcess.setProcessType(2);
+                        baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
+                        baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
+                        String status1 = baseProcess.getAllLocationStatus();
+                        String[] split = status1.split(",");
+                        split[0] = "2";
+                        split[1] = "2";
+                        split[2] = "2";
+                        split[3] = "3";
+                        baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + status1.substring(7));
+                    }
 
                     if (baseLocation.getId() == 17) {
                         String status1 = baseProcess.getAllLocationStatus();

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

@@ -65,6 +65,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     private BillDryMapper dryMapper;
     @Resource
     private BillGoodsInventoryMapper billGoodsInventoryMapper;
+    @Resource
+    private ExistMapper existMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -78,7 +80,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 return new Result(10001, "身份证号格式错误!", false);
             }
         }
-        SysAccountMultilevel sysAccountMultilevel1 = sysAccountMultilevelMapper.selectById(phone);
+        SysAccountMultilevel sysAccountMultilevel1 = sysAccountMultilevelMapper.selectById(userId);
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         BillPersonnelAdmission billPersonnelAdmission = new BillPersonnelAdmission();
@@ -123,20 +125,29 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setCurrentStatus("0");
 
         QueryWrapper<BaseLocation> queryWrapper = new QueryWrapper<>();
-        if (vistitType.equals("5")) {
+        QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
+        existQueryWrapper.eq("farm_id", farmId);
+        Exist exist = existMapper.selectOne(existQueryWrapper);
+        if (vistitType.equals("5") && exist.getExist() == 0) {
             if (destId.equals("9")) {
                 baseProcess.setAllLocationStatus("1,0");
-                baseProcess.setAllLocation("场外,车辆初级洗消站");
+                baseProcess.setAllLocation("场外,初级洗消站");
                 baseProcess.setAllLocationId("26,9");
             } else if (destId.equals("10")) {
                 baseProcess.setAllLocationId("9,10");
-                baseProcess.setAllLocation("车辆初级洗消站,车辆二级洗消站");
+                baseProcess.setAllLocation("初级洗消站,二级洗消站");
                 baseProcess.setAllLocationStatus("1,0");
             } else if (destId.equals("11")) {
                 baseProcess.setAllLocationId("10,11");
-                baseProcess.setAllLocation("车辆二级洗消站,车辆三级洗消站");
+                baseProcess.setAllLocation("二级洗消站,三级洗消站");
                 baseProcess.setAllLocationStatus("1,0");
             }
+        } else if (vistitType.equals("5") && exist.getExist() == 1) {
+            if (destId.equals("9")) {
+                baseProcess.setAllLocationStatus("1,0");
+                baseProcess.setAllLocation("场外,初级洗消站");
+                baseProcess.setAllLocationId("26,9");
+            }
         } else {
             queryWrapper.eq("vistit_type", vistitType).eq("farm_id", farmId).orderByAsc("location_type");
             List<BaseLocation> baseLocations = baseLocationMapper.selectList(queryWrapper);
@@ -147,26 +158,46 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 baseProcess.setAllLocationId(baseLocationMapper.selectOne(queryWrapper1).getId() + "," + destId);
                 baseProcess.setAllLocationStatus("1,0");
             } else {
-                String allLocation = "";
-                String allLocationId = "";
-                String allLocationStatus = "";
-                for (BaseLocation baseLocation : baseLocations) {
-                    if (baseLocation.getId() < Integer.parseInt(destId) || baseLocation.getId() >= 20) {
-                        allLocation = allLocation + baseLocation.getLocationName() + ",";
-                        allLocationId = allLocationId + baseLocation.getId() + ",";
-                        allLocationStatus = allLocationStatus + "0" + ",";
+
+                if (vistitType.equals("0") && exist.getExist() == 1 && Integer.parseInt(destId) > 3) {
+                    if (Integer.parseInt(destId) == 4) {
+                        baseProcess.setAllLocation("场外,人员初级洗消站,净区,场内");
+                        baseProcess.setAllLocationId("20,1,2,4");
+                        baseProcess.setAllLocationStatus("1,0,0,0");
+                    } else {
+                        baseProcess.setAllLocation("场外,人员初级洗消站,净区,场内,生产区");
+                        baseProcess.setAllLocationId("20,1,2,4,5");
+                        baseProcess.setAllLocationStatus("1,0,0,0,0");
                     }
-                    if (baseLocation.getId() == Integer.parseInt(destId)) {
-                        allLocation = allLocation + baseLocation.getLocationName();
-                        allLocationId = allLocationId + baseLocation.getId();
-                        allLocationStatus = allLocationStatus + "0";
+                }
+                if (vistitType.equals("3") && exist.getExist() == 1 && Integer.parseInt(destId) > 7) {
+                    baseProcess.setAllLocation("场外,车辆初级洗消站,中转料塔外围");
+                    baseProcess.setAllLocationId("20,6,8");
+                    baseProcess.setAllLocationStatus("1,0,0");
+
+                } else {
+                    String allLocation = "";
+                    String allLocationId = "";
+                    String allLocationStatus = "";
+                    for (BaseLocation baseLocation : baseLocations) {
+                        if (baseLocation.getId() < Integer.parseInt(destId) || baseLocation.getId() >= 20) {
+                            allLocation = allLocation + baseLocation.getLocationName() + ",";
+                            allLocationId = allLocationId + baseLocation.getId() + ",";
+                            allLocationStatus = allLocationStatus + "0" + ",";
+                        }
+                        if (baseLocation.getId() == Integer.parseInt(destId)) {
+                            allLocation = allLocation + baseLocation.getLocationName();
+                            allLocationId = allLocationId + baseLocation.getId();
+                            allLocationStatus = allLocationStatus + "0";
+                        }
                     }
+                    baseProcess.setAllLocation(allLocation);
+                    baseProcess.setAllLocationId(allLocationId);
+                    String[] split = allLocationStatus.split(",");
+                    split[0] = "1";
+                    baseProcess.setAllLocationStatus(split[0] + allLocationStatus.substring(1));
                 }
-                baseProcess.setAllLocation(allLocation);
-                baseProcess.setAllLocationId(allLocationId);
-                String[] split = allLocationStatus.split(",");
-                split[0] = "1";
-                baseProcess.setAllLocationStatus(split[0] + allLocationStatus.substring(1));
+
             }
         }
 
@@ -203,6 +234,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                 BaseLocation baseLocation1 = baseLocationMapper.selectById(destId);
                 good.setCurrentLocation(baseLocation1.getLocationName());
                 good.setCurrentLocationId(baseLocation1.getId());
+                good.setCreateDate(new Date());
                 billGoodsInventoryMapper.insert(good);
             }
         }
@@ -596,6 +628,42 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     }
 
     @Override
+    public Result jingJiAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("admission_type", 1);
+        return new Result(ResultCode.SUCCESS, billPersonnelAdmissionMapper.selectList(queryWrapper));
+    }
+
+    @Override
+    public Result allCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        Calendar currCal=Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+        calendar.set(Calendar.YEAR,currCal.get(Calendar.YEAR));
+        Date time = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String firstday = format.format(time);
+        QueryWrapper<BillClean> cleanQueryWrapper = new QueryWrapper<>();
+        cleanQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
+        QueryWrapper<BillPcr> pcrQueryWrapper = new QueryWrapper<>();
+        pcrQueryWrapper.eq("farm_id", farmId).ge("sub_date", firstday);
+        QueryWrapper<BillGoodsInventory> goodsInventoryQueryWrapper = new QueryWrapper<>();
+        goodsInventoryQueryWrapper.ge("create_date", firstday);
+        JSONObject jsonObject = new JSONObject();
+        Integer integer = pcrMapper.selectCount(pcrQueryWrapper);
+        Integer integer1 = cleanMapper.selectCount(cleanQueryWrapper);
+        Integer integer2 = billGoodsInventoryMapper.selectCount(goodsInventoryQueryWrapper);
+        jsonObject.put("pcr", integer);
+        jsonObject.put("clean", integer1);
+        jsonObject.put("goods",integer2);
+        jsonObject.put("allCount", integer + integer1 + integer2);
+        jsonObject.put("look", "22");
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
     public Result uploadImgAndAdmissin(MultipartFile imgUrl, Integer id) throws IOException {
         BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectById(id);
         String imageCom = "";
@@ -1015,6 +1083,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         locationQueryWrapper.eq(StringUtils.isNotBlank(farmId), "farm_id", farmId).eq("id", billIsolate.getIsolateLocationId());
         BaseLocation baseLocation = locationMapper.selectOne(locationQueryWrapper);//当前隔离所在的位置
 
+        QueryWrapper<Exist> existQueryWrapper = new QueryWrapper<>();
+        existQueryWrapper.eq("farm_id", farmId);
+        Exist exist = existMapper.selectOne(existQueryWrapper);//判断是否有二级洗消站
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String end = sdf.format(billIsolate.getIsolateEndDate());
         String start = sdf.format(billIsolate.getIsolateStartDate());
@@ -1087,9 +1159,14 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         String substring = status.substring(0, status.length() - 1);
         baseProcess.setCurrentStatus(substring + "1," + 0);
 
-        if (billIsolate.getIsolateLocationId() == 5) {
+        if (billIsolate.getIsolateLocationId() == 5 && exist.getExist() == 0) {
+
             baseProcess.setAllLocationStatus("2,2,2,2,2,2");
         }
+        if (billIsolate.getIsolateLocationId() == 5 && exist.getExist() == 1) {
+
+            baseProcess.setAllLocationStatus("2,2,2,2,2");
+        }
 
         if (billIsolate.getIsolateLocationId() == 3) {
             String status1 = baseProcess.getAllLocationStatus();
@@ -1098,7 +1175,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             split[1] = "2";
             split[2] = "2";
             split[3] = "2";
-            baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3]  + status1.substring(7));
+            baseProcess.setAllLocationStatus(split[0] + "," + split[1] + "," + split[2] + "," + split[3] + status1.substring(7));
         }
 
 

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

@@ -0,0 +1,20 @@
+package com.huimv.receive.service.impl;
+
+import com.huimv.receive.entity.Exist;
+import com.huimv.receive.mapper.ExistMapper;
+import com.huimv.receive.service.IExistService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-09-08
+ */
+@Service
+public class ExistServiceImpl extends ServiceImpl<ExistMapper, Exist> implements IExistService {
+
+}

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

@@ -203,13 +203,13 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
             accountVo.setUserName(user.getUserName());
             accountVo.setWorkLocation(user.getWorkLocation());
             accountVo.setUserNum(user.getUserId());
-            if (user.getJob() == 1) {
+            if (user.getJob().equals("1")) {
                 accountVo.setWorkName("场长");
-            } else if (user.getJob() == 3) {
+            } else if (user.getJob().equals("3")) {
                 accountVo.setWorkName("生物安全负责人");
-            } else if (user.getJob() == 4) {
+            } else if (user.getJob().equals("4")) {
                 accountVo.setWorkName("pcr检测人员");
-            } else if (user.getJob() == 5) {
+            } else if (user.getJob().equals("5")) {
                 accountVo.setWorkName("洗消点工作人员");
             }
             list.add(accountVo);

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

@@ -0,0 +1,16 @@
+<?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.BillGoodsInventoryMapper">
+
+    <select id="listAll" resultType="com.huimv.receive.entity.vo.BillGoodsInventoryVo">
+        SELECT
+    DATE(create_date) as dateTime,
+    sum(goods_nums) count
+FROM
+    `bill_goods_inventory`
+
+    ${ew.customSqlSegment}
+GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+ORDER BY DATE_FORMAT(create_date,"%Y-%m-%d") asc
+    </select>
+</mapper>

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