Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!263

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarPosition.entity.TsPosition;
 import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao;
 import com.adc.da.slrs.sarStandWarning.entity.WarningDate;
+import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.att.vo.AttFileVo;
@@ -125,6 +126,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Value("${file.path}")
     private String filePath;//文件存储路径
 
+    @Autowired
+    WarningDateServiceImpl warningDateService;
+
     @Autowired
     private ITsPositionService iTsPositionService;
 
@@ -1003,8 +1007,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return Pattern.matches(verifyType,str);
     }
 
-    @Autowired
-    WarningDateDao  warningDateDao;
 
 
     public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
@@ -1052,8 +1054,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
 
             if (warningDateList != null && warningDateList.size()>0){
-                warningDateDao.deleteById(standId);
-                //TODO 实施日期存表
+                QueryWrapper<WarningDate> wrapper = new QueryWrapper<>();
+                wrapper.eq("law_id",standId);
+                warningDateService.remove(wrapper);
+                warningDateService.saveBatch(warningDateList);
             }
         }
     }