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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-04-06 03:44:49 +08:00
parent d5d1884d38 291604a9bf
commit a7dafb3cf8
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+23 -7
View File
@@ -391,6 +391,22 @@ public class ActSarItemsBussEOService {
if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){
standCode = sarBussionessStand.getStandCode(); standCode = sarBussionessStand.getStandCode();
} }
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
Integer valIdFlag = 0;
for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){
logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
}
}
}
List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode);
// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); // sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
@@ -465,13 +481,13 @@ public class ActSarItemsBussEOService {
// 新增方法 // 新增方法
sarBussionessStand.setPrcCreateUser(prcCreateUser); sarBussionessStand.setPrcCreateUser(prcCreateUser);
// 根据标准号判断数据是否已存在 // 根据标准号判断数据是否已存在
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>(); // QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) // queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); // .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
Integer count = iSarBussionessStandService.count(queryWrapper); // Integer count = iSarBussionessStandService.count(queryWrapper);
if (count > 0){ // if (count > 0){
throw new AdcDaBaseException("当前企标标准号和企标名称已存在"); // throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
} // }
ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
if(responseMessage.isOk()){ if(responseMessage.isOk()){
SarBussionessStand bussionessStand = responseMessage.getData(); SarBussionessStand bussionessStand = responseMessage.getData();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+2 -2
View File
@@ -2425,12 +2425,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String qcrbuss = rowList.get("起草人"); String qcrbuss = rowList.get("起草人");
if (StringUtils.isNotBlank(qcrbuss)){
String[] split3 = qcrbuss.split(","); String[] split3 = qcrbuss.split(",");
String account = ""; String account = "";
String str = ""; String str = "";
String qcr = ""; String qcr = "";
String qcrs = ""; String qcrs = "";
if (StringUtils.isNotBlank(qcrbuss)){
for (int j = 0; j < split3.length; j++) { for (int j = 0; j < split3.length; j++) {
str = split3[j]; str = split3[j];
account = tsUserDao.selectByAccount(str); account = tsUserDao.selectByAccount(str);
@@ -2776,7 +2776,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} catch (Exception e) { } catch (Exception e) {
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
return Result.error("导入失败,需要导入的数据有问题或导入的企标标号或企标名称重复"); return Result.error("导入失败,需要导入的数据有问题或导入的企标标号和企标名称已存在");
} }
} }
} }