PSSR bugfix

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -62,6 +62,12 @@ public class TPssrAboveallController extends BaseController {
 
     @Autowired
     private ITPssrPowerService tPssrPowerService;
+
+    @Autowired
+    private ITPssrHygieneService tPssrHygieneService;
+
+    @Autowired
+    private ITPssrProtectionService tPssrProtectionService;
     @Autowired
     private TPssrApproveController tPssrApproveController;
 
@@ -219,6 +225,10 @@ public class TPssrAboveallController extends BaseController {
                         genZmdbr(subcontent.getId(), userId);
                     } else if (subcontent.getForShort().equals("lsdy")) {
                         genLsdy(subcontent.getId(), userId);
+                    } else if (subcontent.getForShort().equals("xcws")) {
+                        genXcws(subcontent.getId(), userId);
+                    } else if (subcontent.getForShort().equals("rsfh")) {
+                        genRsfh(subcontent.getId(), userId);
                     }
                 }
             }
@@ -226,6 +236,20 @@ public class TPssrAboveallController extends BaseController {
         return AjaxResult.success();
     }
 
+    private void genRsfh(Long subId, String userId) {
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"被保温的管道/设备保温防护层外观完好，无缺失。",userId,new Date()));
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"保温层连接密封处严密，无管道/设备裸露。",userId,new Date()));
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"管道/设备上的保温层不妨碍操作人员进行现场作业。",userId,new Date()));
+    }
+
+    private void genXcws(Long subId, String userId) {
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"现场地面无油渍，积水等。",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"现场无检修施工后的残留物(碎屑, 密封材料, 螺栓，保温材料等) 。",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"所需材料安全堆放在指定区域。 ",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"工器具整齐的放置在指定区域。",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"地沟、污水管网、污水井、清净下水管网、清净下水管井内无杂物，且畅通无阻。",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"无多余的脚手架，现存的脚手架不影响操作人员进行现场作业。",userId,new Date()));
+    }
 
 
     /**
@@ -333,6 +357,7 @@ public class TPssrAboveallController extends BaseController {
                 pssr.setSafetyDev(vavle.getService());
                 pssr.setPidNo(vavle.getPid());
                 pssr.setSetPressure(vavle.getSettingpres());
+                pssr.setApproveStatus(0L);
                 pssr.setCreatedate(new Date());
                 pssr.setCreaterCode(userId);
                 tPssrSafetyValveService.insertTPssrSafetyValve(pssr);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -199,7 +199,8 @@ public class TPssrMocController extends BaseController {
             tPssrMoc.setRemarks("TRA2025");
         }
         TMoc tMoc = new TMoc();
-        tMoc.setTimeliness("1");
+        // 永久moc
+//        tMoc.setTimeliness("1");
         tMoc.setRemarks(tPssrMoc.getRemarks());
         for (TMoc moc : tMocService.selectTMocList(tMoc)) {
             TPssrMoc pssrMoc = new TPssrMoc();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -358,6 +358,8 @@ public class TPssrProgrammeController extends BaseController {
             test.setFileUrl(url);
             test.setFileName(file.getOriginalFilename());
             test.setWriteDone("Y");
+            test.setCheckDone("N");
+            test.setTrainDone("N");
             test.setApproveStatus(0L);
             test.setCreatedate(new Date());
             test.setCreaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrHygiene.java

@@ -15,67 +15,105 @@ import java.util.List;
  * @author ssy
  * @date 2024-09-23
  */
