修改一码通总览数据相关问题

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/EquipmentCategoryDataDto.java

@@ -18,8 +18,8 @@ public class EquipmentCategoryDataDto extends BaseDto {
     /**
      * 管辖分局组织机构代码
      */
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("org_branch_code")
+    private String org_branch_code;
 
     /**
      * 单位统一信用代码

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EquipmentCategoryData.java

@@ -19,8 +19,8 @@ public class EquipmentCategoryData extends BaseEntity {
     /**
      * 管辖分局组织机构代码
      */
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("org_branch_code")
+    private String orgBranchCode;
 
     /**
      * 单位统一信用代码

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -194,7 +194,7 @@
             bjecd."unit_code" LIKE CONCAT('%',#{companyCode},'%')
         </if>
         <if test="level != 'company'">
-            bjecd."org_code" LIKE CONCAT('%',#{orgCode},'%')
+            bjecd."org_branch_code" LIKE CONCAT('%',#{orgCode},'%')
         </if>
     </select>
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -783,11 +783,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
     @Override
     public List<EquipmentCategoryData> createEquipmentCategoryData(String unitCode) {
+        equipmentCategoryDataService.remove(new QueryWrapper<>());
         List<EquipmentCategoryData> list = new ArrayList<>();
         List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCode);
         for (Map<String, Object> map : allUnitList) {
             EquipmentCategoryData equipmentCategoryData = new EquipmentCategoryData();
-            equipmentCategoryData.setOrgCode(map.get("supervise_org_code").toString());
+            equipmentCategoryData.setOrgBranchCode(map.get("supervise_org_code").toString());
             equipmentCategoryData.setUnitCode(map.get("use_code").toString());
             List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount("company", null, map.get("use_code").toString());
             for (Map<String, Object> dataMap : listMap) {
@@ -823,9 +824,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                         break;
                 }
             }
-            boolean b = equipmentCategoryDataService.saveOrUpdate(equipmentCategoryData,
-                    new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
-            if (b) {
+            EquipmentCategoryData categoryData = equipmentCategoryDataMapper.selectOne(new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
+            int res = 0;
+            if (ObjectUtils.isEmpty(categoryData)) {
+                res = equipmentCategoryDataMapper.insert(equipmentCategoryData);
+            } else {
+                res = equipmentCategoryDataMapper.update(equipmentCategoryData,
+                        new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
+            }
+            if (0 != res) {
                 list.add(equipmentCategoryData);
             }
         }