修改法规清单人员变更发消息

2023-08-03 20:31:40 +08:00
parent d96683b1c5
commit f19f387c90
27 changed files with 3429 additions and 2937 deletions
@@ -686,4 +686,16 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> batchEditDeadline(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
 		return this.paramsCollectManifestEOService.batchEditDeadline(paramsCollectManifestVO);
 	}
+
+
+
+	/**
+	 *  查询本清单所有责任领域
+	 */
+	@AutoLog(value = "参数项收集清单-查询本清单所有责任领域")
+	@ApiOperation(value="参数项收集清单-查询本清单所有责任领域", notes="参数项收集清单-查询本清单所有责任领域")
+	@GetMapping(value = "/queryDutyTerritory")
+	public Result<?> queryDutyTerritory(@RequestParam(name="id",required=true) String id) {
+		return this.paramsCollectManifestEOService.queryDutyTerritory(id);
+	}
 }
@@ -38,4 +38,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
    List<ParamsCollectManifestEO> queryByProjectId(@Param("projectId") String projectId);

    List<ParamsCollectManifestEO> getList(@Param("params") Map<String, Object> params);
+
+    List<String> queryDutyTerritory(@Param("paramsManifestId") String paramsManifestId);
+
+
 }
@@ -156,4 +156,8 @@
        SELECT id,params_manifest_id,state,control_type FROM params_collect_manifest
    </select>

+    <select id="queryDutyTerritory" resultType="java.lang.String">
+        SELECT duty_territory FROM params_collect_manifest WHERE params_manifest_id = #{paramsManifestId} GROUP BY duty_territory
+    </select>
+
 </mapper>
@@ -202,4 +202,6 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
    Result<?> batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO);

    List<ParamsCollectManifestEO> getList(Map<String,Object> params);
+
+	Result<?> queryDutyTerritory(String id);
 }
@@ -7404,4 +7404,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
        List<ParamsCollectManifestEO> result = this.baseMapper.getList(params);
        return result;
    }
+
+    @Override
+    public Result<?> queryDutyTerritory(String paramsManifestId) {
+        Map<String,String> resMap = new HashMap<>();
+        List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId);
+        List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory");
+        Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
+        if(ObjectUtils.isNotEmpty(dtList)){
+            for (String dtId : dtList) {
+                resMap.put(dtId,dictItemsMap.get(dtId));
+            }
+        }
+        return Result.OK(resMap);
+    }
 }
@@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.collection.entity.OnlCgformCollection;
 import com.jero.modules.collection.service.IOnlCgformCollectionService;
 import com.jero.modules.document.controller.BussDocumentLibraryEOController;
+import com.jero.modules.phone.service.ISearchCenterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +40,8 @@ public class OnlCgformCollectionController extends JeroController<OnlCgformColle
 	private IOnlCgformCollectionService onlCgformCollectionService;
 	@Autowired
 	BussDocumentLibraryEOController bussDocumentLibraryEOService;