-public class TPssrHygiene extends BaseEntity
-{
+public class TPssrHygiene extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 唯一标识ID */
+    public TPssrHygiene() {
+    }
+
+    public TPssrHygiene(Long subId, String checkContent, String createrCode, Date createdate) {
+        this.subId = subId;
+        this.checkContent = checkContent;
+        this.approveStatus = 0L;
+        this.createdate = createdate;
+        this.createrCode = createrCode;
+    }
+
+    /**
+     * 唯一标识ID
+     */
     private Long id;
 
-    /** 从表id */
+    /**
+     * 从表id
+     */
     @Excel(name = "从表id")
     private Long subId;
 
-    /** 审批id */
+    /**
+     * 审批id
+     */
     @Excel(name = "审批id")
     private Long approveId;
 
-    /** 检查内容 */
+    /**
+     * 检查内容
+     */
     @Excel(name = "检查内容")
     private String checkContent;
 
-    /** 检查结果 */
+    /**
+     * 检查结果
+     */
     @Excel(name = "检查结果")
     private String checkResult;
 
-    /** 确认人1 */
+    /**
+     * 确认人1
+     */
     @Excel(name = "确认人1")
     private String confirm1;
 
-    /** 确认人2 */
+    /**
+     * 确认人2
+     */
     @Excel(name = "确认人2")
     private String confirm2;
 
-    /** 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    /**
+     * 确认时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date confirmationDate;
 
-    /** 删除状态 */
+    /**
+     * 删除状态
+     */
     private Long delFlag;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人")
     private String createrCode;
 
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
-    /** 修改人 */
+    /**
+     * 修改人
+     */
     @Excel(name = "修改人")
     private String updaterCode;
 
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
-    /** 部门编号 */
+    /**
+     * 部门编号
+     */
     @Excel(name = "部门编号")
     private Long deptId;
-    
+
     private String deptName;
 
     public String getDeptName() {
@@ -86,11 +124,15 @@ public class TPssrHygiene extends BaseEntity
         this.deptName = deptName;
     }
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @Excel(name = "备注")
     private String remarks;
 
-    /** 审批状态 */
+    /**
+     * 审批状态
+     */
     @Excel(name = "审批状态")
     private Long approveStatus;
     private String confirm1Name;
@@ -160,49 +202,43 @@ public class TPssrHygiene extends BaseEntity
         this.taskType = taskType;
     }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setSubId(Long subId)
