举报信息管理调整接口

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_fire_label_attribute");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_enforce_report_label_attribute");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportComplaintController.java

@@ -110,5 +110,30 @@ public class DemEnforceReportComplaintController {
         return ApiResult.success(demEnforceReportLabelService.enforceReportLabelSelect(fid));
     }
 
+    /**
+     * 举报信息管理-标签操作异常抛出
+     *
+     * @param demEnforceReportLabel
+     * @return
+     */
+    @PostMapping("abnormalData")
+    public ApiResult<Void> abnormalData(@RequestBody DemEnforceReportLabel demEnforceReportLabel) {
+        demEnforceReportComplaintService.abnormalData(demEnforceReportLabel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签删除
+     *
+     * @param id 主键ID
+     * @return
+     */
+    @Log(title = "标签-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceReportLabel")
+    public ApiResult<Void> delDemFireStatistics(@RequestParam(value = "id") Integer id) {
+        demEnforceReportComplaintService.delEnforceReportLabel(id);
+        return ApiResult.success();
+    }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemEnforceReportComplaint.java

@@ -297,14 +297,29 @@ public class DemEnforceReportComplaint implements Serializable {
     private Integer enable;
 
     /**
-     * 标签ID
+     * 分类ID1
      */
-    private Integer labelId;
+    private Integer typeId1;
 
     /**
-     * 分类IDo
+     * 分类ID2
      */
-    private Integer typeId;
+    private Integer typeId2;
+
+    /**
+     * 分类ID3
+     */
+    private Integer typeId3;
+
+    /**
+     * 分类ID4
+     */
+    private Integer typeId4;
+
+    /**
+     * 分类ID5
+     */
+    private Integer typeId5;
 
     @TableField(exist = false)
     private Integer id1;

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemEnforceReportLabel.java

@@ -65,4 +65,10 @@ public class DemEnforceReportLabel implements Serializable {
      */
     @TableField(exist = false)
     private List<DemEnforceReportLabel> subset;
+
+    /**
+     * 属性
+     */
+    @TableField(exist = false)
+    private String attribute;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemEnforceReportComplaintService.java

@@ -54,4 +54,18 @@ public interface DemEnforceReportComplaintService extends CrudService<DemEnforce
      * @param id 主键ID
      */
     void delEnforceReportComplaint(Integer id);
+
+    /**
+     * 举报信息管理-操作异常
+     *
+     * @param demEnforceReportLabel
+     */
+    void abnormalData(DemEnforceReportLabel demEnforceReportLabel);
+
+    /**
+     * 举报信息管理-标签-删除
+     *
+     * @param id 主键ID
+     */
+    void delEnforceReportLabel(Integer id);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireLabelAttributeService.java

@@ -1,14 +1,13 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.DemFireLabelAttribute;
 import com.usky.common.mybatis.core.CrudService;
-import com.usky.fire.domain.DemLawSituation;
+import com.usky.fire.domain.DemFireLabelAttribute;
 
 import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author JCB
@@ -21,5 +20,12 @@ public interface DemFireLabelAttributeService extends CrudService<DemFireLabelAt
      *
      * @return
      */
-    List<DemFireLabelAttribute> freLabelAttributeList();
+    List<DemFireLabelAttribute> freLabelAttributeList(Integer labelId);
+
+    /**
+     * 标签属性-删除
+     *
+     * @param id 主键ID
+     */
+    void delDemFireLabelAttribute(Integer id);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceReportComplaintServiceImpl.java

@@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemEnforceReportAttach;
 import com.usky.fire.domain.DemEnforceReportComplaint;
 import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.fire.domain.DemEnforceReportLabelAttribute;
 import com.usky.fire.mapper.DemEnforceReportComplaintMapper;
 import com.usky.fire.service.DemEnforceReportAttachService;
 import com.usky.fire.service.DemEnforceReportComplaintService;
+import com.usky.fire.service.DemEnforceReportLabelAttributeService;
 import com.usky.fire.service.DemEnforceReportLabelService;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.ParameterVo;
@@ -43,6 +46,12 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
     @Autowired
     private DemEnforceReportLabelService demEnforceReportLabelService;
 
+    @Autowired
+    private DemEnforceReportLabelAttributeService demEnforceReportLabelAttributeService;
+
+    @Autowired
+    private DemEnforceReportLabelServiceImpl demEnforceReportLabelServiceImpl;
+
     @Override
     public CommonPage<Object> enforceReportComplaintList(String serialNumber, String reportPhone, Integer id, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
@@ -54,8 +63,9 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                 DemEnforceReportComplaint::getReportMethod, DemEnforceReportComplaint::getReportRecord, DemEnforceReportComplaint::getReportSource,
                 DemEnforceReportComplaint::getReportAddress, DemEnforceReportComplaint::getReportContent, DemEnforceReportComplaint::getReportTime,
                 DemEnforceReportComplaint::getAcceptTime, DemEnforceReportComplaint::getWorkOrderType, DemEnforceReportComplaint::getGovernCompany,
-                DemEnforceReportComplaint::getGovernArea, DemEnforceReportComplaint::getFactFind, DemEnforceReportComplaint::getSatisfiedType,
-                DemEnforceReportComplaint::getLabelId)
+                DemEnforceReportComplaint::getGovernArea, DemEnforceReportComplaint::getFactFind, DemEnforceReportComplaint::getTypeId1,
+                DemEnforceReportComplaint::getTypeId2, DemEnforceReportComplaint::getTypeId3, DemEnforceReportComplaint::getTypeId4,
+                DemEnforceReportComplaint::getTypeId5)
                 .eq(DemEnforceReportComplaint::getEnable, 0)
                 .like(StringUtils.isNotBlank(serialNumber), DemEnforceReportComplaint::getSerialNumber, serialNumber)
                 .like(StringUtils.isNotBlank(reportPhone), DemEnforceReportComplaint::getRepeatReport, reportPhone)
@@ -73,8 +83,7 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                     .in(DemEnforceReportAttach::getReportId, reportIdList);
             page1 = demEnforceReportAttachService.page(page1, queryWrapper1);
             LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper2 = Wrappers.lambdaQuery();
-            queryWrapper2.select(DemEnforceReportLabel::getId, DemEnforceReportLabel::getLabelName)
-                    .eq(DemEnforceReportLabel::getFid, 0);
+            queryWrapper2.select(DemEnforceReportLabel::getId, DemEnforceReportLabel::getLabelName);
             List<DemEnforceReportLabel> list1 = demEnforceReportLabelService.list(queryWrapper2);
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
@@ -95,7 +104,16 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                 map.put("governArea", page.getRecords().get(i).getGovernArea());
                 map.put("factFind", page.getRecords().get(i).getFactFind());
                 map.put("satisfiedType", page.getRecords().get(i).getSatisfiedType());
-                map.put("labelId", page.getRecords().get(i).getLabelId());
+                map.put("typeId1", page.getRecords().get(i).getTypeId1());
+                map.put("typeId2", page.getRecords().get(i).getTypeId2());
+                map.put("typeId3", page.getRecords().get(i).getTypeId3());
+                map.put("typeId4", page.getRecords().get(i).getTypeId4());
+                map.put("typeId5", page.getRecords().get(i).getTypeId5());
+                map.put("typeName1", null);
+                map.put("typeName2", null);
+                map.put("typeName3", null);
+                map.put("typeName4", null);
+                map.put("typeName5", null);
                 map.put("id1", null);
                 map.put("completeTime", null);
                 map.put("followUpStatus", null);
@@ -109,8 +127,20 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                     }
                 }
                 for (int j = 0; j < list1.size(); j++) {
-                    if ((int) page.getRecords().get(i).getLabelId() == (int) list1.get(j).getId()) {
-                        map.put("labelName", list1.get(j).getLabelName());
+                    if (page.getRecords().get(i).getTypeId1() != null && (int) page.getRecords().get(i).getTypeId1() == (int) list1.get(j).getId()) {
+                        map.put("typeName1", list1.get(j).getLabelName());
+                    }
+                    if (page.getRecords().get(i).getTypeId2() != null && (int) page.getRecords().get(i).getTypeId2() == (int) list1.get(j).getId()) {
+                        map.put("typeName2", list1.get(j).getLabelName());
+                    }
+                    if (page.getRecords().get(i).getTypeId3() != null && (int) page.getRecords().get(i).getTypeId3() == (int) list1.get(j).getId()) {
+                        map.put("typeName3", list1.get(j).getLabelName());
+                    }
+                    if (page.getRecords().get(i).getTypeId4() != null && (int) page.getRecords().get(i).getTypeId4() == (int) list1.get(j).getId()) {
+                        map.put("typeName4", list1.get(j).getLabelName());
+                    }
+                    if (page.getRecords().get(i).getTypeId5() != null && (int) page.getRecords().get(i).getTypeId5() == (int) list1.get(j).getId()) {
+                        map.put("typeName5", list1.get(j).getLabelName());
                     }
                 }
                 list.add(map);
@@ -123,7 +153,28 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
     @Override
     public void addLabel(DemEnforceReportLabel demEnforceReportLabel) {
         if (demEnforceReportLabel.getId() == 0) {
+            LambdaQueryWrapper<DemEnforceReportLabelAttribute> queryWrapper = Wrappers.lambdaQuery();
+            List<DemEnforceReportLabelAttribute> list = demEnforceReportLabelAttributeService.list(queryWrapper);
+            String typeAttribute = "typeName1";
+            if (list.size() > 1) {
+                List<String> typeIdList1 = new ArrayList<>();
+                typeIdList1.add("typeName1");
+                typeIdList1.add("typeName2");
+                typeIdList1.add("typeName3");
+                typeIdList1.add("typeName4");
+                typeIdList1.add("typeName5");
+                List<String> typeIdList2 = new ArrayList<>();
+                for (int i = 0; i < list.size(); i++) {
+                    typeIdList2.add(list.get(i).getAttribute());
+                }
+                List<String> typeIdList = OnlineMethod.subList2(typeIdList1, typeIdList2);
+                typeAttribute = typeIdList.get(0);
+            }
             demEnforceReportLabelService.addEnforceReportLabel(demEnforceReportLabel);
+            DemEnforceReportLabelAttribute demEnforceReportLabelAttribute = new DemEnforceReportLabelAttribute();
+            demEnforceReportLabelAttribute.setLabelId(demEnforceReportLabel.getId());
+            demEnforceReportLabelAttribute.setAttribute(typeAttribute);
+            demEnforceReportLabelAttributeService.save(demEnforceReportLabelAttribute);
         } else {
             demEnforceReportLabelService.updateEnforceReportLabel(demEnforceReportLabel);
         }
@@ -176,11 +227,29 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
     @Transactional
     @Override
     public void bindLabel(ParameterVo parameterVo) {
+        LambdaQueryWrapper<DemEnforceReportLabelAttribute> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemEnforceReportLabelAttribute::getLabelId, parameterVo.getLabelId());
+        List<DemEnforceReportLabelAttribute> list = demEnforceReportLabelAttributeService.list(queryWrapper);
         for (int i = 0; i < parameterVo.getIdList().size(); i++) {
             DemEnforceReportComplaint demEnforceReportComplaint = new DemEnforceReportComplaint();
             demEnforceReportComplaint.setId(parameterVo.getIdList().get(i));
-            demEnforceReportComplaint.setLabelId(parameterVo.getLabelId());
-//            demEnforceReportComplaint.setTypeId(parameterVo.getClassifyId());
+            switch (list.get(0).getAttribute()) {
+                case "typeName1":
+                    demEnforceReportComplaint.setTypeId1(parameterVo.getTypeId());
+                    break;
+                case "typeName2":
+                    demEnforceReportComplaint.setTypeId2(parameterVo.getTypeId());
+                    break;
+                case "typeName3":
+                    demEnforceReportComplaint.setTypeId3(parameterVo.getTypeId());
+                    break;
+                case "typeName4":
+                    demEnforceReportComplaint.setTypeId4(parameterVo.getTypeId());
+                    break;
+                case "typeName5":
+                    demEnforceReportComplaint.setTypeId5(parameterVo.getTypeId());
+                    break;
+            }
             this.updateById(demEnforceReportComplaint);
         }
     }
@@ -204,5 +273,54 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
         this.updateById(demEnforceReportComplaint);
     }
 
+    @Override
+    public void abnormalData(DemEnforceReportLabel demEnforceReportLabel) {
+        List<Integer> typeIdList = new ArrayList<>();
+        if (demEnforceReportLabel.getId() != null && demEnforceReportLabel.getId() != 0) {
+            LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(DemEnforceReportLabel::getFid, demEnforceReportLabel.getId());
+            List<DemEnforceReportLabel> list1 = demEnforceReportLabelService.list(queryWrapper1);
+            for (int i = 0; i < list1.size(); i++) {
+                typeIdList.add(list1.get(i).getId());
+            }
+        } else {
+            LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper2 = Wrappers.lambdaQuery();
+            queryWrapper2.eq(DemEnforceReportLabel::getLabelName, demEnforceReportLabel.getLabelName())
+                    .eq(DemEnforceReportLabel::getFid, demEnforceReportLabel.getFid());
+            List<DemEnforceReportLabel> list2 = demEnforceReportLabelService.list(queryWrapper2);
+            for (int i = 0; i < list2.size(); i++) {
+                typeIdList.add(list2.get(i).getId());
+            }
+        }
+        if (CollectionUtils.isNotEmpty(typeIdList)) {
+            LambdaQueryWrapper<DemEnforceReportComplaint> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(DemEnforceReportComplaint::getTypeId1, typeIdList)
+                    .or()
+                    .in(DemEnforceReportComplaint::getTypeId2, typeIdList)
+                    .or()
+                    .in(DemEnforceReportComplaint::getTypeId3, typeIdList)
+                    .or()
+                    .in(DemEnforceReportComplaint::getTypeId4, typeIdList)
+                    .or()
+                    .in(DemEnforceReportComplaint::getTypeId5, typeIdList);
+            List<DemEnforceReportComplaint> list = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(list)) {
+                throw new BusinessException("标签/分类绑定中，不可删除");
+            }
+        }
+    }
+
+    @Override
+    public void delEnforceReportLabel(Integer id) {
+        DemEnforceReportLabel demEnforceReportLabel = new DemEnforceReportLabel();
+        demEnforceReportLabel.setId(id);
+        this.abnormalData(demEnforceReportLabel);
+        demEnforceReportLabelServiceImpl.removeById(id);
+        List<DemEnforceReportLabelAttribute> list = demEnforceReportLabelAttributeService.enforceReportLabelAttributeList(id);
+        if (CollectionUtils.isNotEmpty(list)) {
+            demEnforceReportLabelAttributeService.delEnforceReportLabelAttribute(list.get(0).getId());
+        }
+    }
+
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceReportLabelServiceImpl.java