+	@Autowired
+	private ISearchCenterService searchCenterService;

 	/**
 	 * 分页列表查询
@@ -162,4 +165,11 @@ public class OnlCgformCollectionController extends JeroController<OnlCgformColle
 		List<Map<String, Object>> list = onlCgformCollectionService.queryCondition(flag, cut);
 		return Result.OK(list);
 	}
+
+	@AutoLog(value = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息")
+	@ApiOperation(value = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息", notes = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息")
+	@GetMapping(value = "/getWdkCollectAndSubscribeInfoByUser")
+	public Result<Map<String, Object>> getWdkCollectAndSubscribeInfoByUser(@RequestParam Map<String,Object> params) {
+		return this.searchCenterService.getWdkCollectAndSubscribeInfoByUser(params);
+	}
 }
@@ -430,11 +430,11 @@ public class ToDoCenterServiceImpl implements IToDoCenterService {
                        data.setTaskDefinitionKeyName(taskDefinitionKeyName);
                    }
                }
-                // 如果是清单确认流程，将任务节点设置为  任务发起：Task initiation
+                // 如果是清单确认流程，将任务节点设置为  任务发起：Process initiation
                if (StringUtils.equals(data.getFlowType(), FlowTypeEnum.QDQR.getValue())) {
                    String taskDefinitionKeyName = "任务发起";
                    if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
-                        taskDefinitionKeyName = "Task Initiation";
+                        taskDefinitionKeyName = "Process Initiation";
                    }
                    data.setTaskDefinitionKeyName(taskDefinitionKeyName);
                }
@@ -635,6 +635,29 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle

 		permissionUserList.add(currentUserPermission);

+		//3.处理部门
+		List<String> departIds = new ArrayList<>();
+		for (ProblemKnowledgeBaseUserEO puser : permissionUserList) {
+			SysUser user = sysUserService.getUserById(puser.getUserId());
+			//假设找不到人就是部门
+			if(ObjectUtils.isEmpty(user)){
+				List<String> deptList = sysDepartService.getSubDepIdsByDepId(puser.getUserId());
+				departIds.addAll(deptList);
+				departIds.add(puser.getUserId());
+			}
+		}
+		for (String deptStr:departIds) {
+			ProblemKnowledgeBaseUserEO cup = new ProblemKnowledgeBaseUserEO();
+			cup.setUserId(deptStr);
+			permissionUserList.add(cup);
+		}
+		List<SysUser> userList = sysUserService.getUserListByDepIds(departIds);
+		for (SysUser user : userList) {
+			ProblemKnowledgeBaseUserEO cup = new ProblemKnowledgeBaseUserEO();
+			cup.setUserId(user.getId());
+			permissionUserList.add(cup);
+		}
+
 		permissionUserList.forEach(permissionUser -> {
 			permissionUser.setProblemKnowledgeBaseId(problemKnowledgeBaseEO.getId());
 		});
@@ -1,9 +1,12 @@
 package com.jero.modules.problemKnowledgeBase.service.impl;

+import com.jero.common.constant.enums.CutEnum;
 import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO;
 import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService;
+import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +32,9 @@ public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl<ProblemKn

 	@Autowired
 	private ISysUserService sysUserService;
+	@Autowired
+	private ISysDepartService sysDepartService;
+

 	/**
 	 * 保存
@@ -106,6 +112,7 @@ public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl<ProblemKn
 			List<String> userIdList = datas.stream().map(ProblemKnowledgeBaseUserEO::getUserId).distinct().collect(Collectors.toList());

 			List<SysUser> userList = sysUserService.querySysUserListByIdList(userIdList);
+			List<SysDepart> deptList = sysDepartService.querySysDepartListByIdList(userIdList);

 			datas.forEach(data -> {
 				if(CollectionUtils.isNotEmpty(userList)){
@@ -117,6 +124,23 @@ public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl<ProblemKn
 						}
 					}

+					if (StringUtils.isNotEmpty(userName)) {
+						data.setUserName(userName);
+					}
+				}
+				if (CollectionUtils.isNotEmpty(deptList)) {
+					String userName = "";
+					for (SysDepart depart : deptList) {
+						if (StringUtils.equals(data.getUserId(), depart.getId())) {
+							if (cut.equals(CutEnum.CN.getValue())) {
+								userName = depart.getDepartName();
+							} else {
+								userName = depart.getDepartNameEn();
+							}
+							break;
+						}
+					}
+
 					if(StringUtils.isNotEmpty(userName)){
 						data.setUserName(userName);
 					}
@@ -26,7 +26,7 @@ public enum CertificationFlowNodeEnum {
         * 任务审查 -> 责任人提交交付物之后，认证工程师审查。
     */
    LIST_CONFIRMATION("List Release","清单校核","List Release"),
