Browse Source

新增单元

Newspaper 1 year ago
parent
commit
18dd49c8fd

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

@@ -49,10 +49,7 @@ public class BasePigpenController {
         String stageCode = map.get("stageCode");
         BasePigpen parent = basePigpenService.getById(parentId);
         String parentIds = parent.getOther2() + "," + parentId;
-        int maxBuildNum = 0;
-        if (ObjectUtil.isNotEmpty(basePigpenMapper.getMaxBuildNum(parentId))) {
-            maxBuildNum = basePigpenMapper.getMaxBuildNum(parentId);
-        }
+        int maxBuildNum = basePigpenMapper.getMaxBuildNum(parentId);
         List<BasePigpen> basePigpenList = new ArrayList<>();
         for (int i = 1; i <= buildNum; i++) {
             int num = maxBuildNum+i;
@@ -62,7 +59,7 @@ public class BasePigpenController {
             basePigpen.setFType(3);
             basePigpen.setStageCode(Integer.valueOf(stageCode));
             basePigpen.setFarmId(Integer.valueOf(farmId));
-            basePigpen.setOther1(String.valueOf(num));
+            basePigpen.setOther4(num);
             basePigpen.setOther2(parentIds);
             basePigpenList.add(basePigpen);
         }

+ 2 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BasePigpen.java

@@ -55,5 +55,7 @@ public class BasePigpen implements TransPojo {
 
     private String other3;
 
+    private Integer other4;
+
 
 }

+ 1 - 1
huimv-admin/src/main/resources/com/huimv/admin/mapper/BasePigpenMapper.xml

@@ -15,7 +15,7 @@
         <result column="other3" property="other3" />
     </resultMap>
     <select id="getMaxBuildNum" resultType="java.lang.Integer">
-        SELECT COALESCE(MAX(other1),0) FROM `base_pigpen` WHERE parent_id = #{parentId}
+        SELECT COALESCE(MAX(other4),0) FROM `base_pigpen` WHERE parent_id = #{parentId}
     </select>
 
 </mapper>