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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!57
This commit is contained in:
高嵩
2023-04-19 19:25:26 +08:00
parent 85e156e79d 35f79bd189
commit 9f6f307bc0
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+36 -17
View File
@@ -23,6 +23,8 @@ import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -38,6 +40,7 @@ import com.adc.da.workFlow.entity.*;
import com.adc.da.workFlow.service.WorkFlowService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import oracle.ucp.proxy.annotation.Post;
@@ -112,6 +115,9 @@ public class WorkFlowController {
@Autowired
private AttFileEOServiceImpl attFileEOService;
@Autowired
private ISarBussionessStandService sarBussionessStandEOService;
// @Autowired
// private ExportExcelMapper exportExcelMapper;
@@ -1064,9 +1070,9 @@ public class WorkFlowController {
for (String uid:asList){
TsUser byIdDrafterInfo = userService.getById(uid);
if(StringUtils.isBlank(drafterNameStr)){
drafterNameStr = byIdDrafterInfo.getUname();
drafterNameStr = byIdDrafterInfo.getUname()+"("+byIdDrafterInfo.getUserId()+")";
}else {
drafterNameStr = drafterNameStr+","+byIdDrafterInfo.getUname();
drafterNameStr = drafterNameStr+","+byIdDrafterInfo.getUname()+"("+byIdDrafterInfo.getUserId()+")";
}
}
}
@@ -1082,9 +1088,9 @@ public class WorkFlowController {
for (String uid:asList){
TsUser byIdDrafterInfo = userService.getById(uid);
if(StringUtils.isBlank(resPersonNameStr)){
resPersonNameStr = byIdDrafterInfo.getUname();
resPersonNameStr = byIdDrafterInfo.getUname()+"("+byIdDrafterInfo.getUserId()+")";
}else {
resPersonNameStr = resPersonNameStr+","+byIdDrafterInfo.getUname();
resPersonNameStr = resPersonNameStr+","+byIdDrafterInfo.getUname()+"("+byIdDrafterInfo.getUserId()+")";
}
}
}
@@ -1099,7 +1105,6 @@ public class WorkFlowController {
}
}
qbfsForm.put("wgLeader",wgLeaderStr);
String wgLeaderNameStr = "";
if(StringUtils.isNotBlank(data.getWgLeader())){
String[] split = data.getWgLeader().split(",");
@@ -1107,9 +1112,9 @@ public class WorkFlowController {
for (String uid : asList){
TsUser byIdWgleader = userService.getById(uid);
if(StringUtils.isBlank(wgLeaderNameStr)){
wgLeaderNameStr = byIdWgleader.getUname();
wgLeaderNameStr = byIdWgleader.getUname()+"("+byIdWgleader.getUserId()+")";
}else {
wgLeaderNameStr = wgLeaderNameStr+","+byIdWgleader.getUname();
wgLeaderNameStr = wgLeaderNameStr+","+byIdWgleader.getUname()+"("+byIdWgleader.getUserId()+")";
}
}
}
@@ -1132,7 +1137,15 @@ public class WorkFlowController {
}
qbfsForm.put("rqbJson",data.getRqbJson());
qbfsForm.put("rqbName",data.getRqbName());
if(StringUtils.isNotBlank(data.getRqbJson())){
String rqbJson = data.getRqbJson();
QueryWrapper<SarBussionessStand> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("ID",data.getRqbJson());
List<SarBussionessStand> list = sarBussionessStandEOService.list(objectQueryWrapper);
if(!list.isEmpty()){
qbfsForm.put("rqbName",list.get(0).getStandCode());
}
}
if(StringUtils.isNotBlank(data.getRqbJson())){
//通过id去找到代替标准号
String fbgBuss ="";
@@ -1152,23 +1165,29 @@ public class WorkFlowController {
}
if(StringUtils.isNotBlank(fbgBussName)){
fbgBussName = fbgBussName+","+fileInfo.getId();
fbgBussName = fbgBussName+","+fileInfo.getOldFileName();
}else {
fbgBussName = fileInfo.getId();
fbgBussName = fileInfo.getOldFileName();
}
}
}
}
qbfsForm.put("LSBBBUSS",objects);
qbfsForm.put("LSBBBUSSName",objects);
qbfsForm.put("LSBBBUSS",fbgBuss);
qbfsForm.put("LSBBBUSSName",fbgBussName);
}
//qbfsForm.put("fbgbussName","");
qbfsForm.put("rqbCode",data.getRqbCode());
qbfsForm.put("tsJson",data.getTsJson());
qbfsForm.put("tsJsonName",data.getTsJsonName());
qbfsForm.put("area",data.getArea());
qbfsForm.put("areaName",data.getAreaName());
if(StringUtils.isNotBlank(data.getArea())){
String[] split = data.getArea().split(",");
qbfsForm.put("area",split);
qbfsForm.put("areaName",split);
}
qbfsForm.put("standType",data.getStandType());
qbfsForm.put("standNum",data.getStandNum());
qbfsForm.put("esMatingRelations",data.getEsMatingRelations());
@@ -1191,9 +1210,9 @@ public class WorkFlowController {
qbfsForm.put("technologic",data.getTechnologic());
qbfsForm.put("bussSort",data.getBussSort());
qbfsForm.put("lxdName","");
qbfsForm.put("lxd",data.getLxd());
qbfsForm.put("LXD",data.getLxd());
qbfsForm.put("lxdName","立项单");
qbfsForm.put("lxd","");
qbfsForm.put("LXD","");
qbfsForm.put("LXDName","");
qbfsForm.put("addFlag","1");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+2 -2
View File
@@ -381,9 +381,9 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
}
if(StringUtils.isNotBlank(fbgBussName)){
fbgBussName = fbgBussName+","+fileInfo.getId();
fbgBussName = fbgBussName+","+fileInfo.getOldFileName();
}else {
fbgBussName = fileInfo.getId();
fbgBussName = fileInfo.getOldFileName();
}
}