From 4fe7a435c643680a4d4b26efef4763112ba22d1b Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 4 Dec 2025 15:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=AE=89=E5=85=A8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jxaqgl/service/impl/JxAqjcglServiceImpl.java | 1 + .../dromara/mechanical/jxzgbh/domain/JxYhzgbh.java | 5 +++++ .../mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java | 5 +++++ .../mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java | 12 ++++++++++++ .../jxzgbh/service/impl/JxZgxxServiceImpl.java | 1 - 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java index f25727ca..4539d993 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java @@ -184,6 +184,7 @@ public class JxAqjcglServiceImpl extends ServiceImpl i jxYhzgbhBo.setInspectionJcdNo(bo.getInspectionOrderNo()); jxYhzgbhBo.setInspector(bo.getInspector()); jxYhzgbhBo.setRiskGrade(bo.getRiskGrade()); + jxYhzgbhBo.setAbarbeitung(bo.getAbarbeitung()); jxYhzgbhBo.setYhly("1"); jxYhzgbhBo.setReviewState("2"); jxYhzgbhBo.setAbarbeitungState("1"); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java index 2be740ca..f11f2d18 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java @@ -86,6 +86,11 @@ public class JxYhzgbh extends BaseEntity { */ private Long discoverId; + /** + * 整改人 + */ + private Long abarbeitung; + /** * 审核状态 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java index d2527cde..dc7c2e55 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java @@ -43,6 +43,11 @@ public class JxYhzgbhBo extends BaseEntity { */ private Long inspector; + /** + * 整改人 + */ + private Long abarbeitung; + /** * 机械安全检查记录表ID */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java index bc5c5fbb..6494523f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java @@ -118,6 +118,18 @@ public class JxYhzgbhVo implements Serializable { @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId") private String discoverName; + /** + * 整改人 + */ + private Long abarbeitung; + + + /** + * 整改人 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId") + private String abarbeitungName; + /** * 审核状态 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxZgxxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxZgxxServiceImpl.java index 823ced63..4b7b2f32 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxZgxxServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxZgxxServiceImpl.java @@ -77,7 +77,6 @@ public class JxZgxxServiceImpl extends ServiceImpl impleme lqw.eq(bo.getAbarbeitung() != null, JxZgxx::getAbarbeitung, bo.getAbarbeitung()); lqw.eq(bo.getAbarbeitungKsdate() != null, JxZgxx::getAbarbeitungKsdate, bo.getAbarbeitungKsdate()); lqw.eq(bo.getAbarbeitungJsdate() != null, JxZgxx::getAbarbeitungJsdate, bo.getAbarbeitungJsdate()); - lqw.eq(bo.getAbarbeitungDeadline() != null, JxZgxx::getAbarbeitungDeadline, bo.getAbarbeitungDeadline()); lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungMeasure()), JxZgxx::getAbarbeitungMeasure, bo.getAbarbeitungMeasure()); lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungAccomplish()), JxZgxx::getAbarbeitungAccomplish, bo.getAbarbeitungAccomplish()); lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxZgxx::getFileId, bo.getFileId());