机械安全模块修改

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;
+
     /**
      * 复查日期
      */

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<JxZgxx> zgxxList;
+    private List<JxZgxxVo> zgxxList;
     /**
      * 复查信息
      */
-    private List<JxFcxx> fcxxList;
+    private List<JxFcxxVo> fcxxList;
 
 
     /**

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;
+
+
 }

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;
+
     /**
      * 整改开始日期
      */

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.*;
-import org.dromara.mechanical.jxzgbh.domain.vo.JxZgxxOrFcxxVo;
 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<JxYhzgbhMapper, JxYhzgbh> i
             //        回填整改数据
             List<JxZgxx> jxZgxxes = jxZgxxService.getBaseMapper().selectList(new LambdaQueryWrapper<JxZgxx>().eq(JxZgxx::getMasterId, jxYhzgbhVo.getId()));
             if (jxZgxxes != null){
-                jxYhzgbhVo.setZgxxList(jxZgxxes);
+                jxYhzgbhVo.setZgxxList(MapstructUtils.convert(jxZgxxes, JxZgxxVo.class));
             }
             //        回填复查数据
             List<JxFcxx> jxFcxxes = jxFcxxService.getBaseMapper().selectList(new LambdaQueryWrapper<JxFcxx>().eq(JxFcxx::getMasterId, jxYhzgbhVo.getId()));
             if (jxFcxxes != null){
-                jxYhzgbhVo.setFcxxList(jxFcxxes);
+                jxYhzgbhVo.setFcxxList(MapstructUtils.convert(jxFcxxes, JxFcxxVo.class));
             }
 //            问题详情
             List<JxAqjcglWtxq> jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper<JxAqjcglWtxq>().eq(JxAqjcglWtxq::getMasterId, jxYhzgbhVo.getMasterId()));
@@ -194,6 +192,7 @@ public class JxYhzgbhServiceImpl extends ServiceImpl<JxYhzgbhMapper, JxYhzgbh> 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;
     }