华统小程序修改1

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

@@ -131,6 +131,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         billPcr.setBillStatus(0);
                         billPcr.setProcessId(billClean.getProcessId());
                         billPcr.setFarmId(billClean.getFarmId());
+                        billPcr.setTestLocation(baseLocation.getNextLocation());
+                        billPcr.setTestLocationId(baseLocation.getNextId());
                         pcrMapper.insert(billPcr);
                     }
                     if (baseLocation.getId() == 7 || baseLocation.getId() == 12) {
@@ -146,6 +148,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         isolate.setFarmId(billClean.getFarmId());
                         isolate.setBillStatus(0);
                         isolate.setProcessId(billClean.getProcessId());
+                        isolate.setIsolateLocation(baseLocation.getNextLocation());
+                        isolate.setIsolateLocationId(baseLocation.getNextId());
                         isolateMapper.insert(isolate);
                     }
                     baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));

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

@@ -268,21 +268,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result listPrc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
         if ("".equals(type) || null == type) {
-            type = "1";
+            type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("pcr_type", 1).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        if ("1".equals(type)) {
+        if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
-        if ("2".equals(type)) {
+        if ("1".equals(type)) {
             queryWrapper.eq("bill_status", 0);
         }
-        if ("3".equals(type)) {
+        if ("2".equals(type)) {
             queryWrapper.eq("bill_status", 1);
         }
-        if ("4".equals(type)) {
+        if ("3".equals(type)) {
             queryWrapper.in("bill_status", 2, 3);
         }
         List<BillPcr> billPcrs = pcrMapper.selectList(queryWrapper);
@@ -428,21 +428,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result listIsolate(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
         if ("".equals(type) || null == type) {
-            type = "1";
+            type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("isolate_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        if ("1".equals(type)) {
+        if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
-        if ("2".equals(type)) {
+        if ("1".equals(type)) {
             queryWrapper.eq("bill_status", 0);
         }
-        if ("3".equals(type)) {
+        if ("2".equals(type)) {
             queryWrapper.eq("bill_status",  1);
         }
-        if ("4".equals(type)) {
+        if ("3".equals(type)) {
             queryWrapper.in("bill_status", 2, 3);
         }
         return new Result(ResultCode.SUCCESS, isolateMapper.selectList(queryWrapper));
@@ -551,21 +551,21 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
     public Result listClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//类型
         if ("".equals(type) || null == type) {
-            type = "1";
+            type = "0";
         }
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("test_location_id",TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        if ("1".equals(type)) {
+        if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2);
         }
-        if ("2".equals(type)) {
+        if ("1".equals(type)) {
             queryWrapper.eq("bill_status", 0);
         }
-        if ("3".equals(type)) {
+        if ("2".equals(type)) {
             queryWrapper.eq("bill_status", 1);
         }
-        if ("4".equals(type)) {
+        if ("3".equals(type)) {
             queryWrapper.eq("bill_status", 2);
         }
         return new Result(ResultCode.SUCCESS,  cleanMapper.selectList(queryWrapper));

huimv-admin/src/main/resources/application-prod.yml

@@ -49,3 +49,13 @@ mybatis-plus:
   configuration:
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 139.9.167.178
+  user:  huimv
+  password: "!hm123@1"
+  port: 22

huimv-admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*