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 02c61b5b..931faa89 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.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.common.EmailUtils; +import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; @@ -96,6 +98,9 @@ public class WorkFlowController { @Autowired private TsInstitutionDao tsInstitutionDao; + @Autowired + private DicTypeEODao dicTypeEODao; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -1128,23 +1133,19 @@ public class WorkFlowController { qbfsForm.put("isRelate",data.getIsRelate()); qbfsForm.put("useLevel",data.getUseLevel()); - String useLevelNameStr = ""; if(StringUtils.isNotBlank(data.getUseLevel())){ - String[] split = data.getUseLevel().split(","); - List asList = Arrays.asList(split); - for (String uid: asList){ - TsUser byIdUseLevel = userService.getById(uid); - if(StringUtils.isBlank(useLevelNameStr)){ - useLevelNameStr = byIdUseLevel.getUname(); - }else { - useLevelNameStr = useLevelNameStr+","+byIdUseLevel.getUname(); - } - } - } - if(StringUtils.isNotBlank(useLevelNameStr)){ - qbfsForm.put("useLevelName",useLevelNameStr); + List dicTypeEOS = dicTypeEODao.selectDic("VBERTFDGGF"); + if(!dicTypeEOS.isEmpty()) { + for (DicTypeEO dicInfo:dicTypeEOS) { + if(data.getUseLevel().equals(dicInfo.getDicTypeCode())){ + qbfsForm.put("useLevelName",dicInfo.getDicTypeName()); + } + } + } + } + qbfsForm.put("technologic",data.getTechnologic()); qbfsForm.put("bussSort",data.getBussSort()); qbfsForm.put("lxdName",""); diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 179c58eb..1eefefbd 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,7 @@ -- 福田 需要通过第三方调用的接口 + + -- 2023-04-18 -- 名称 通过pid删除OA待办任务 -- 详情