-    CHECKLIST_VERIFICATION ("Task initiation","任务发起","Task Initiation"),
+    CHECKLIST_VERIFICATION ("Task initiation","任务发起","Process Initiation"),
    TASK_RESPONSIBILITY_CONFIRMATION ("Task responsibility confirmation","任务责任确认","Responsibilty Confirmation"),
    TASK_HANDLING ("Task handling","任务办理","Task Handling"),
    TASK_REVIEW ("Task Review","任务审查","Task Review"),
@@ -0,0 +1,53 @@
+package com.jero.modules.project.enums;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 认证流程 节点枚举类
+ */
+public enum ProjectMessageEnum {
+
+    SJFHXLC("sjfhxlc","设计符合性流程","Design Compliance Process"),
+    YZFHXLC("yzfhxlc","验证符合性流程","Verify Compliance Process"),
+    RWBFQRCH("rwbfqrch","您好，您以下任务已被发起人撤回。","Hello! Your task has been withdrawn by the initiator."),
+    RWJZSJBXG("rwjzsjbxg","您好，以下符合性任务的截止时间已被发起人修改。","Hello! The due date of the compliance task has been modified by the initiator."),
+    RWJFWLXBXG("rwjfwlxbxg","您好，以下符合性任务的交付物类型已被发起人修改。","Hello! The type of deliverables of the compliance task has been modified by the initiator."),
+    RWJFWMBBXG("rwjfwmbbxg","您好，以下符合性任务的交付物模板已被发起人修改。","Hello! The deliverable template of the compliance task has been modified by the initiator."),
+    ;
+
+    String key;
+    String cnName;
+    String enName;
+
+    private ProjectMessageEnum(String key, String cnName, String enName) {
+        this.key = key;
+        this.cnName = cnName;
+        this.enName = enName;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+}
@@ -166,7 +166,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	Result<?> taskUrg(ProjectTaskUrgVo projectTaskUrgVo);

    Result<?> updateFlowInfoByProjectLibraryIds(String projectLibraryIds);
-
+	void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO);
 	/**
 	 * studio发布，启动清单确认流程
 	 * @param json
@@ -322,4 +322,5 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 * @param params
 	 */
    void replacementUser(JSONObject json);
+	int checkUserRole(String projectLibraryId, String currentUserId, String lawsInventoryId);
 }
@@ -2773,7 +2773,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	public String handlePhoneLink(String id, String prn_cn, String key) {
 		String hrefFeishu_CN_P = backUrlPhone
 				+ JumpLinkEnum.PRE_TASK_HANDING_PHONE.getLink() + "?isDisplay=false&projectLibraryId=" + id
-				+ "&projectName=" + prn_cn + "&taskDefinitionKey=" + key;
+				+ "&projectName=" + prn_cn + "&taskDefinitionKey=" + key + "&TaskKeyName="+CertificationFlowNodeEnum.getTextByValue(key, CutEnum.CN.getValue());
+		;
 		return URLUtil.encode(hrefFeishu_CN_P);
 	}

@@ -7,7 +7,9 @@ import com.jero.modules.project.entity.ProjectReplyEO;
 import com.jero.modules.project.enums.ProjectRoleEnum;
 import com.jero.modules.project.mapper.ProjectCommentEOMapper;
 import com.jero.modules.project.service.IProjectCommentEOService;
+import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectReplyEOService;
+import com.jero.modules.project.service.editImpl.ProjectLawsInventoryEOEditServiceImpl;
 import com.jero.modules.project.vo.ProjectCommentVO;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -33,7 +35,7 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl<ProjectCommentEOMap
 	@Autowired
 	private IProjectReplyEOService iProjectReplyEOService;
 	@Autowired
