From 955d7e39e607104033e4553cfc4571485334cccf Mon Sep 17 00:00:00 2001 From: lg Date: Fri, 5 Dec 2025 09:28:05 +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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/mechanical/jxzgbh/domain/vo/JxFcxxVo.java | 9 +++++++++ .../mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java | 4 ++-- .../mechanical/jxzgbh/domain/vo/JxZgxxHeadVo.java | 6 ++++++ .../dromara/mechanical/jxzgbh/domain/vo/JxZgxxVo.java | 10 ++++++++++ .../jxzgbh/service/impl/JxYhzgbhServiceImpl.java | 9 ++++----- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxFcxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxFcxxVo.java index 033cd789..f77c7a10 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxFcxxVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxFcxxVo.java @@ -1,5 +1,7 @@ package org.dromara.mechanical.jxzgbh.domain.vo; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.mechanical.jxzgbh.domain.JxFcxx; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -47,6 +49,13 @@ public class JxFcxxVo implements Serializable { @ExcelProperty(value = "复查人") private Long review; + /** + * 复查人 + */ + @ExcelProperty(value = "复查人") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "review") + private String reviewName; + /** * 复查日期 */ 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 a0f8acec..73f5ddcb 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 @@ -152,11 +152,11 @@ public class JxYhzgbhVo implements Serializable { /** * 整改信息 */ - private List zgxxList; + private List zgxxList; /** * 复查信息 */ - private List fcxxList; + private List fcxxList; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxHeadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxHeadVo.java index c5229018..2350137a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxHeadVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxHeadVo.java @@ -21,4 +21,10 @@ public class JxZgxxHeadVo { private Long wzg = 0L; + /** + * 已闭环 + */ + private Long ybh = 0L; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxVo.java index b11ad6e1..1b176486 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxVo.java @@ -1,5 +1,7 @@ package org.dromara.mechanical.jxzgbh.domain.vo; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.mechanical.jxzgbh.domain.JxZgxx; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -47,6 +49,14 @@ public class JxZgxxVo implements Serializable { @ExcelProperty(value = "整改责任人") private Long abarbeitung; + + /** + * 整改责任人 + */ + @ExcelProperty(value = "整改责任人") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "abarbeitung") + private String abarbeitungName; + /** * 整改开始日期 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxYhzgbhServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxYhzgbhServiceImpl.java index 165e68cc..6c7f2818 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxYhzgbhServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxYhzgbhServiceImpl.java @@ -19,13 +19,11 @@ import org.dromara.mechanical.jxzgbh.domain.JxFcxx; import org.dromara.mechanical.jxzgbh.domain.JxZgxx; import org.dromara.mechanical.jxzgbh.domain.bo.JxFcxxBo; import org.dromara.mechanical.jxzgbh.domain.bo.JxZgxxBo; -import org.dromara.mechanical.jxzgbh.domain.vo.JxZgxxHeadVo; -import org.dromara.mechanical.jxzgbh.domain.vo.JxZgxxOrFcxxVo; +import org.dromara.mechanical.jxzgbh.domain.vo.*; import org.dromara.mechanical.jxzgbh.service.IJxFcxxService; import org.dromara.mechanical.jxzgbh.service.IJxZgxxService; import org.springframework.stereotype.Service; import org.dromara.mechanical.jxzgbh.domain.bo.JxYhzgbhBo; -import org.dromara.mechanical.jxzgbh.domain.vo.JxYhzgbhVo; import org.dromara.mechanical.jxzgbh.domain.JxYhzgbh; import org.dromara.mechanical.jxzgbh.mapper.JxYhzgbhMapper; import org.dromara.mechanical.jxzgbh.service.IJxYhzgbhService; @@ -73,12 +71,12 @@ public class JxYhzgbhServiceImpl extends ServiceImpl i // 回填整改数据 List jxZgxxes = jxZgxxService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(JxZgxx::getMasterId, jxYhzgbhVo.getId())); if (jxZgxxes != null){ - jxYhzgbhVo.setZgxxList(jxZgxxes); + jxYhzgbhVo.setZgxxList(MapstructUtils.convert(jxZgxxes, JxZgxxVo.class)); } // 回填复查数据 List jxFcxxes = jxFcxxService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(JxFcxx::getMasterId, jxYhzgbhVo.getId())); if (jxFcxxes != null){ - jxYhzgbhVo.setFcxxList(jxFcxxes); + jxYhzgbhVo.setFcxxList(MapstructUtils.convert(jxFcxxes, JxFcxxVo.class)); } // 问题详情 List jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(JxAqjcglWtxq::getMasterId, jxYhzgbhVo.getMasterId())); @@ -194,6 +192,7 @@ public class JxYhzgbhServiceImpl extends ServiceImpl i jxZgxxHeadVo.setZs(Long.valueOf(jxYhzgbhs.size())); jxZgxxHeadVo.setYzg(jxYhzgbhs.stream().filter(jxYhzgbh -> jxYhzgbh.getAbarbeitungState().equals("2")).count()); jxZgxxHeadVo.setWzg(jxYhzgbhs.stream().filter(jxYhzgbh -> jxYhzgbh.getAbarbeitungState().equals("1")).count()); + jxZgxxHeadVo.setYbh(jxYhzgbhs.stream().filter(jxYhzgbh -> jxYhzgbh.getReviewState().equals("1")).count()); } return jxZgxxHeadVo; }