@@ -1,16 +1,21 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.ServletUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.fire.domain.DemEnforceReportLabelAttribute;
 import com.usky.fire.domain.DemFileLabel;
+import com.usky.fire.domain.DemFireLabelAttribute;
 import com.usky.fire.mapper.DemEnforceReportLabelMapper;
+import com.usky.fire.service.DemEnforceReportLabelAttributeService;
 import com.usky.fire.service.DemEnforceReportLabelService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -27,6 +32,9 @@ import java.util.List;
 @Service
 public class DemEnforceReportLabelServiceImpl extends AbstractCrudService<DemEnforceReportLabelMapper, DemEnforceReportLabel> implements DemEnforceReportLabelService {
 
+    @Autowired
+    private DemEnforceReportLabelAttributeService demEnforceReportLabelAttributeService;
+
     @Override
     public List<DemEnforceReportLabel> enforceReportLabelSelect(Integer fid){
         LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper = Wrappers.lambdaQuery();
@@ -34,6 +42,14 @@ public class DemEnforceReportLabelServiceImpl extends AbstractCrudService<DemEnf
                 .eq(fid!=null,DemEnforceReportLabel::getFid,fid)
                 .orderByDesc(DemEnforceReportLabel::getId);
         List<DemEnforceReportLabel> list = this.list(queryWrapper);
+        List<DemEnforceReportLabelAttribute> list1 = demEnforceReportLabelAttributeService.enforceReportLabelAttributeList(null);
+        for (int i = 0; i < list.size(); i++) {
+            for (int j = 0; j < list1.size(); j++) {
+                if (list.get(i).getId() == list1.get(j).getLabelId()) {
+                    list.get(i).setAttribute(list1.get(j).getAttribute());
+                }
+            }
+        }
         return list;
     }
 
@@ -70,5 +86,4 @@ public class DemEnforceReportLabelServiceImpl extends AbstractCrudService<DemEnf
     public void delEnforceReportLabel(Integer id){
         this.removeById(id);
     }
-
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFileLabelServiceImpl.java

@@ -41,7 +41,7 @@ public class DemFileLabelServiceImpl extends AbstractCrudService<DemFileLabelMap
                 .like(StringUtils.isNotBlank(labelName), DemFileLabel::getLabelName, labelName)
                 .orderByDesc(DemFileLabel::getId);
         List<DemFileLabel> list = this.list(queryWrapper);
-        List<DemFireLabelAttribute> demFireLabelAttributes = demFireLabelAttributeService.freLabelAttributeList();
+        List<DemFireLabelAttribute> demFireLabelAttributes = demFireLabelAttributeService.freLabelAttributeList(null);
         for (int i = 0; i < list.size(); i++) {
             for (int j = 0; j < demFireLabelAttributes.size(); j++) {
                 if (list.get(i).getId() == demFireLabelAttributes.get(j).getLabelId()) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireLabelAttributeServiceImpl.java

@@ -1,17 +1,18 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemFireLabelAttribute;
-import com.usky.fire.domain.DemLawSituation;
 import com.usky.fire.mapper.DemFireLabelAttributeMapper;
 import com.usky.fire.service.DemFireLabelAttributeService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author JCB
@@ -21,8 +22,15 @@ import java.util.List;
 public class DemFireLabelAttributeServiceImpl extends AbstractCrudService<DemFireLabelAttributeMapper, DemFireLabelAttribute> implements DemFireLabelAttributeService {
 
     @Override
-    public List<DemFireLabelAttribute> freLabelAttributeList() {
-        List<DemFireLabelAttribute> list = this.list();
+    public List<DemFireLabelAttribute> freLabelAttributeList(Integer labelId) {
+        LambdaQueryWrapper<DemFireLabelAttribute> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(labelId != null && labelId != 0, DemFireLabelAttribute::getLabelId, labelId);
+        List<DemFireLabelAttribute> list = this.list(queryWrapper);
         return list;
     }
+
+    @Override
+    public void delDemFireLabelAttribute(Integer id){
+        this.removeById(id);
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -149,19 +149,19 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                     }
                 }
                 for (int j = 0; j < demFileLabels.size(); j++) {
-                    if (page.getRecords().get(i).getTypeId1() == demFileLabels.get(j).getId()) {
+                    if (page.getRecords().get(i).getTypeId1() != null && page.getRecords().get(i).getTypeId1() == demFileLabels.get(j).getId()) {
                         map.put("typeName1", demFileLabels.get(j).getLabelName());
                     }
-                    if (page.getRecords().get(i).getTypeId2() == demFileLabels.get(j).getId()) {
+                    if (page.getRecords().get(i).getTypeId2() != null && page.getRecords().get(i).getTypeId2() == demFileLabels.get(j).getId()) {
                         map.put("typeName2", demFileLabels.get(j).getLabelName());
                     }
-                    if (page.getRecords().get(i).getTypeId3() == demFileLabels.get(j).getId()) {
+                    if (page.getRecords().get(i).getTypeId3() != null && page.getRecords().get(i).getTypeId3() == demFileLabels.get(j).getId()) {
                         map.put("typeName3", demFileLabels.get(j).getLabelName());
                     }
-                    if (page.getRecords().get(i).getTypeId4() == demFileLabels.get(j).getId()) {
+                    if (page.getRecords().get(i).getTypeId4() != null && page.getRecords().get(i).getTypeId4() == demFileLabels.get(j).getId()) {
                         map.put("typeName4", demFileLabels.get(j).getLabelName());
                     }
-                    if (page.getRecords().get(i).getTypeId4() == demFileLabels.get(j).getId()) {
+                    if (page.getRecords().get(i).getTypeId5() != null && page.getRecords().get(i).getTypeId4() == demFileLabels.get(j).getId()) {
                         map.put("typeName5", demFileLabels.get(j).getLabelName());
                     }
                 }
@@ -390,7 +390,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 typeIdList.add(list2.get(i).getId());
             }
         }
-        if (CollectionUtils.isNotEmpty(typeIdList)){
+        if (CollectionUtils.isNotEmpty(typeIdList)) {
             LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.in(DemFireStatistics::getTypeId1, typeIdList)
                     .or()
@@ -402,7 +402,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                     .or()
                     .in(DemFireStatistics::getTypeId5, typeIdList);
             List<DemFireStatistics> list = this.list(queryWrapper);
-            if (CollectionUtils.isNotEmpty(list)){
+            if (CollectionUtils.isNotEmpty(list)) {
                 throw new BusinessException("标签/分类绑定中，不可删除");
             }
         }
@@ -415,5 +415,9 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         demFileLabel.setId(id);
         this.abnormalData(demFileLabel);
         demFileLabelService.removeById(id);
+        List<DemFireLabelAttribute> list = demFireLabelAttributeService.freLabelAttributeList(id);
+        if (CollectionUtils.isNotEmpty(list)) {
+            demFireLabelAttributeService.delDemFireLabelAttribute(list.get(0).getId());
+        }
     }
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceReportComplaintMapper.xml

@@ -58,8 +58,11 @@
         <result column="leader_instruct" property="leaderInstruct" />
         <result column="remark" property="remark" />
         <result column="enable" property="enable" />
-        <result column="label_id" property="labelId" />
-        <result column="type_id" property="typeId" />
+        <result column="type_id1" property="typeId1" />
+        <result column="type_id2" property="typeId2" />
+        <result column="type_id3" property="typeId3" />
+        <result column="type_id4" property="typeId4" />
+        <result column="type_id5" property="typeId5" />
     </resultMap>
 
 </mapper>