-	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+	private IProjectLawsInventoryEOService projectLawsInventoryEOService;
 	/**
 	 * 保存
 	 *
@@ -61,4 +61,11 @@ public class PhoneProjectProcessTodoCenterController {
    public Result<?> complianceDataMigration(@RequestParam Map<String,Object> params) {
        return this.processInfoEOService.complianceDataMigration(params);
    }
+
+    @AutoLog(value = "待办中心-查询任务TASKID")
+    @ApiOperation(value="待办中心-查询任务TASKID", notes="待办中心-查询任务TASKID")
+    @GetMapping(value = "/queryTaskId")
+    public Result<?> queryTaskId(@RequestParam Map<String,Object> params) {
+        return this.processInfoEOService.queryTaskId(params);
+    }
 }
@@ -61,4 +61,12 @@ public class ProjectProcessTodoCenterController {
    public Result<?> complianceDataMigration(@RequestParam Map<String,Object> params) {
        return this.processInfoEOService.complianceDataMigration(params);
    }
+
+    @AutoLog(value = "待办中心-查询任务TASKID")
+    @ApiOperation(value="待办中心-查询任务TASKID", notes="待办中心-查询任务TASKID")
+    @GetMapping(value = "/queryTaskId")
+    public Result<?> queryTaskId(@RequestParam Map<String,Object> params) {
+        return this.processInfoEOService.queryTaskId(params);
+    }
+
 }
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 * 待办中心-设计符合性流程节点key枚举类
 */
 public enum DesignComplianceFlowNodeKeyEnum {
-    FQLC("发起流程","Task Initiation","fqlc"),
+    FQLC("发起流程","Process Initiation","fqlc"),
    ZRRQR("任务责任确认","Responsibilty Confirmation","zrrqr"), // 责任人确认
    DEZRRQR("任务责任确认","Responsibilty Confirmation","dezrrqr"),// 第二责任人确认
    ZRRTJJFW("符合性确认","Compliance Confirmation","zrrtjjfw"),// "责任人提交交付物"
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 * 待办中心-验证符合性流程节点key枚举类
 */
 public enum VerifyComplianceFlowNodeKeyEnum {
-    FQLC("发起流程","Task Initiation","fqlc"),
+    FQLC("发起流程","Process Initiation","fqlc"),
    ZRRQR("任务责任确认","Responsibilty Confirmation","zrrqr"), // 责任人确认
    DEZRRQR("任务责任确认","Responsibilty Confirmation","dezrrqr"),// 第二责任人确认
    ZRRTJJFW("符合性确认","Compliance Confirmation","zrrtjjfw"),// "责任人提交交付物"
@@ -132,4 +132,6 @@ public interface IProcessInfoEOService extends IService<ProcessInfoEO> {
 	void disposeData(List<ProcessInfoVO> datas, String cut, String taskStatus);

 	public void setPersonChargeFeedback(List<ProcessInfoVO> datas);
+
+    Result<?> queryTaskId(Map<String, Object> params);
 }
@@ -778,11 +778,11 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 					}
 				}
-				// 如果是清单确认流程，将任务节点设置为  verdutyId：Task initiation
+				// 如果是清单确认流程，将任务节点设置为  verdutyId：Process initiation
 				if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.QDQR.getValue())){
 					String taskDefinitionKeyName = "任务发起";
 					if(StringUtils.equals(cut,CutEnum.EN.getValue())){
-						taskDefinitionKeyName = "Task Initiation";
+						taskDefinitionKeyName = "Process Initiation";
 					}
 					data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 				}
@@ -1878,4 +1878,20 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P

 		return Result.OK("处理数据成功",params);
 	}
+
+	@Override
+	public Result<?> queryTaskId(Map<String, Object> params) {
+		String taskId = "";
+		String projectLawsInventoryId = (String) params.get("projectLawsInventoryId");
+		String flowType = (String) params.get("flowType");
+		QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
+		processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryId);
+		processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, flowType);
+		processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getStatus, TaskStatusEnum.NOT_DONE.getValue());
+		List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
+		if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
+			taskId = processInfoDetailEOS.get(0).getTaskId();
+		}
+		return Result.OK(taskId);
+	}
 }