FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
feat: 入库流程 属性字段对应

See merge request !20
This commit is contained in:
super_liu
2021-07-10 07:52:58 +00:00
parent a535f138d9 48933b44dc
commit 4cf827998b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3 -3
View File
@@ -365,9 +365,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
//编写预警信息
// writeWarnings(sarStandardsInfoEO);
updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");
updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
updateRelateStand(sarStandardsInfoEO, "CBBH");
// updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");
// updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
// updateRelateStand(sarStandardsInfoEO, "CBBH");
// 根据代替标准号修改被代替的标准的状态 修改为已修订状态
replaseStandState(sarStandardsInfoEO);
// 处理属性表信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+1 -1
View File
@@ -257,7 +257,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
sarUpdLogEO.setSarId(sarId);
sarUpdLogEO.setSarType(sarType);
sarUpdLogEO.setCreationTime(new Date());
sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId());
sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId() == null ? "" : LoginUserUtil.getUserId());
sarUpdLogEO.setContent(content);
dao.insert(sarUpdLogEO);
}