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

feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-29 15:31:50 +08:00
parent e42500f3c4
commit 20d23a427e
13 changed files with 124 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java
+1 -2
View File
@@ -33,8 +33,7 @@ public class ActSarItemsPlanController {
@PostMapping("/processCreatePlan")
public ResponseMessage processCreatePlan(String infoJson) throws Exception {
if (StringUtils.isNotBlank(infoJson)) {
actSarItemsEOService.processCreatePlan(infoJson);
return Result.success("入库成功");
return Result.success("200","入库成功",actSarItemsEOService.processCreatePlan(infoJson));
} else {
return Result.error("传入数据json不能为空");
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+8 -4
View File
@@ -11,6 +11,7 @@ import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService;
import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao;
import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
@@ -88,6 +89,9 @@ public class ActSarItemsBussEOService {
@Autowired
IEsRevisePlanService iEsRevisePlanService;
@Autowired
private EsRevisePlanDao esRevisePlanDao;
@Autowired
private ISarBussionessStandStateService bussionessStandStateService;
@@ -181,10 +185,10 @@ public class ActSarItemsBussEOService {
esRevisePlanDTO.setRqbName(DTQBBHBUSS);
esRevisePlanDTO.setLxd(LXD);
QueryWrapper qw = new QueryWrapper();
qw.eq("es_name",standName);
qw.eq("buss_sort",standSort);
List<EsRevisePlan> list = iEsRevisePlanService.list(qw);
EsRevisePlan qw = new EsRevisePlan();
qw.setEsName(standName);
qw.setBussSort(standSort);
List<EsRevisePlan> list = esRevisePlanDao.selectPageByName(qw);
if(!list.isEmpty()){
esRevisePlanDTO.setId(list.get(0).getId());
iEsRevisePlanService.updateById(esRevisePlanDTO);
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java
+19 -7
View File
@@ -1,7 +1,9 @@
package com.adc.da.workFlow.service;
import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.util.UUIDUtils;
import com.adc.da.workFlow.dao.ActSarItemsEODao;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -28,13 +30,17 @@ public class ActSarItemsPlanService {
@Autowired
private IEsRevisePlanService iEsRevisePlanService;
@Autowired
private EsRevisePlanDao esRevisePlanDao;
@Value("${elas.flag}")
private boolean elasflag;
public void processCreatePlan(String standJson) throws Exception{
public String processCreatePlan(String standJson) throws Exception{
JSONObject object = new JSONObject();
object = JSONObject.parseObject(standJson);
String id = "";
if (object != null && !object.isEmpty()) {
Map<String,String> plan_status=new HashMap<>();
plan_status.put("未开始","0");
@@ -59,20 +65,26 @@ public class ActSarItemsPlanService {
esRevisePlanDTO.setReleaseTime(object.getDate("planTime"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
if(StringUtils.isNotBlank(object.getString("esName")) && StringUtils.isNotBlank(object.getString("bussSort"))){
QueryWrapper qw = new QueryWrapper();
qw.eq("es_name",object.getString("esName"));
qw.eq("buss_sort",object.getString("bussSort"));
List<EsRevisePlan> list = iEsRevisePlanService.list(qw);
EsRevisePlan qw = new EsRevisePlan();
qw.setEsName(object.getString("esName"));
qw.setBussSort(object.getString("bussSort"));
List<EsRevisePlan> list = esRevisePlanDao.selectPageByName(qw);
if(!list.isEmpty()){
id = list.get(0).getId();
esRevisePlanDTO.setId(list.get(0).getId());
iEsRevisePlanService.updateById(esRevisePlanDTO);
}else{
iEsRevisePlanService.addPlan(esRevisePlanDTO);
id = UUIDUtils.randomUUID(32);
esRevisePlanDTO.setId(id);
esRevisePlanDao.insertOne(esRevisePlanDTO);
}
}else {
iEsRevisePlanService.addPlan(esRevisePlanDTO);
id = UUIDUtils.randomUUID(32);
esRevisePlanDTO.setId(id);
esRevisePlanDao.insertOne(esRevisePlanDTO);
}
}
return id;
}
}