feature 增加相关业务逻辑

safe-check/save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SaveCheckItemServiceImpl.java

@@ -138,8 +138,8 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             //隐患来源 检查录入
             hiddenDangerTrack.setDangersource(MlConstants.DANGER_SOURCE_THEMECHECK);
             hiddenDangerTrack.setRelationid(checkItemDo.getId());
-            hiddenDangerTrack.setFinduser(checkItemDo.getGroupleader());
-            hiddenDangerTrack.setFindusername(checkItemDo.getGroupleadername());
+            hiddenDangerTrack.setFinduser(info.getFinduser());
+            hiddenDangerTrack.setFindusername(info.getFindusername());
             hiddenDangerTrack.setFindtime(checkItemDo.getActualchecktime());
             hiddenDangerTrack.setStatus(MlConstants.HIDDEN_DANGER_STATUS_NOTCLOSE);
             // 总编号生成
@@ -147,8 +147,8 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             sysSerialVo.setRuleTemplateStr("@{date:yyyyMMdd}@{serialNumber:#000000}");
             sysSerialVo.setModulecode("asp_hidden_danger_track_CODE");
             hiddenDangerTrack.setCode(sysSerialNumberService.getCodeByTemplate(sysSerialVo));
-            hiddenDangerTrack.setDangerworkpark(String.format(DANGER_WORKPARK, emptyStrReplace(info.getDeptid()), emptyStrReplace(info.getSectionid())));
-            hiddenDangerTrack.setDangerworkparkname(String.format(DANGER_WORKPARK, emptyStrReplace(info.getDept()), emptyStrReplace(info.getSection())));
+            hiddenDangerTrack.setDangerworkpark(emptyStrReplace(info.getDeptid()));
+            hiddenDangerTrack.setDangerworkparkname(emptyStrReplace(info.getDept()));
             hiddenDangerTrack.setHiddendangertype(info.getType());
             hiddenDangerTrack.setHiddendangerclassify(info.getClassification());
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
@@ -162,6 +162,12 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             hiddenDangerTrack.setCreateusername("日常检查自动生成");
             hiddenDangerTrack.setModifyusername("日常检查自动生成");
             hiddenDangerTrack.setModifydate(new Date());
+            hiddenDangerTrack.setThemecheckid(themeCheck.getChecktemplateid());
+            hiddenDangerTrack.setThemecheckname(themeCheck.getChecktheme());
+            hiddenDangerTrack.setWorkshop(emptyStrReplace(info.getSection()));
+            hiddenDangerTrack.setWorkshopid(emptyStrReplace(info.getSectionid()));
+            hiddenDangerTrack.setRectificationfund(info.getRectificationfund());
+            hiddenDangerTrack.setMeasure(info.getMeasure());
             UserMailOrgVo userMailOrgVo = safetyPromoter.stream().filter(data -> data.getOrgId().equals(info.getDeptid())).findFirst().orElse(null);
             if (userMailOrgVo == null) {
                 hiddenDangerTrack.setSafetypromoter(safetyManager == null ? "" : safetyManager.getName());

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AspCheckDiscoveryItemDo.java

@@ -1,12 +1,13 @@
 package com.rongwe.scentity.domian;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * asp_check_discovery_item
  * @author 
@@ -89,6 +90,26 @@ public class AspCheckDiscoveryItemDo extends BaseDo implements Serializable {
      */
     private String roption;
 
+    /**
+     * 下标
+     */
+    private int indexnum;
+    /**
+     * 整改资金
+     */
+    private BigDecimal rectificationfund;
+    /**
+     * 发现人
+     */
+    private String findusername;
+    /**
+     * 发现人ID
+     */
+    private String finduser;
+    /**
+     * 整改措施
+     */
+    private String measure;
 
     private static final long serialVersionUID = 1L;
 }

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/HiddenDangerTrackDo.java

@@ -6,6 +6,7 @@ import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -137,6 +138,41 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
 	 * 发现项ID
 	 */
 	private String discoveryitemid;
-
+	/**
+	 * 主题检查ID
+	 */
+	private String themecheckid;
+	/**
+	 * 主题检查名称
+	 */
+	private String themecheckname;
+	/**
+	 * 实际检查日期
+	 */
+	private Date actualchecktime;
+	/**
+	 * 车间
+	 */
+	private String workshop;
+	/**
+	 * 车间ID
+	 */
+	private String workshopid;
+	/**
+	 * 整改资金
+	 */
+	private BigDecimal rectificationfund;
+	/**
+	 * 整改措施
+	 */
+	private String measure;
+	/**
+	 * 车间促进员
+	 */
+	private String shopfacilitator;
+	/**
+	 * 车间促进员ID
+	 */
+	private String shopfacilitatorid;
 
 }

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckItemDo.java

@@ -126,5 +126,12 @@ public class ThemeCheckItemDo extends BaseDo implements Serializable {
 	 * 是否已保存
 	 */
 	private String saved;
-
+	/**
+	 * 检查人
+	 */
+	private String checker;
+	/**
+	 * 检查人ID
+	 */
+	private String checkerid;
 }