lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

机械安全模块

Browse Source
This commit is contained in:
lg
2025-12-04 15:27:35 +08:00
parent 18be0f00a3
commit 4fe7a435c6
5 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java
View File

@ -184,6 +184,7 @@ public class JxAqjcglServiceImpl extends ServiceImpl<JxAqjcglMapper, JxAqjcgl> i
jxYhzgbhBo.setInspectionJcdNo(bo.getInspectionOrderNo()); jxYhzgbhBo.setInspectionJcdNo(bo.getInspectionOrderNo());
jxYhzgbhBo.setInspector(bo.getInspector()); jxYhzgbhBo.setInspector(bo.getInspector());
jxYhzgbhBo.setRiskGrade(bo.getRiskGrade()); jxYhzgbhBo.setRiskGrade(bo.getRiskGrade());
jxYhzgbhBo.setAbarbeitung(bo.getAbarbeitung());
jxYhzgbhBo.setYhly("1"); jxYhzgbhBo.setYhly("1");
jxYhzgbhBo.setReviewState("2"); jxYhzgbhBo.setReviewState("2");
jxYhzgbhBo.setAbarbeitungState("1"); jxYhzgbhBo.setAbarbeitungState("1");

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java
View File

@ -86,6 +86,11 @@ public class JxYhzgbh extends BaseEntity {
*/ */
private Long discoverId; private Long discoverId;
/**
* 整改人
*/
private Long abarbeitung;
/** /**
* 审核状态 * 审核状态
*/ */

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java
View File

@ -43,6 +43,11 @@ public class JxYhzgbhBo extends BaseEntity {
*/ */
private Long inspector; private Long inspector;
/**
* 整改人
*/
private Long abarbeitung;
/** /**
* 机械安全检查记录表ID * 机械安全检查记录表ID
*/ */

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java
View File

@ -118,6 +118,18 @@ public class JxYhzgbhVo implements Serializable {
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId") @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId")
private String discoverName; private String discoverName;
/**
* 整改人
*/
private Long abarbeitung;
/**
* 整改人
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId")
private String abarbeitungName;
/** /**
* 审核状态 * 审核状态
*/ */

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxZgxxServiceImpl.java
View File

@ -77,7 +77,6 @@ public class JxZgxxServiceImpl extends ServiceImpl<JxZgxxMapper, JxZgxx> impleme
lqw.eq(bo.getAbarbeitung() != null, JxZgxx::getAbarbeitung, bo.getAbarbeitung()); lqw.eq(bo.getAbarbeitung() != null, JxZgxx::getAbarbeitung, bo.getAbarbeitung());
lqw.eq(bo.getAbarbeitungKsdate() != null, JxZgxx::getAbarbeitungKsdate, bo.getAbarbeitungKsdate()); lqw.eq(bo.getAbarbeitungKsdate() != null, JxZgxx::getAbarbeitungKsdate, bo.getAbarbeitungKsdate());
lqw.eq(bo.getAbarbeitungJsdate() != null, JxZgxx::getAbarbeitungJsdate, bo.getAbarbeitungJsdate()); 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.getAbarbeitungMeasure()), JxZgxx::getAbarbeitungMeasure, bo.getAbarbeitungMeasure());
lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungAccomplish()), JxZgxx::getAbarbeitungAccomplish, bo.getAbarbeitungAccomplish()); lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungAccomplish()), JxZgxx::getAbarbeitungAccomplish, bo.getAbarbeitungAccomplish());
lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxZgxx::getFileId, bo.getFileId()); lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxZgxx::getFileId, bo.getFileId());