Forráskód Böngészése

【CHG】增加下次实验日期默认值

ZhaoMn 3 éve
szülő
commit
3be35dcf7a

+ 7 - 3
railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledServiceImpl.java

@@ -78,7 +78,11 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
       // 更新工具下次实验时间
       BaseSafetyTool tool = new BaseSafetyTool();
       tool.setToolId(t.getToolId());
-      tool.setNextTestDate(scheduled.getScheduledTime());
+      if (null == scheduled.getScheduledTime()) {
+        tool.setNextTestDate(new Date());
+      } else {
+        tool.setNextTestDate(scheduled.getScheduledTime());
+      }
       safetyToolMapper.update(tool);
     }
     return scheduled.getId();
@@ -122,7 +126,7 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
    */
   @Override
   public List<SecScheduledCountVo> getList(SecScheduledListParmVo secScheduled) {
-    if(!SecurityUtils.isAdmin()){
+    if (!SecurityUtils.isAdmin()) {
       secScheduled.setDeptId(SecurityUtils.getDeptId());
     }
     List<SecScheduledCountVo> r = secScheduledMapper.getList(secScheduled);
@@ -163,7 +167,7 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
 
     if (secScheduledToolMapper.check(secScheduledTool) == 0) {
       int ret = secScheduledToolMapper.insert(secScheduledTool);
-      if(ret > 0){
+      if (ret > 0) {
         // 更新工具下次实验时间
         safetyTool.setNextTestDate(scheduled.getScheduledTime());
         safetyToolMapper.update(safetyTool);