举报信息管理相关接口开发

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_enforce_report_complaint");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_enforce_report_label");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -1,9 +1,19 @@
 package com.usky.fire.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemEnforceReportComplaint;
+import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.fire.service.DemEnforceReportComplaintService;
+import com.usky.fire.service.DemEnforceReportLabelService;
+import com.usky.fire.service.vo.ParameterVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +23,92 @@ import org.springframework.stereotype.Controller;
  * @author JCB
  * @since 2022-09-23
  */
-@Controller
+@RestController
 @RequestMapping("/demEnforceReportComplaint")
 public class DemEnforceReportComplaintController {
 
+    @Autowired
+    private DemEnforceReportComplaintService demEnforceReportComplaintService;
+
+    @Autowired
+    private DemEnforceReportLabelService demEnforceReportLabelService;
+
+    /**
+     * 举报信息管理-列表查询
+     *
+     * @param serialNumber 流水号
+     * @param reportPhone  举报电话
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("enforceReportComplaintList")
+    public ApiResult<CommonPage<Object>> enforceReportComplaintList(@RequestParam(value = "serialNumber", required = false) String serialNumber,
+                                                                    @RequestParam(value = "reportPhone", required = false, defaultValue = "0") String reportPhone,
+                                                                    @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                    @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                    @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demEnforceReportComplaintService.enforceReportComplaintList(serialNumber, reportPhone, id, pageNum, pageSize));
+    }
+
+    /**
+     * 举报信息管理-标签添加
+     *
+     * @param demEnforceReportLabel
+     */
+    @Log(title = "举报信息管理-添加标签", businessType = BusinessType.INSERT)
+    @PostMapping("addLabel")
+    public ApiResult<Void> addLabel(@RequestBody DemEnforceReportLabel demEnforceReportLabel) {
+        demEnforceReportComplaintService.addLabel(demEnforceReportLabel);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签绑定
+     *
+     * @param parameterVo
+     */
+    @Log(title = "举报信息管理-绑定标签", businessType = BusinessType.UPDATE)
+    @PutMapping("bindLabel")
+    public ApiResult<Void> bindLabel(@RequestBody ParameterVo parameterVo) {
+        demEnforceReportComplaintService.bindLabel(parameterVo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-修改
+     *
+     * @param demEnforceReportComplaint
+     */
+    @Log(title = "举报信息管理-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateEnforceReportComplaint")
+    public ApiResult<Void> updateEnforceReportComplaint(@RequestBody DemEnforceReportComplaint demEnforceReportComplaint) {
+        demEnforceReportComplaintService.updateEnforceReportComplaint(demEnforceReportComplaint);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-删除
+     *
+     * @param id 主键ID
+     */
+    @Log(title = "举报信息管理-删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("delEnforceReportComplaint")
+    public ApiResult<Void> delEnforceReportComplaint(@RequestParam(value = "id") Integer id) {
+        demEnforceReportComplaintService.delEnforceReportComplaint(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 举报信息管理-标签分类下拉框
+     *
+     * @param fid 父级ID
+     * @return
+     */
+    @GetMapping("enforceReportLabelSelect")
+    public ApiResult<List<DemEnforceReportLabel>> enforceReportLabelSelect(@RequestParam(value = "fid", required = false, defaultValue = "0") Integer fid) {
+        return ApiResult.success(demEnforceReportLabelService.enforceReportLabelSelect(fid));
+    }
+
 }
 

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

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+@Controller
+@RequestMapping("/demEnforceReportLabel")
+public class DemEnforceReportLabelController {
+
+}
+

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

@@ -1,9 +1,13 @@
 package com.usky.fire.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -292,5 +296,31 @@ public class DemEnforceReportComplaint implements Serializable {
      */
     private Integer enable;
 
+    /**
+     * 标签ID
+     */
+    private Integer labelId;
+
+    /**
+     * 分类IDo
+     */
+    private Integer typeId;
+
+    @TableField(exist = false)
+    private Integer id1;
+
+    /**
+     * 办结时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime completeTime;
+
+    /**
+     * 回访状态;0:未回访  1:已回访
+     */
+    @TableField(exist = false)
+    private Integer followUpStatus;
+
+
 
 }

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

@@ -0,0 +1,68 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemEnforceReportLabel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父ID
+     */
+    private Integer fid;
+
+    /**
+     * 标签名称
+     */
+    private String labelName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 子集
+     */
+    @TableField(exist = false)
+    private List<DemEnforceReportLabel> subset;
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemEnforceReportLabelMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+public interface DemEnforceReportLabelMapper extends CrudMapper<DemEnforceReportLabel> {
+
+}

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

@@ -1,7 +1,10 @@
 package com.usky.fire.service;
 
-import com.usky.fire.domain.DemEnforceReportComplaint;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemEnforceReportComplaint;
+import com.usky.fire.domain.DemEnforceReportLabel;
+import com.usky.fire.service.vo.ParameterVo;
 
 /**
  * <p>
@@ -13,4 +16,42 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface DemEnforceReportComplaintService extends CrudService<DemEnforceReportComplaint> {
 
+    /**
+     * 举报信息管理-列表查询
+     *
+     * @param serialNumber 流水号
+     * @param reportPhone  举报电话
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<Object> enforceReportComplaintList(String serialNumber, String reportPhone, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 举报信息管理-标签添加
+     *
+     * @param demEnforceReportLabel
+     */
+    void addLabel(DemEnforceReportLabel demEnforceReportLabel);
+
+    /**
+     * 举报信息管理-标签绑定
+     *
+     * @param parameterVo
+     */
+    void bindLabel(ParameterVo parameterVo);
+
+    /**
+     * 举报信息管理-修改
+     *
+     * @param demEnforceReportComplaint
+     */
+    void updateEnforceReportComplaint(DemEnforceReportComplaint demEnforceReportComplaint);
+
+    /**
+     * 举报信息管理-删除
+     *
+     * @param id 主键ID
+     */
+    void delEnforceReportComplaint(Integer id);
 }

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

@@ -0,0 +1,45 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemEnforceReportLabel;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+public interface DemEnforceReportLabelService extends CrudService<DemEnforceReportLabel> {
+
+    /**
+     * 标签下拉框查询
+     *
+     * @param fid 父级ID
+     * @return
+     */
+    List<DemEnforceReportLabel> enforceReportLabelSelect(Integer fid);
+
+    /**
+     * 标签新增
+     *
+     * @param demEnforceReportLabel
+     */
+    void addEnforceReportLabel(DemEnforceReportLabel demEnforceReportLabel);
+
+    /**
+     * 标签修改
+     *
+     * @param demEnforceReportLabel
+     */
+    void updateEnforceReportLabel(DemEnforceReportLabel demEnforceReportLabel);
+
+    /**
+     * 标签删除
+     * @param id
+     */
+    void delEnforceReportLabel(Integer id);
+}

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

@@ -6,17 +6,25 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 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.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.mapper.DemEnforceReportComplaintMapper;
 import com.usky.fire.service.DemEnforceReportAttachService;
 import com.usky.fire.service.DemEnforceReportComplaintService;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.DemEnforceReportLabelService;
+import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.ParameterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,27 +40,169 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
     @Autowired
     private DemEnforceReportAttachService demEnforceReportAttachService;
 
-    public void enforceReportComplaintList(String serialNumber, String reportPhone, Integer pageNum, Integer pageSize){
+    @Autowired
+    private DemEnforceReportLabelService demEnforceReportLabelService;
+
+    @Override
+    public CommonPage<Object> enforceReportComplaintList(String serialNumber, String reportPhone, Integer id, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
         IPage<DemEnforceReportComplaint> page = new Page<>(pageNum, pageSize);
         IPage<DemEnforceReportAttach> page1 = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemEnforceReportComplaint> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select()
-                .eq(DemEnforceReportComplaint::getEnable,0)
-                .like(StringUtils.isNotBlank(serialNumber),DemEnforceReportComplaint::getSerialNumber,serialNumber)
-                .like(StringUtils.isNotBlank(reportPhone),DemEnforceReportComplaint::getRepeatReport,reportPhone)
+        queryWrapper.select(DemEnforceReportComplaint::getId, DemEnforceReportComplaint::getReportId, DemEnforceReportComplaint::getSerialNumber,
+                DemEnforceReportComplaint::getReportPhone, DemEnforceReportComplaint::getReportPerson, DemEnforceReportComplaint::getWorkOrderStatus,
+                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)
+                .eq(DemEnforceReportComplaint::getEnable, 0)
+                .like(StringUtils.isNotBlank(serialNumber), DemEnforceReportComplaint::getSerialNumber, serialNumber)
+                .like(StringUtils.isNotBlank(reportPhone), DemEnforceReportComplaint::getRepeatReport, reportPhone)
+                .eq(id != 0 & id != null, DemEnforceReportComplaint::getId, id)
                 .orderByDesc(DemEnforceReportComplaint::getId);
         page = this.page(page, queryWrapper);
-        if (CollectionUtils.isNotEmpty(page.getRecords())){
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
             List<String> reportIdList = new ArrayList<>();
             for (int i = 0; i < page.getRecords().size(); i++) {
                 reportIdList.add(page.getRecords().get(i).getReportId());
             }
             LambdaQueryWrapper<DemEnforceReportAttach> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.select()
-                    .in(DemEnforceReportAttach::getReportId,reportIdList);
-            page1=demEnforceReportAttachService.page(page1, queryWrapper1);
+            queryWrapper1.select(DemEnforceReportAttach::getId, DemEnforceReportAttach::getReportId,
+                    DemEnforceReportAttach::getCompleteTime, DemEnforceReportAttach::getFollowUpStatus)
+                    .in(DemEnforceReportAttach::getReportId, reportIdList);
+            page1 = demEnforceReportAttachService.page(page1, queryWrapper1);
+            LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper2 = Wrappers.lambdaQuery();
+            queryWrapper2.select(DemEnforceReportLabel::getId, DemEnforceReportLabel::getLabelName)
+                    .eq(DemEnforceReportLabel::getFid, 0);
+            List<DemEnforceReportLabel> list1 = demEnforceReportLabelService.list(queryWrapper2);
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", page.getRecords().get(i).getId());
+                map.put("serialNumber", page.getRecords().get(i).getSerialNumber());
+                map.put("reportPhone", page.getRecords().get(i).getReportPhone());
+                map.put("reportPerson", page.getRecords().get(i).getReportPerson());
+                map.put("workOrderStatus", page.getRecords().get(i).getWorkOrderStatus());
+                map.put("reportMethod", page.getRecords().get(i).getReportMethod());
+                map.put("reportRecord", page.getRecords().get(i).getReportRecord());
+                map.put("reportSource", page.getRecords().get(i).getReportSource());
+                map.put("reportAddress", page.getRecords().get(i).getReportAddress());
+                map.put("reportContent", page.getRecords().get(i).getReportContent());
+                map.put("reportTime", page.getRecords().get(i).getReportTime());
+                map.put("acceptTime", page.getRecords().get(i).getAcceptTime());
+                map.put("workOrderType", page.getRecords().get(i).getWorkOrderType());
+                map.put("governCompany", page.getRecords().get(i).getGovernCompany());
+                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("id1", null);
+                map.put("completeTime", null);
+                map.put("followUpStatus", null);
+                map.put("labelName", null);
+                for (int j = 0; j < page1.getRecords().size(); j++) {
+                    if (page.getRecords().get(i).getReportId().equals(page1.getRecords().get(j).getReportId())) {
+                        map.put("id1", page1.getRecords().get(j).getId());
+                        map.put("completeTime", page1.getRecords().get(j).getCompleteTime());
+                        map.put("followUpStatus", page1.getRecords().get(j).getFollowUpStatus());
+
+                    }
+                }
+                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());
+                    }
+                }
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Transactional
+    @Override
+    public void addLabel(DemEnforceReportLabel demEnforceReportLabel) {
+        if (demEnforceReportLabel.getId() == 0) {
+            demEnforceReportLabelService.addEnforceReportLabel(demEnforceReportLabel);
+        } else {
+            demEnforceReportLabelService.updateEnforceReportLabel(demEnforceReportLabel);
+        }
+        int fid = demEnforceReportLabel.getId();
+        List<DemEnforceReportLabel> demEnforceReportLabel1 = demEnforceReportLabel.getSubset();
+        if (CollectionUtils.isNotEmpty(demEnforceReportLabel1)) {
+            List<DemEnforceReportLabel> demEnforceReportLabel2 = new ArrayList<>();
+            List<DemEnforceReportLabel> demEnforceReportLabel3 = new ArrayList<>();
+            List<String> idList1 = new ArrayList<>();
+            List<String> idList2 = new ArrayList<>();
+            for (int i = 0; i < demEnforceReportLabel1.size(); i++) {
+                if (demEnforceReportLabel1.get(i).getId() == 0) {
+                    demEnforceReportLabel2.add(demEnforceReportLabel1.get(i));
+                } else {
+                    demEnforceReportLabel3.add(demEnforceReportLabel1.get(i));
+                    idList1.add(demEnforceReportLabel1.get(i).getId() + "");
+                }
+            }
+            List<DemEnforceReportLabel> demLabels = demEnforceReportLabelService.enforceReportLabelSelect(fid);
+            if (CollectionUtils.isNotEmpty(demLabels)) {
+                for (int i = 0; i < demLabels.size(); i++) {
+                    idList2.add(demLabels.get(i).getId() + "");
+                }
+            }
+            //删除
+            List<String> idlist = OnlineMethod.subList2(idList2, idList1);
+            if (CollectionUtils.isNotEmpty(idlist)) {
+                for (int i = 0; i < idlist.size(); i++) {
+                    demEnforceReportLabelService.delEnforceReportLabel(Integer.parseInt(idlist.get(i)));
+                }
+            }
+
+            //修改
+            if (CollectionUtils.isNotEmpty(demEnforceReportLabel3)) {
+                for (int i = 0; i < demEnforceReportLabel3.size(); i++) {
+                    demEnforceReportLabelService.updateEnforceReportLabel(demEnforceReportLabel3.get(i));
+                }
+            }
+
+            //新增
+            if (CollectionUtils.isNotEmpty(demEnforceReportLabel2)) {
+                for (int i = 0; i < demEnforceReportLabel2.size(); i++) {
+                    demEnforceReportLabel2.get(i).setFid(fid);
+                    demEnforceReportLabelService.addEnforceReportLabel(demEnforceReportLabel2.get(i));
+                }
+            }
+        }
+    }
 
+    @Transactional
+    @Override
+    public void bindLabel(ParameterVo parameterVo) {
+        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());
+            this.updateById(demEnforceReportComplaint);
         }
     }
+
+    @Transactional
+    @Override
+    public void updateEnforceReportComplaint(DemEnforceReportComplaint demEnforceReportComplaint) {
+        this.updateById(demEnforceReportComplaint);
+        DemEnforceReportAttach demEnforceReportAttach = new DemEnforceReportAttach();
+        demEnforceReportAttach.setId(demEnforceReportComplaint.getId1());
+        demEnforceReportAttach.setCompleteTime(demEnforceReportComplaint.getCompleteTime());
+        demEnforceReportAttach.setFollowUpStatus(demEnforceReportComplaint.getFollowUpStatus());
+        demEnforceReportAttachService.updateById(demEnforceReportAttach);
+    }
+
+    @Override
+    public void delEnforceReportComplaint(Integer id) {
+        DemEnforceReportComplaint demEnforceReportComplaint = new DemEnforceReportComplaint();
+        demEnforceReportComplaint.setId(id);
+        demEnforceReportComplaint.setEnable(1);
+        this.updateById(demEnforceReportComplaint);
+    }
+
+
 }

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

@@ -0,0 +1,74 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.DemFileLabel;
+import com.usky.fire.mapper.DemEnforceReportLabelMapper;
+import com.usky.fire.service.DemEnforceReportLabelService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 监督检查举报投诉信息标签表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-26
+ */
+@Service
+public class DemEnforceReportLabelServiceImpl extends AbstractCrudService<DemEnforceReportLabelMapper, DemEnforceReportLabel> implements DemEnforceReportLabelService {
+
+    @Override
+    public List<DemEnforceReportLabel> enforceReportLabelSelect(Integer fid){
+        LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemEnforceReportLabel::getId,DemEnforceReportLabel::getLabelName)
+                .eq(fid!=null,DemEnforceReportLabel::getFid,fid)
+                .orderByDesc(DemEnforceReportLabel::getId);
+        List<DemEnforceReportLabel> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public void addEnforceReportLabel(DemEnforceReportLabel demEnforceReportLabel){
+        LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DemEnforceReportLabel::getFid,demEnforceReportLabel.getFid())
+                .eq(DemEnforceReportLabel::getLabelName,demEnforceReportLabel.getLabelName());
+        int count = this.count(queryWrapper);
+        if (count>0){
+            throw new BusinessException("标签/分类名称重复，请重新填写标签/分类名");
+        }
+        demEnforceReportLabel.setCreator(SecurityUtils.getUsername());
+        demEnforceReportLabel.setCreateTime(LocalDateTime.now());
+        this.save(demEnforceReportLabel);
+    }
+
+    @Override
+    public void updateEnforceReportLabel(DemEnforceReportLabel demEnforceReportLabel){
+        LambdaQueryWrapper<DemEnforceReportLabel> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.ne(DemEnforceReportLabel::getId,demEnforceReportLabel.getId())
+                .eq(DemEnforceReportLabel::getLabelName,demEnforceReportLabel.getLabelName())
+                .eq(DemEnforceReportLabel::getFid,demEnforceReportLabel.getFid());
+        int count = this.count(queryWrapper);
+        if (count>0){
+            throw new BusinessException("标签/分类名称重复，请重新填写标签/分类名");
+        }
+        demEnforceReportLabel.setUpdatePerson(SecurityUtils.getUsername());
+        demEnforceReportLabel.setUpdateTime(LocalDateTime.now());
+        this.updateById(demEnforceReportLabel);
+    }
+
+    @Override
+    public void delEnforceReportLabel(Integer id){
+        this.removeById(id);
+    }
+
+}

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

@@ -58,6 +58,8 @@
         <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" />
     </resultMap>
 
 </mapper>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemEnforceReportLabelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceReportLabel">
+        <id column="id" property="id" />
+        <result column="fid" property="fid" />
+        <result column="label_name" property="labelName" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="creator" property="creator" />
+    </resultMap>
+
+</mapper>