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

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

Browse Source
This commit is contained in:
gaojiabao
2023-06-19 13:45:15 +08:00
parent 11c1a29710 bb6ad10c5a
commit d584481550
2 changed files with 21 additions and 22 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
-22
View File
@@ -480,30 +480,8 @@ public class ActSarItemsBussEOService {
sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser);
} else {//标准号、ID都不存在的情况
// 新增方法
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() +"已存在");
}
}
}
sarBussionessStand.setPrcCreateUser(prcCreateUser);
sarBussionessStand.setReplaceStandNum(DTQBBHBUSS);
// 根据标准号判断数据是否已存在
// QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
// queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
// .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
// Integer count = iSarBussionessStandService.count(queryWrapper);
// if (count > 0){
// throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
// }
//制定和修订类型 清除历史版本
JSONObject atteObj = JSON.parseObject(sarBussionessStand.getSarStandAttrEOStr());
atteObj.remove("LSBBBUSS");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+21
View File
@@ -734,5 +734,26 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
public ResponseMessage repeal(String id,String type){
return sarBussionessStandEOService.repeal(id,type);
}
@ApiOperation(value = "企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验")
@PostMapping("/ifStandCodebyStandName")
public ResponseMessage ifStandCodebyStandName(String standCode,String standName){
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(standCode != null,"STAND_CODE",standCode)
.eq(standName != null,"STAND_NAME",standName);
List<SarBussionessStand> list = sarBussionessStandEOService.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("企标标准号"+ standCode +"和企标名称"+ standName +"已存在");
return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在");
}
}
}
return Result.success("校验通过");
}
}