feature 解决生成的隐患任务无法正确显示的问题

js-common/src/main/java/com/rongwei/safecommon/utils/JSCommonUtils.java

@@ -34,7 +34,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.time.*;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.function.BooleanSupplier;
@@ -356,14 +357,15 @@ public class JSCommonUtils {
     }
 
     public static <T extends BaseDo> void setBaseDetail(T t, SysUserDo userVo) {
+        if (userVo == null) {
+            userVo = getCurrentUser();
+        }
         t.setCreatedate(new Date());
         t.setModifydate(new Date());
-        if (userVo != null) {
-            t.setCreateuserid(userVo.getId());
-            t.setCreateusername(userVo.getName());
-            t.setModifyuserid(userVo.getId());
-            t.setModifyusername(userVo.getName());
-        }
+        t.setCreateuserid(userVo.getId());
+        t.setCreateusername(userVo.getName());
+        t.setModifyuserid(userVo.getId());
+        t.setModifyusername(userVo.getName());
         t.setDeleted("0");
     }
 
@@ -399,16 +401,16 @@ public class JSCommonUtils {
         LocalDate localEndDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         switch (unit) {
             case SaveConstans.INSPECTION_CYCLE_UNIT.HOUR: // 小时
-                returnNum=(int)DateUtil.between(startDate,endDate, DateUnit.HOUR);
+                returnNum = (int) DateUtil.between(startDate, endDate, DateUnit.HOUR);
                 break;
             case SaveConstans.INSPECTION_CYCLE_UNIT.DAY: //天
-                returnNum= (int) DateUtil.between(startDate,endDate, DateUnit.DAY);
+                returnNum = (int) DateUtil.between(startDate, endDate, DateUnit.DAY);
                 break;
             case SaveConstans.INSPECTION_CYCLE_UNIT.MONTH: // 月
-                returnNum= (int) ChronoUnit.MONTHS.between(localStartDate,localEndDate);
+                returnNum = (int) ChronoUnit.MONTHS.between(localStartDate, localEndDate);
                 break;
             case SaveConstans.INSPECTION_CYCLE_UNIT.YEAR: // 年
-                returnNum= (int) ChronoUnit.YEARS.between(localStartDate,localEndDate);
+                returnNum = (int) ChronoUnit.YEARS.between(localStartDate, localEndDate);
                 break;
             default:
                 log.error("单位异常");
@@ -416,6 +418,7 @@ public class JSCommonUtils {
         }
         return returnNum;
     }
+
     @PostConstruct
     public void info() {
         redisService = autoRedisService;

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsDetailsHazardInvestigationTasksServiceImpl.java

@@ -9,6 +9,7 @@ import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
+import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.ApsDetailsHazardInvestigationTasksDao;
 import com.rongwei.sfcommon.sys.service.ApsDetailsHazardInvestigationTasksService;
 
@@ -87,6 +88,7 @@ implements ApsDetailsHazardInvestigationTasksService {
         aspCheckDiscoveryItemDos.forEach(info -> {
             HiddenDangerTrackDo hiddenDangerTrack = new HiddenDangerTrackDo();
             hiddenDangerTrack.setId(SecurityUtil.getUUID());
+            hiddenDangerTrack.setTenantid(apsDetailsHazardInvestigationTasksDo.getTenantid());
             //风险分析对象编码
             hiddenDangerTrack.setRiskanalysisobjectcode(apsDetailsHazardInvestigationTasksDo.getRiskanalysisobjectcode());
             //隐患等级hazardlevel
@@ -116,14 +118,7 @@ implements ApsDetailsHazardInvestigationTasksService {
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
             //检查任务id
             hiddenDangerTrack.setCheckid(info.getId());
-            //创建人
-            hiddenDangerTrack.setCreateusername(info.getModifyusername());
-            hiddenDangerTrack.setCreateuserid(info.getModifyuserid());
-            hiddenDangerTrack.setModifyusername(info.getModifyusername());
-            hiddenDangerTrack.setModifyuserid(info.getModifyuserid());
-            hiddenDangerTrack.setModifydate(new Date());
-            //创建时间当前时间
-            hiddenDangerTrack.setCreatedate(new Date());
+            JSCommonUtils.setBaseDetail(hiddenDangerTrack,null);
             //隐患图片
             hiddenDangerTrack.setHazardphoto(info.getFileinfo());
             addList.add(hiddenDangerTrack);