Browse Source

新增单元

Newspaper 1 year ago
parent
commit
6447f713cd

+ 5 - 5
huimv-admin/src/main/java/com/huimv/admin/controller/BasePigpenController.java

@@ -113,13 +113,13 @@ public class BasePigpenController {
         return basePigpenService.list(farmCode,buildName,stageCode,type);
         return basePigpenService.list(farmCode,buildName,stageCode,type);
     }
     }
 
 
-    @PostMapping( "/test")
+    @PostMapping("/test")
     public Result test(@RequestBody Map<String, Object> paramsMap) {
     public Result test(@RequestBody Map<String, Object> paramsMap) {
-        List<BasePigpen> list = basePigpenService.list(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getOther3, 1).ne(BasePigpen::getParentId, 0));
+        List<BasePigpen> list = basePigpenService.list(new QueryWrapper<BasePigpen>().lambda().gt(BasePigpen::getId, 1212).ne(BasePigpen::getParentId, 0));
         for (BasePigpen basePigpen : list) {
         for (BasePigpen basePigpen : list) {
             Integer parentId = basePigpen.getParentId();
             Integer parentId = basePigpen.getParentId();
             String buildName = basePigpenService.getById(parentId).getBuildName();
             String buildName = basePigpenService.getById(parentId).getBuildName();
-            Integer id = basePigpenService.getOne(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getBuildName, buildName).eq(BasePigpen::getOther3, 1)).getId();
+            Integer id = basePigpenService.getOne(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getBuildName, buildName).ne(BasePigpen::getId, parentId)).getId();
             basePigpen.setParentId(id);
             basePigpen.setParentId(id);
             String other2 = basePigpen.getOther2();
             String other2 = basePigpen.getOther2();
             List<String> modifiedValues = new ArrayList<>();
             List<String> modifiedValues = new ArrayList<>();
@@ -127,13 +127,13 @@ public class BasePigpenController {
             for (String s : split) {
             for (String s : split) {
                 if (!s.equals("0")){
                 if (!s.equals("0")){
                     String buildName1 = basePigpenService.getById(s).getBuildName();
                     String buildName1 = basePigpenService.getById(s).getBuildName();
-                    Integer id1 = basePigpenService.getOne(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getBuildName, buildName1).eq(BasePigpen::getOther3, 1)).getId();
+                    Integer id1 = basePigpenService.getOne(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getBuildName, buildName1).ne(BasePigpen::getId, s)).getId();
                     modifiedValues.add(id1.toString());
                     modifiedValues.add(id1.toString());
                 }else {
                 }else {
                     modifiedValues.add(s);
                     modifiedValues.add(s);
                 }
                 }
             }
             }
-            basePigpen.setOther2(String.join(",", modifiedValues));
+            basePigpen.setOther2(String.join(",", split));
             basePigpenService.updateById(basePigpen);
             basePigpenService.updateById(basePigpen);
         }
         }
         return Result.SUCCESS();
         return Result.SUCCESS();