-    {
+
+    public void setSubId(Long subId) {
         this.subId = subId;
     }
 
-    public Long getSubId()
-    {
+    public Long getSubId() {
         return subId;
     }
-    public void setApproveId(Long approveId)
-    {
+
+    public void setApproveId(Long approveId) {
         this.approveId = approveId;
     }
 
-    public Long getApproveId()
-    {
+    public Long getApproveId() {
         return approveId;
     }
-    public void setCheckContent(String checkContent)
-    {
+
+    public void setCheckContent(String checkContent) {
         this.checkContent = checkContent;
     }
 
-    public String getCheckContent()
-    {
+    public String getCheckContent() {
         return checkContent;
     }
-    public void setCheckResult(String checkResult)
-    {
+
+    public void setCheckResult(String checkResult) {
         this.checkResult = checkResult;
     }
 
-    public String getCheckResult()
-    {
+    public String getCheckResult() {
         return checkResult;
     }
 
@@ -222,107 +258,97 @@ public class TPssrHygiene extends BaseEntity
         this.confirm2 = confirm2;
     }
 
-    public void setConfirmationDate(Date confirmationDate)
-    {
+    public void setConfirmationDate(Date confirmationDate) {
         this.confirmationDate = confirmationDate;
     }
 
-    public Date getConfirmationDate()
-    {
+    public Date getConfirmationDate() {
         return confirmationDate;
     }
-    public void setDelFlag(Long delFlag)
-    {
+
+    public void setDelFlag(Long delFlag) {
         this.delFlag = delFlag;
     }
 
-    public Long getDelFlag()
-    {
+    public Long getDelFlag() {
         return delFlag;
     }
-    public void setCreaterCode(String createrCode)
-    {
+
+    public void setCreaterCode(String createrCode) {
         this.createrCode = createrCode;
     }
 
-    public String getCreaterCode()
-    {
+    public String getCreaterCode() {
         return createrCode;
     }
-    public void setCreatedate(Date createdate)
-    {
+
+    public void setCreatedate(Date createdate) {
         this.createdate = createdate;
     }
 
-    public Date getCreatedate()
-    {
+    public Date getCreatedate() {
         return createdate;
     }
-    public void setUpdaterCode(String updaterCode)
-    {
+
+    public void setUpdaterCode(String updaterCode) {
         this.updaterCode = updaterCode;
     }
 
-    public String getUpdaterCode()
-    {
+    public String getUpdaterCode() {
         return updaterCode;
     }
-    public void setUpdatedate(Date updatedate)
-    {
+
+    public void setUpdatedate(Date updatedate) {
         this.updatedate = updatedate;
     }
 
-    public Date getUpdatedate()
-    {
+    public Date getUpdatedate() {
         return updatedate;
     }
-    public void setDeptId(Long deptId)
-    {
+
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
-    public void setRemarks(String remarks)
-    {
+
+    public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
 
-    public String getRemarks()
-    {
+    public String getRemarks() {
         return remarks;
     }
-    public void setApproveStatus(Long approveStatus)
-    {
+
+    public void setApproveStatus(Long approveStatus) {
         this.approveStatus = approveStatus;
     }
 
-    public Long getApproveStatus()
-    {
+    public Long getApproveStatus() {
         return approveStatus;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("subId", getSubId())
-            .append("approveId", getApproveId())
-            .append("checkContent", getCheckContent())
-            .append("checkResult", getCheckResult())
-            .append("confirm1", getConfirm1())
-            .append("confirm2", getConfirm2())
-            .append("confirmationDate", getConfirmationDate())
-            .append("delFlag", getDelFlag())
-            .append("createrCode", getCreaterCode())
-            .append("createdate", getCreatedate())
-            .append("updaterCode", getUpdaterCode())
-            .append("updatedate", getUpdatedate())
-            .append("deptId", getDeptId())
-            .append("remarks", getRemarks())
-            .append("approveStatus", getApproveStatus())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("subId", getSubId())
+                .append("approveId", getApproveId())
+                .append("checkContent", getCheckContent())
+                .append("checkResult", getCheckResult())
+                .append("confirm1", getConfirm1())
+                .append("confirm2", getConfirm2())
+                .append("confirmationDate", getConfirmationDate())
+                .append("delFlag", getDelFlag())
+                .append("createrCode", getCreaterCode())
+                .append("createdate", getCreatedate())
+                .append("updaterCode", getUpdaterCode())
+                .append("updatedate", getUpdatedate())
+                .append("deptId", getDeptId())
+                .append("remarks", getRemarks())
+                .append("approveStatus", getApproveStatus())
+                .toString();
     }
 }

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProtection.java

@@ -19,6 +19,17 @@ public class TPssrProtection extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    public TPssrProtection() {
+    }
+
+    public TPssrProtection(Long subId, String checkContent,String createrCode,Date createdate) {
+        this.subId = subId;
+        this.checkContent = checkContent;
+        this.approveStatus = 0L;
+        this.createdate = createdate;
+        this.createrCode = createrCode;
+    }
+
     /** 唯一标识ID */
     private Long id;
 

master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPatrolMapper.java

@@ -26,7 +26,6 @@ public interface TPssrPatrolMapper
      * @param tPssrPatrol 巡检
      * @return 巡检集合
      */
-    @DataScope(deptAlias = "d")
     public List<TPssrPatrol> selectTPssrPatrolList(TPssrPatrol tPssrPatrol);
 
     /**

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrFileServiceImpl.java

@@ -100,6 +100,16 @@ public class TPssrFileServiceImpl implements ITPssrFileService {
         if (!CollectionUtils.isNotEmpty(fileIds)) {
             return;
         }
+        if (fileIds.get(0) == -1) {
+            TPssrFile query = new TPssrFile();
+            query.setSubId(subId);
+            query.setItemId(itemId);
+            query.setForShort(forShort);
+            for (TPssrFile exist : tPssrFileMapper.selectTPssrFileList(query)) {
+                tPssrFileMapper.deleteTPssrFileById(exist.getFileId());
+            }
+            return;
+        }
         // 更新附件信息
         for (Long fileId : fileIds) {
             TPssrFile pssrFile = new TPssrFile();
@@ -115,7 +125,7 @@ public class TPssrFileServiceImpl implements ITPssrFileService {
         query.setItemId(itemId);
         query.setForShort(forShort);
         for (TPssrFile exist : tPssrFileMapper.selectTPssrFileList(query)) {
-            if (!fileIds.contains(exist.getFileId())){
+            if (!fileIds.contains(exist.getFileId())) {
                 tPssrFileMapper.deleteTPssrFileById(exist.getFileId());
             }
         }

master/src/main/java/com/ruoyi/project/reliability/mapper/TSafetyvavleMapper.java

@@ -22,13 +22,7 @@ public interface TSafetyvavleMapper
      */
     public TSafetyvavle selectTSafetyvavleById(Long id);
 
-    /**
-     * 查询安全阀清单列表
-     * 
-     * @param tSafetyvavle 安全阀清单
-     * @return 安全阀清单集合
-     */
-    @DataScope(deptAlias = "d")
+
     public List<TSafetyvavle> selectTSafetyvavleList(TSafetyvavle tSafetyvavle);
 
     /**