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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
liyawei
2022-11-03 18:53:33 +08:00
parent 2883eb1418 2e2525d68e
commit 2fbdb94c34
4 changed files with 16 additions and 15 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
+1 -1
View File
@@ -207,7 +207,7 @@ public class ActSarItemsBussEOService {
String id = list.get(0).getId(); String id = list.get(0).getId();
Date date = new Date(); Date date = new Date();
String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+"创建了《"+ esName +"》,其计划结果为复审"; +"通过复审流程创建了《"+ esName +"》,其复审结果为修订。";
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
}else{ }else{
if("1".equals(reviewResults)) { // 修订时才生成企标计划 if("1".equals(reviewResults)) { // 修订时才生成企标计划
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
String msg; String msg;
if ("复审".equals(esRevisePlan.getLogType())) { if ("复审".equals(esRevisePlan.getLogType())) {
msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+"创建了《"+ esName +"》,其计划结果为复审"; +"通过复审流程创建了《"+ esName +"》,其复审结果为修订。";
} else { } else {
msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+"创建了《"+ esName +"》"; +"创建了《"+ esName +"》";
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -1
View File
@@ -883,7 +883,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
wrapper .eq("STAND_TYPE",page.getStandType()) wrapper .eq("STAND_TYPE",page.getStandType())
.eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort()) .eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort())
.eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber()) .eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber())
.eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()); .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0);
Integer s=sarStandardsInfoEOService.count(wrapper); Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){ if (s>0){
return Result.error(); return Result.error();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+13 -12
View File
@@ -3041,9 +3041,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
QueryWrapper<SarMenuStandard> wrapper=new QueryWrapper<>(); QueryWrapper<SarMenuStandard> wrapper=new QueryWrapper<>();
wrapper.in("MENU_NAME",sarStandardsInfoEO.getStandSystem()); wrapper.in("MENU_NAME",sarStandardsInfoEO.getStandSystem());
wrapper.eq("DIC_ID","wnt12e6n258qkqgcl742");
wrapper.orderByDesc("length(PARENT_IDS)"); wrapper.orderByDesc("length(PARENT_IDS)");
List<SarMenuStandard> standards=iSarMenuStandardService.list(wrapper); List<SarMenuStandard> standards=iSarMenuStandardService.list(wrapper);
if (null!=standards && standards.size()>0) { if (null!=standards && standards.size() == 1) {
List<String> ids=new ArrayList<>(); List<String> ids=new ArrayList<>();
if (StringUtils.isNotBlank(standards.get(0).getParentIds())){ if (StringUtils.isNotBlank(standards.get(0).getParentIds())){
if (standards.get(0).getParentIds().contains(",")){ if (standards.get(0).getParentIds().contains(",")){
@@ -3051,18 +3052,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}else { }else {
ids.add(standards.get(0).getParentIds()); ids.add(standards.get(0).getParentIds());
} }
} QueryWrapper<SarMenuStandard> wrapper1 = new QueryWrapper<>();
QueryWrapper<SarMenuStandard> wrapper1 = new QueryWrapper<>(); wrapper1.in("id", ids);
wrapper1.in("id", ids); List<SarMenuStandard> res = iSarMenuStandardService.list(wrapper1);
List<SarMenuStandard> res = iSarMenuStandardService.list(wrapper1); if (null!=res && res.size()>0){
if (null!=res && res.size()>0){ Map<String,String> map=new HashMap<>();
Map<String,String> map=new HashMap<>(); res.forEach(sarMenuStandard -> {map.put(sarMenuStandard.getId(),sarMenuStandard.getMenuName());});
res.forEach(sarMenuStandard -> {map.put(sarMenuStandard.getId(),sarMenuStandard.getMenuName());}); String result="";
String result=""; for (String s:ids) {
for (String s:ids) { result +="/"+map.get(s);
result +="/"+map.get(s); }
sarStandardsInfoEO.setStandSystem(result.substring(1,result.length()));
} }
sarStandardsInfoEO.setStandSystem(result.substring(1,result.length()));
} }
} }