代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/component/NextApproverImpl.java

@@ -1,8 +1,10 @@
 package com.ims.eval.component;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ims.eval.entity.DeptAssessmentDeclaration;
 import com.ims.eval.service.IDeptAssessmentDeclarationService;
 import com.ims.idms.modules.sys.entity.SysUser;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +17,7 @@ import java.util.List;
  * 文件说明：流程脚本事件
  */
 @Component
+@Slf4j
 public class NextApproverImpl {
 
 	@Autowired
@@ -26,14 +29,23 @@ public class NextApproverImpl {
 	 * @return 结果
 	 */
 	public List<SysUser> submitTask1(String id, String a2, String a3) {
-		List<SysUser> userList = new ArrayList<>();
-		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
-		if (null != deptAssessmentDeclaration){
-			SysUser user = new SysUser();
-			user.setId(deptAssessmentDeclaration.getDeptLeaderId());
-			user.setNo(deptAssessmentDeclaration.getDeptLeaderNo());
-			user.setName(deptAssessmentDeclaration.getDeptLeaderName());
-			userList.add(user);
+		List<SysUser> userList = null;
+		log.info("用户1 ID"+id);
+		try {
+			userList = new ArrayList<>();
+			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
+			if (null != deptAssessmentDeclaration){
+				SysUser user = new SysUser();
+				user.setId(deptAssessmentDeclaration.getDeptLeaderId());
+				user.setNo(deptAssessmentDeclaration.getDeptLeaderNo());
+				user.setName(deptAssessmentDeclaration.getDeptLeaderName());
+				userList.add(user);
+			}
+			String listJSONString = JSONObject.toJSONString(userList);
+			log.info("用户1 list"+listJSONString);
+
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 		return userList;
 	}
@@ -44,6 +56,7 @@ public class NextApproverImpl {
 	 * @return 结果
 	 */
 	public List<SysUser> submitTask2(String id, String a2, String a3) {
+		log.info("用户2 ID"+id);
 		List<SysUser> userList = new ArrayList<>();
 		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
 		if (null != deptAssessmentDeclaration){
@@ -52,7 +65,10 @@ public class NextApproverImpl {
 			user.setNo(deptAssessmentDeclaration.getSeconderNo());
 			user.setName(deptAssessmentDeclaration.getSeconderName());
 			userList.add(user);
+			System.out.println("用户数量2;id="+user.getId());
 		}
+		String listJSONString = JSONObject.toJSONString(userList);
+		log.info("用户2 list"+listJSONString);
 		return userList;
 	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -1,6 +1,7 @@
 package com.ims.eval.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.StringUtils;
@@ -10,7 +11,9 @@ import com.ims.eval.entity.EvaluationDeptBusinessContent;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import com.ims.eval.entity.custom.Path;
 import com.ims.eval.entity.dto.request.DeptDTO;
+import com.ims.eval.entity.dto.response.MyuserResDTO;
 import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.feign.RemoteServiceBuilder;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
 import com.ims.eval.service.IEvaluationDeptService;
@@ -49,6 +52,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	@Autowired
 	private HttpServletRequest request;
 
+	@Autowired
+	private RemoteServiceBuilder remoteServiceBuilder;
+
 	/**
 	 * 部门考评业务列表信息（分页）
 	 *
@@ -187,6 +193,17 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 */
 	@GetMapping(value = "/details/{id}/{deptId}/{deptName}")
 	public R details(@PathVariable("id") String id, @PathVariable("deptId") String deptId, @PathVariable("deptName") String deptName) {
+
+		String code = request.getHeader("code");
+		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+		user.getDeptOrg().getType();
+
+		if("150".equals(user.getDeptOrg().getType())){
+			deptId = user.getDeptOrg().getParentId();
+		}
+
 		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, deptId, deptName);
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : list) {
 			if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
@@ -195,6 +212,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 				if ("23031009".equals(deptId)) {//组织人事部
 					evaluationDeptBusinessContent.setDataPermission("1");
 				} else {
+
+
+
 					evaluationDeptBusinessContent.setDataPermission("-1");
 				}
 			}
@@ -270,6 +290,17 @@ public class DepartmentalPerformanceIndicatorPlanController {
 				dept.setDeptName(evaluationDept.getDeptName());
 				deptList.add(dept);
 			} else {
+
+				String code = request.getHeader("code");
+				JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+				MyuserResDTO user = JSONObject.parseObject(json.getJSONObject("data").toJSONString(), MyuserResDTO.class);
+
+				user.getDeptOrg().getType();
+
+				if("150".equals(user.getDeptOrg().getType())){
+					deptId = user.getDeptOrg().getParentId();
+				}
+
 				if (deptId.equals(evaluationDept.getDeptId())) {
 					DeptDTO dept = new DeptDTO();
 					dept.setDeptId(evaluationDept.getDeptId());

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowServiceImpl.java

@@ -138,7 +138,7 @@ public class WorkflowServiceImpl {
 				List<JSONObject> ds = new ArrayList<>();
 				for (int i = 0; i < result.getRows().size(); i++) {
 					String typeId = result.getRows().getJSONObject(i).get("typeId").toString();
-					if (!"440219646351376385".equals(typeId)) {
+					if (!"440219646351376385".equals(typeId) && !"443254180359700481".equals(typeId)) {
 						ds.add(result.getRows().getJSONObject(i));
 						continue;
 					}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -634,15 +634,15 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	@Override
 	public byte[] downloadExcel(String organizationEvaluationId, String indicatorId, String binSection, String binStage,HttpServletRequest request) throws Exception{
 
-//		//获取用户信息 23031009
-//		boolean deptFlag = false;
-//		MyuserResDTO user = userService.getSysUser(request);
-//		if(null != user){
-//			String deptId = "23031009";
-//			if(deptId.equals(user.getDeptId())){
-//				deptFlag = true;
-//			}
-//		}
+		//获取用户信息 23031009
+		boolean deptFlag = false;
+		MyuserResDTO user = userService.getSysUser(request);
+		if(null != user){
+			String deptId = "23031009";
+			if(deptId.equals(user.getDeptId())){
+				deptFlag = true;
+			}
+		}
 		String[] values = new String[]{"不合格", "待确认", "已确认"};
 
 		Map<String ,List<Map<String,String>>> title = new LinkedHashMap();//标题