待办中心，展示责任领域展示名称。

2023-03-22 09:33:15 +08:00
parent f3f10e61d4
commit 750061f7e8
4 changed files with 76 additions and 2 deletions
@@ -10,6 +10,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.vo.ProjectTaskUrgVo;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -192,4 +193,15 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 * @return
 	 */
 	String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List<ProjectLawsInventoryEO> projectLawsInventoryEOList,List<SysCategory> categoryList);
+
+	/**
+	 * 根据id获取责任领域展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param projectLawsInventoryEOList
+	 * @param sysDictItems
+	 * @param dicCode
+	 * @return
+	 */
+    String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysDictItem> sysDictItems,String dicCode);
 }
@@ -10096,5 +10096,55 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return result;
 	}

+	@Override
+	public String getDutyTerritoryNameById(String projectLawsInventoryId, String cut, List<ProjectLawsInventoryEO> projectLawsInventoryEOList, List<SysDictItem> sysDictItems,String dicCode) {
+		String result = "";
+		for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) {
+			if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){
+				String dutyTerritory = lawsInventory.getDutyTerritory();
+
+				result = disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+				/*if(StringUtils.isNotEmpty(fieldValues)){
+					List<SysDictItem> sysDictItemList = sysDictItems.stream().filter(e -> {
+						boolean flag = false;
+						if(StringUtils.equals(e.getDictCode(),dicCode)){
+							flag = true;
+						}
+						return flag;
+					}).distinct().collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(sysDictItemList)){
+						if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+							result = sysDictItemList.stream().filter(e -> {
+								boolean flag = false;
+								List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
+								for (String fieldValueStr : fieldValueStrList) {
+									if(StringUtils.equals(fieldValueStr,e.getItemValue())){
+										flag = true;
+										break;
+									}
+								}
+								return flag;
+							}).map(SysDictItem::getItemText).collect(Collectors.joining(","));
+						}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+							result = sysDictItemList.stream().filter(e -> {
+								boolean flag = false;
+								List<String> fieldValueStrList = Arrays.asList(fieldValues.split(","));
+								for (String fieldValueStr : fieldValueStrList) {
+									if(StringUtils.equals(fieldValueStr,e.getItemValue())){
+										flag = true;
+										break;
+									}
+								}
+								return flag;
+							}).map(SysDictItem::getEnName).collect(Collectors.joining(","));
+						}
+					}
+				}*/
+				break;
+			}
+		}
+		return result;
+	}
+

 }
@@ -25,11 +25,13 @@ import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
 import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum;
@@ -92,6 +94,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 	private ISysDictService sysDictService;
 	@Autowired
 	private SysCategoryServiceImpl sysCategoryService;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;

 	/**
 	 * 保存
@@ -610,13 +614,19 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 				lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList);
 				projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrapper);
 			}
-			List<SysCategory> categoryList = sysCategoryService.list();
+			List<SysCategory> categoryList = this.sysCategoryService.list();
+
+			List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll();
 			for (ProcessInfoVO data : datas) {
-				// 处理展示的交付物类型信息
 				if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+					// 处理展示的交付物类型信息
 					String projectLawsInventoryId = data.getProjectLawsInventoryId();
 					String deliverableTypeName = this.projectLawsInventoryEOService.getDeliverableTypeNameById(projectLawsInventoryId,cut,data.getFlowType(),projectLawsInventoryEOList,categoryList);
 					data.setDeliverableTypeName(deliverableTypeName);
+
+					// 处理责任领域展示信息
+					String dutyTerritoryName = this.projectLawsInventoryEOService.getDutyTerritoryNameById(projectLawsInventoryId,cut,projectLawsInventoryEOList,sysDictItems,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+					data.setDutyTerritoryName(dutyTerritoryName);
 				}
 			}
 			datas.forEach(data -> {
@@ -116,4 +116,6 @@ public class ProcessInfoVO implements Serializable {

    /**交付物类型展示名称**/
    private String deliverableTypeName;
+    /**责任领域展示抿成**/
+    private String dutyTerritoryName;
 }