feat(issue): 优化装置问题清单 Responsible Person 和 Unit 字段

- 将负责人员和单位字段改为 Long 类型
- 新增负责人员名称字段
- 实现根据部门 ID 查询用户列表的功能
- 更新相关 mapper 和 service 接口
- 修改 Excel 导入导出逻辑

master/src/main/java/com/ruoyi/project/issue/controller/TPlantIssuelistController.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.issue.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -11,11 +12,10 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.issue.domain.TPlantIssuelist;
 import com.ruoyi.project.issue.service.ITPlantIssuelistService;
-import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDeptService;
-import com.ruoyi.project.training.domain.*;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -29,11 +29,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 装置问题滚动清单Controller
@@ -48,7 +46,10 @@ public class TPlantIssuelistController extends BaseController {
     private ITPlantIssuelistService tPlantIssuelistService;
 
     @Autowired
-    private ISysDeptService iSysDeptService;
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询装置问题滚动清单列表
@@ -96,7 +97,7 @@ public class TPlantIssuelistController extends BaseController {
             CellStyle originalStyle1 = originalcell1.getCellStyle();
             if (!list.isEmpty()) {
                 Row line1 = sheet1.getRow(0);
-                line1.getCell(0).setCellValue(list.get(0).getPlant()+"装置滚动问题清单和行动计划");
+                line1.getCell(0).setCellValue(list.get(0).getPlant() + "装置滚动问题清单和行动计划");
             }
 
             for (TPlantIssuelist t : list) {
@@ -109,8 +110,8 @@ public class TPlantIssuelistController extends BaseController {
                 row.createCell(4).setCellValue(t.getIssueIdentified());
                 row.createCell(5).setCellValue(t.getActionsTaken());
                 row.createCell(6).setCellValue(t.getIssueClass());
-                row.createCell(7).setCellValue(t.getResponsibleUnit());
-                row.createCell(8).setCellValue(t.getResponsiblePerson());
+                row.createCell(7).setCellValue(t.getResponsibleUnitName());
+                row.createCell(8).setCellValue(t.getResponsiblePersonName());
                 row.createCell(9).setCellValue(t.getCurrentStates());
                 row.createCell(10).setCellValue(DateUtils.dateTime(t.getExpectedDate()));
                 row.createCell(11).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
@@ -191,7 +192,7 @@ public class TPlantIssuelistController extends BaseController {
         int rowNum = sheet.getPhysicalNumberOfRows();
         int failNumber = 0;
         //部门查询
-        List<SysDept> dept = iSysDeptService.selectAllDeptList(new SysDept());
+        List<SysDept> dept = sysDeptService.selectAllDeptList(new SysDept());
         for (int i = 1; i < rowNum; i++) {
             try {
                 logger.info("读取行数：" + i);
@@ -222,16 +223,23 @@ public class TPlantIssuelistController extends BaseController {
                     } else if (j == 7) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue)) {
-                                entity.setResponsibleUnit(String.valueOf(d.getDeptId()));//部门编号
+                                entity.setResponsibleUnit(d.getDeptId());//部门编号
                             }
                         }
                     } else if (j == 8) {
-                        entity.setResponsiblePerson(cellValue);
+                        if (StringUtils.isNotEmpty(cellValue)) {
+                            SysUser user = new SysUser();
+                            user.setNickName(cellValue);
+                            user.setDeptId(entity.getResponsibleUnit());
+                            List<SysUser> sysUsers = sysUserService.selectUserList(user);
+                            if (sysUsers.size() == 1)
+                                entity.setResponsiblePerson(sysUsers.get(0).getUserId());
+                        }
                     } else if (j == 9) {
                         entity.setCurrentStates(cellValue);
                     } else if (j == 10) {
                         entity.setExpectedDate(DateUtils.parseDate(cellValue));
-                    }else if (j == 11) {
+                    } else if (j == 11) {
                         entity.setCompletionDate(DateUtils.parseDate(cellValue));
                     } else if (j == 12) {
                         entity.setAdditionalDeadline(cellValue);
@@ -253,7 +261,7 @@ public class TPlantIssuelistController extends BaseController {
             failNum++;
             try {
                 add(t);
-                                successNumber++;
+                successNumber++;
             } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);

master/src/main/java/com/ruoyi/project/issue/domain/TPlantIssuelist.java

@@ -52,8 +52,9 @@ public class TPlantIssuelist extends BaseEntity
 
     /** 负责人员 */
     @Excel(name = "负责人员")
-    private String responsiblePerson;
-    private String responsibleUnit;
+    private Long responsiblePerson;
+    private String responsiblePersonName;
+    private Long responsibleUnit;
     private String responsibleUnitName;
 
     /** 当前状态 */
@@ -108,6 +109,14 @@ public class TPlantIssuelist extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    public String getResponsiblePersonName() {
+        return responsiblePersonName;
+    }
+
+    public void setResponsiblePersonName(String responsiblePersonName) {
+        this.responsiblePersonName = responsiblePersonName;
+    }
+
     public String getResponsibleUnitName() {
         return responsibleUnitName;
     }
@@ -228,12 +237,12 @@ public class TPlantIssuelist extends BaseEntity
     {
         return issueClass;
     }
-    public void setResponsiblePerson(String responsiblePerson)
+    public void setResponsiblePerson(Long responsiblePerson)
     {
         this.responsiblePerson = responsiblePerson;
     }
 
-    public String getResponsiblePerson()
+    public Long getResponsiblePerson()
     {
         return responsiblePerson;
     }
@@ -328,11 +337,11 @@ public class TPlantIssuelist extends BaseEntity
         return remarks;
     }
 
-    public String getResponsibleUnit() {
+    public Long getResponsibleUnit() {
         return responsibleUnit;
     }
 
-    public void setResponsibleUnit(String responsibleUnit) {
+    public void setResponsibleUnit(Long responsibleUnit) {
         this.responsibleUnit = responsibleUnit;
     }
 

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseBicycleController.java

@@ -347,6 +347,9 @@ public class TCommonuseBicycleController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseBicycle.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseDownspoutController.java

@@ -321,6 +321,9 @@ public class TCommonuseDownspoutController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseDownspout.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseEarplugController.java

@@ -327,6 +327,9 @@ public class TCommonuseEarplugController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseEarplug.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseManholeCoverController.java

@@ -346,6 +346,9 @@ public class TCommonuseManholeCoverController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseManholeCover.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseMovementController.java

@@ -396,6 +396,9 @@ public class TCommonuseMovementController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseMovement.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseSafetyBeltController.java

@@ -334,6 +334,9 @@ public class TCommonuseSafetyBeltController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseSafetyBelt.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java

@@ -364,6 +364,9 @@ public class TCommonuseTesterController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseTester.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWalkieTalkieController.java

@@ -330,6 +330,9 @@ public class TCommonuseWalkieTalkieController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseWalkieTalkie.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWaterPumpController.java

@@ -330,6 +330,9 @@ public class TCommonuseWaterPumpController extends BaseController {
             tPatrolIssues.setLinkId(tCommonuseWaterPump.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java

@@ -530,6 +530,9 @@ public class TEmergencyCabinetController extends BaseController {
             tPatrolIssues.setLinkId(tEmergencyCabinet.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(cabinet.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java

@@ -328,6 +328,9 @@ public class TEmergencyCctvController extends BaseController {
             tPatrolIssues.setLinkId(tEmergencyCctv.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCofferdamController.java

@@ -331,6 +331,9 @@ public class TEmergencyCofferdamController extends BaseController {
             tPatrolIssues.setLinkId(tEmergencyCofferdam.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -397,6 +397,9 @@ public class TEmergencyEyewashController extends BaseController {
             tPatrolIssues.setLinkId(tEmergencyEyewash.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(eyewash.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java

@@ -336,6 +336,9 @@ public class TEmergencyPagaController extends BaseController {
             tPatrolIssues.setLinkId(tEmergencyPaga.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAlarmController.java

@@ -384,6 +384,9 @@ public class TFireAlarmController extends BaseController {
             tPatrolIssues.setLinkId(tFireAlarm.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java

@@ -404,6 +404,9 @@ public class TFireAnnihilatorController extends BaseController {
             tPatrolIssues.setLinkId(tFireAnnihilator.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(annihilator.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java

@@ -350,6 +350,9 @@ public class TFireDoorController extends BaseController {
             tPatrolIssues.setLinkId(tFireDoor.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireGasShieldController.java

@@ -350,6 +350,9 @@ public class TFireGasShieldController extends BaseController {
             tPatrolIssues.setLinkId(tFireGasShield.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireHoseBoxController.java

@@ -340,6 +340,9 @@ public class TFireHoseBoxController extends BaseController {
             tPatrolIssues.setLinkId(tFireHoseBox.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFirePostFireController.java

@@ -340,6 +340,9 @@ public class TFirePostFireController extends BaseController {
             tPatrolIssues.setLinkId(tFirePostFire.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSandboxController.java

@@ -331,6 +331,9 @@ public class TFireSandboxController extends BaseController {
             tPatrolIssues.setLinkId(tFireSandbox.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSprinklerController.java

@@ -347,6 +347,9 @@ public class TFireSprinklerController extends BaseController {
             tPatrolIssues.setLinkId(tFireSprinkler.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireStandpipeController.java

@@ -335,6 +335,9 @@ public class TFireStandpipeController extends BaseController {
             tPatrolIssues.setLinkId(tFireStandpipe.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSteamCurtainController.java

@@ -334,6 +334,9 @@ public class TFireSteamCurtainController extends BaseController {
             tPatrolIssues.setLinkId(tFireSteamCurtain.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWaterCannonController.java

@@ -340,6 +340,9 @@ public class TFireWaterCannonController extends BaseController {
             tPatrolIssues.setLinkId(tFireWaterCannon.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(cannon.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWeathervaneController.java

@@ -395,6 +395,9 @@ public class TFireWeathervaneController extends BaseController {
             tPatrolIssues.setLinkId(tFireWeathervane.getId());
             tPatrolIssues.setStatus(0L);
             tPatrolIssuesService.insertTPatrolIssues(tPatrolIssues);
+            tPatrolPlan.setUncheckedNum(tPatrolPlan.getUncheckedNum() + 1);
+            tPatrolPlan.setCheckedNum(tPatrolPlan.getCheckedNum() - 1);
+            tPatrolPlanService.updateTPatrolPlan(tPatrolPlan);
         } else {
             if ("1".equals(item.getIssuesStatus())) {
                 TPatrolIssues tPatrolIssues = new TPatrolIssues();

master/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -84,6 +84,12 @@ public class SysUserController extends BaseController
         return AjaxResult.success(userService.selectUserList(user));
     }
 
+    @GetMapping("/listByDeptId/{deptId}")
+    public AjaxResult listByDeptId(@PathVariable Long deptId){
+        return AjaxResult.success(userService.selectUserListByDeptId(deptId));
+    }
+
+
     @GetMapping("/listUserPost")
     public List<SysUser> listUserPost(TStaffmgr tStaffmgr)
     {

master/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java

@@ -155,4 +155,6 @@ public interface SysUserMapper
 
 
     SysUser selectUserSingle(SysUser param);
+
+    List<SysUser> selectUserListByDeptId(Long deptId);
 }

master/src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -217,4 +217,5 @@ public interface ISysUserService
     SysUser selectSafeManagerUserByPlantCode(String plantCode);
 
 
+    List<SysUser> selectUserListByDeptId(Long deptId);
 }

master/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -568,4 +568,9 @@ public class SysUserServiceImpl implements ISysUserService
     public SysUser selectSafeManagerUserByPlantCode(String plantCode) {
         return this.userMapper.selectSafeManagerUserByPlantCode(plantCode);
     }
+
+    @Override
+    public List<SysUser> selectUserListByDeptId(Long deptId){
+        return userMapper.selectUserListByDeptId(deptId);
+    }
 }

master/src/main/resources/mybatis/issue/TPlantIssuelistMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="actionsTaken"    column="actions_taken"    />
         <result property="issueClass"    column="issue_class"    />
         <result property="responsiblePerson"    column="responsible_person"    />
+        <result property="responsiblePersonName"    column="responsible_person_name"    />
         <result property="responsibleUnit"    column="responsible_unit"    />
         <result property="responsibleUnitName"    column="responsible_unit_name"    />
         <result property="currentStates"    column="current_states"    />
@@ -31,9 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPlantIssuelistVo">
-        select d.id, d.plant, d.area, d.identified_date, d.issue_source, d.issue_identified, d.actions_taken, d.issue_class, d.responsible_person,d.responsible_unit,s2.dept_name responsible_unit_name, d.current_states, d.completion_date, d.expected_date, d.additional_deadline, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_plant_issuelist d
+        select d.id, d.plant, d.area, d.identified_date, d.issue_source, d.issue_identified, d.actions_taken, d.issue_class, d.responsible_person,u.nick_name as responsible_person_name, d.responsible_unit,s2.dept_name responsible_unit_name, d.current_states, d.completion_date, d.expected_date, d.additional_deadline, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_plant_issuelist d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_dept s2 on s2.dept_id = d.responsible_unit
+      left join sys_user u on u.user_id = d.responsible_person
     </sql>
 
     <select id="selectTPlantIssuelistList" parameterType="TPlantIssuelist" resultMap="TPlantIssuelistResult">
@@ -64,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by current_states desc,expected_date asc
+        order by current_states desc,expected_date asc,id desc
     </select>
     
     <select id="selectTPlantIssuelistById" parameterType="Long" resultMap="TPlantIssuelistResult">

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -189,6 +189,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
+    <select id="selectUserListByDeptId" parameterType="Long" resultMap="SysUserResult">
+		select u.user_id,u.staffid,u.home_type, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+        where u.del_flag = '0' and d.dept_id = #{deptId}
+    </select>
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id,u.staffid,u.home_type,u.sign_url, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id

ui/src/api/system/user.js

@@ -192,3 +192,10 @@ export function getUserByUserName(userName) {
     method: 'get'
   })
 }
+
+  export function listByDeptId(deptId) {
+    return request({
+      url: '/system/user/listByDeptId/' + deptId,
+      method: 'get'
+    })
+  }

ui/src/views/issue/issuelist/bd.vue

@@ -48,11 +48,7 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <el-input
-          v-model="queryParams.responsibleUnit"
-          placeholder="请输入负责部门"
-          @keyup.enter.native="handleQuery"
-        />
+        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -134,7 +130,7 @@
       <el-table-column label="问题类别" align="center" prop="issueClass" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="负责部门" align="center" prop="responsibleUnitName" :show-overflow-tooltip="true"
                        width="150"/>
-      <el-table-column label="负责人员" align="center" prop="responsiblePerson" :show-overflow-tooltip="true"
+      <el-table-column label="负责人员" align="center" prop="responsiblePersonName" :show-overflow-tooltip="true"
                        width="150"/>
       <el-table-column label="当前状态" align="center" prop="currentStates" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="预计完成日期" align="center" prop="expectedDate" :show-overflow-tooltip="true" width="100">
@@ -230,10 +226,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" :show-count="true" placeholder="请选择负责部门" />
+          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
-          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人员"/>
+          <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
+            <el-option v-for="item in userOptions" :key="item.nickName" :value="item.userId" :label="item.nickName"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="当前状态" prop="currentStates">
           <el-select  v-model="form.currentStates" placeholder="请选择当前状态" clearable style="width: 100%">
@@ -390,6 +388,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import {alltreeselect} from "../../../api/system/dept";
+import {listByDeptId} from "../../../api/system/user";
 
 export default {
   name: "IssuelistBD",
@@ -400,6 +399,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      userOptions:[],
       queryDate:[],
       pickerOptions: {
         shortcuts: [{
@@ -577,6 +577,15 @@ export default {
     this.getAllDeptList();
   },
   methods: {
+    getResponsiblePersonList(node, instanceId){
+      this.getUserList(node.id);
+    },
+    getUserList(deptId){
+      this.userOptions=[];
+      listByDeptId(deptId).then(res=>{
+        this.userOptions=res.data;
+      })
+    },
     /** 查询装置问题滚动清单列表 */
     getList() {
       this.loading = true;
@@ -661,9 +670,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.userOptions=[];
       const id = row.id || this.ids
       getIssuelist(id).then(response => {
         this.form = response.data;
+        if(response.data.responsibleUnit){
+          this.getUserList(response.data.responsibleUnit);
+        }
         this.open = true;
         this.title = "修改装置问题滚动清单";
       });
@@ -824,7 +837,7 @@ export default {
         return '';
       }
       const diffDays = this.getDateDiff(row.expectedDate);
-      console.log(diffDays)
+
       if (diffDays <= 0) {
         return 'danger-row';
       } else if (diffDays < 15) {

ui/src/views/issue/issuelist/ebsm.vue

@@ -48,11 +48,7 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <el-input
-          v-model="queryParams.responsibleUnit"
-          placeholder="请输入负责部门"
-          @keyup.enter.native="handleQuery"
-        />
+        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -134,7 +130,7 @@
       <el-table-column label="问题类别" align="center" prop="issueClass" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="负责部门" align="center" prop="responsibleUnitName" :show-overflow-tooltip="true"
                        width="150"/>
-      <el-table-column label="负责人员" align="center" prop="responsiblePerson" :show-overflow-tooltip="true"
+      <el-table-column label="负责人员" align="center" prop="responsiblePersonName" :show-overflow-tooltip="true"
                        width="150"/>
       <el-table-column label="当前状态" align="center" prop="currentStates" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="预计完成日期" align="center" prop="expectedDate" :show-overflow-tooltip="true" width="100">
@@ -230,10 +226,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" :show-count="true" placeholder="请选择负责部门" />
+          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
-          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人员"/>
+          <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
+            <el-option v-for="item in userOptions" :key="item.nickName" :value="item.userId" :label="item.nickName"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="当前状态" prop="currentStates">
           <el-select  v-model="form.currentStates" placeholder="请选择当前状态" clearable style="width: 100%">
@@ -390,6 +388,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import {alltreeselect} from "../../../api/system/dept";
+import {listByDeptId} from "../../../api/system/user";
 
 export default {
   name: "IssuelistEBSM",
@@ -400,6 +399,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      userOptions:[],
       queryDate:[],
       pickerOptions: {
         shortcuts: [{
@@ -577,6 +577,15 @@ export default {
     this.getAllDeptList();
   },
   methods: {
+    getResponsiblePersonList(node, instanceId){
+      this.getUserList(node.id);
+    },
+    getUserList(deptId){
+      this.userOptions=[];
+      listByDeptId(deptId).then(res=>{
+        this.userOptions=res.data;
+      })
+    },
     /** 查询装置问题滚动清单列表 */
     getList() {
       this.loading = true;
@@ -661,9 +670,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.userOptions=[];
       const id = row.id || this.ids
       getIssuelist(id).then(response => {
         this.form = response.data;
+        if(response.data.responsibleUnit){
+          this.getUserList(response.data.responsibleUnit);
+        }
         this.open = true;
         this.title = "修改装置问题滚动清单";
       });
@@ -824,7 +837,7 @@ export default {
         return '';
       }
       const diffDays = this.getDateDiff(row.expectedDate);
-      console.log(diffDays)
+
       if (diffDays <= 0) {
         return 'danger-row';
       } else if (diffDays < 15) {

ui/src/views/issue/issuelist/ib.vue

@@ -48,11 +48,7 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <el-input
-          v-model="queryParams.responsibleUnit"
-          placeholder="请输入负责部门"
-          @keyup.enter.native="handleQuery"
-        />
+        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -134,7 +130,7 @@
       <el-table-column label="问题类别" align="center" prop="issueClass" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="负责部门" align="center" prop="responsibleUnitName" :show-overflow-tooltip="true"
                        width="150"/>
-      <el-table-column label="负责人员" align="center" prop="responsiblePerson" :show-overflow-tooltip="true"
+      <el-table-column label="负责人员" align="center" prop="responsiblePersonName" :show-overflow-tooltip="true"
                        width="150"/>
       <el-table-column label="当前状态" align="center" prop="currentStates" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="预计完成日期" align="center" prop="expectedDate" :show-overflow-tooltip="true" width="100">
@@ -230,10 +226,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" :show-count="true" placeholder="请选择负责部门" />
+          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
-          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人员"/>
+          <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
+            <el-option v-for="item in userOptions" :key="item.nickName" :value="item.userId" :label="item.nickName"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="当前状态" prop="currentStates">
           <el-select  v-model="form.currentStates" placeholder="请选择当前状态" clearable style="width: 100%">
@@ -390,6 +388,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import {alltreeselect} from "../../../api/system/dept";
+import {listByDeptId} from "../../../api/system/user";
 
 export default {
   name: "IssuelistIB",
@@ -400,6 +399,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      userOptions:[],
       queryDate:[],
       pickerOptions: {
         shortcuts: [{
@@ -577,6 +577,15 @@ export default {
     this.getAllDeptList();
   },
   methods: {
+    getResponsiblePersonList(node, instanceId){
+      this.getUserList(node.id);
+    },
+    getUserList(deptId){
+      this.userOptions=[];
+      listByDeptId(deptId).then(res=>{
+        this.userOptions=res.data;
+      })
+    },
     /** 查询装置问题滚动清单列表 */
     getList() {
       this.loading = true;
@@ -661,9 +670,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.userOptions=[];
       const id = row.id || this.ids
       getIssuelist(id).then(response => {
         this.form = response.data;
+        if(response.data.responsibleUnit){
+          this.getUserList(response.data.responsibleUnit);
+        }
         this.open = true;
         this.title = "修改装置问题滚动清单";
       });
@@ -824,7 +837,7 @@ export default {
         return '';
       }
       const diffDays = this.getDateDiff(row.expectedDate);
-      console.log(diffDays)
+
       if (diffDays <= 0) {
         return 'danger-row';
       } else if (diffDays < 15) {