From 665b382102749598b1af32c78df8bee829db2b43 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 18:35:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/controller/WorkFlowController.java | 8 ++++---- .../controller/SarBussionessStandController.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 8fcb78f4..1525d9a9 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1152,16 +1152,16 @@ 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()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index b1b008cc..849fc1f6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -381,9 +381,9 @@ public class SarBussionessStandController extends BaseController Date: Wed, 19 Apr 2023 19:24:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 1525d9a9..fabde358 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -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 objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("ID",data.getRqbJson()); + List list = sarBussionessStandEOService.list(objectQueryWrapper); + if(!list.isEmpty()){ + qbfsForm.put("rqbName",list.get(0).getStandCode()); + } + } if(StringUtils.isNotBlank(data.getRqbJson())){ //通过id去找到代替标准号 String fbgBuss =""; @@ -1167,8 +1180,14 @@ public class WorkFlowController { 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");