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

Revert "Revert "Merge branch 'fix_foton_20231031' into 'dev_20230829_change'""

Browse Source 
This reverts commit 518270aec2.
This commit is contained in:
gaosong
2023-11-20 11:58:39 +08:00
parent e29249aa49
commit 8ed946635b
5 changed files with 110 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+4
View File
@@ -53,6 +53,7 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog;
import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
import com.adc.da.slrs.sarUser.dao.TsUserDao;
import com.adc.da.slrs.sarUser.service.ITsUserService;
@@ -347,6 +348,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}
// 添加删除记录
String content = "标准号：" + sarBussionessStand.getStandCode() + "《"+ sarBussionessStand.getStandName() + "》" + "删除成功";
sarUpdLogEOService.createBaseLog(id,"BUSINESS",content);
if(elasflag) {
//删除成功后，将索引中对应数据删除
StandLawsEO standLawsEO = new StandLawsEO();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+14
View File
@@ -2318,6 +2318,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
personCollectEODao.deleteByResId(id);
// 删除分享表中数据
personShareEODao.deleteByResId(id);
// 添加删除记录
String standCode = getDelStandInfoList.getStandSort() + " " + getDelStandInfoList.getStandNumber() + "-" + getDelStandInfoList.getStandYear();
String content = "标准号：" + standCode + "《"+ getDelStandInfoList.getStandName() + "》" + "删除成功";
try {
if ("INLAND".equals(getDelStandInfoList.getStandType())) {
sarUpdLogEOService.createBaseLog(id,"INLAND_STAND",content);
} else if ("FOREIGN".equals(getDelStandInfoList.getStandType())) {
sarUpdLogEOService.createBaseLog(id,"FOREIGN_STAND",content);
} else {
sarUpdLogEOService.createBaseLog(id,"OTHER_STAND",content);
}
} catch (Exception e) {
logger.error("添加删除记录失败", e);
}
if (elasflag) {
//删除成功后，将索引中对应数据删除
StandLawsEO standLawsEO = new StandLawsEO();