本部--年度计划和年度完成情况--指标填报人员指定修改

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

@@ -1,7 +1,9 @@
 package com.ims.eval.component;
 
 import com.ims.eval.entity.DeptAssessmentDeclaration;
+import com.ims.eval.entity.EvaluationDeptProcess;
 import com.ims.eval.service.IDeptAssessmentDeclarationService;
+import com.ims.eval.service.IEvaluationDeptProcessService;
 import com.ims.idms.modules.sys.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -22,6 +24,9 @@ public class NextApproverImpl {
 	@Resource
 	private IDeptAssessmentDeclarationService deptAssessmentDeclarationService;
 
+	@Resource
+	private IEvaluationDeptProcessService evaluationDeptProcessService;
+
 	/**
 	 * 获取流程审批人员
 	 *
@@ -73,4 +78,35 @@ public class NextApproverImpl {
 		}
 		return userList;
 	}
+
+
+	/**
+	 * 本部年度 获取流程审批人员
+	 *
+	 * @return 结果
+	 */
+	public List<SysUser> submitTask3(String id, String a2, String a3) {
+		log.info("submitTask3开始");
+		List<SysUser> userList = null;
+		try {
+			log.info("请求参数id"+id);
+			userList = new ArrayList<>();
+			EvaluationDeptProcess evaluationDeptProcess = evaluationDeptProcessService.getById(id);
+			if (null != evaluationDeptProcess) {
+				SysUser user = new SysUser();
+				user.setId(evaluationDeptProcess.getDeptId());
+				user.setNo(evaluationDeptProcess.getDeptNo());
+				user.setName(evaluationDeptProcess.getDeptPersonalName());
+				userList.add(user);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("获取流程审批人员错误", e);
+		}
+		for (SysUser u : userList){
+			log.info("返回审批人名字"+u.getName());
+		}
+
+		return userList;
+	}
 }

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

@@ -0,0 +1,106 @@
+package com.ims.eval.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
+import com.ims.eval.entity.EvaluationDeptBusinessPlan;
+import com.ims.eval.entity.EvaluationDeptProcess;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
+import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
+import com.ims.eval.service.IEvaluationDeptProcessService;
+import com.ims.eval.service.IUserService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-08
+ */
+@RestController
+@RequestMapping("/evaluation-dept-process")
+public class EvaluationDeptProcessController {
+	@Resource
+	private IUserService userService;
+
+	@Resource
+	private HttpServletRequest request;
+
+	@Resource
+	private IEvaluationDeptProcessService evaluationDeptProcessService;
+
+	@Resource
+	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
+
+	@Resource
+	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
+
+	/**
+	 * 添加审批人员
+	 *
+	 * @param id         主键
+	 * @param employeeNo 用户编号
+	 * @return 结果
+	 */
+	@PostMapping(value = "/addProcessPersonal")
+	public R addApprovalLeader(@RequestParam(value = "id") String id,
+							   @RequestParam(value = "employeeNo") String employeeNo,
+							   @RequestParam(value = "businessType") String businessType) {
+		boolean b = false;
+		JSONObject jsonArr = userService.getLoginNameByUserInfo(employeeNo, request);
+		JSONObject data = (JSONObject) jsonArr.get("data");
+		if (data.toJSONString().length() > 0) {
+			EvaluationDeptProcess edp = evaluationDeptProcessService.getById(id);
+			if (null != edp && businessType.equals(edp.getBusinessType())) {
+				edp.setDeptPersonalName(String.valueOf(data.get("name")));
+				b = evaluationDeptProcessService.updateById(edp);
+				if (b) {
+					return R.ok().data(b);
+				} else {
+					return R.error("添加人员失败！");
+				}
+			} else if (null != edp) {
+				return R.error("添加人员失败，请联系管理员！");
+			}
+			EvaluationDeptProcess evaluationDeptProcess = new EvaluationDeptProcess();
+			evaluationDeptProcess.setId(id);
+			evaluationDeptProcess.setBusinessId(id);
+			EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = null;
+			EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = null;
+			if ("PLAN".equals(businessType)) {
+				evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
+				evaluationDeptProcess.setBusinessType("PLAN");
+				evaluationDeptProcess.setDeptName(evaluationDeptBusinessPlan.getDeptName());
+				evaluationDeptProcess.setAppraisalYear(evaluationDeptBusinessPlan.getAppraisalYear());
+			} else if ("ASS".equals(businessType)) {
+				evaluationDeptBusinessAssessment = evaluationDeptBusinessAssessmentService.getById(id);
+				evaluationDeptProcess.setBusinessType("ASS");
+				evaluationDeptProcess.setDeptName(evaluationDeptBusinessAssessment.getDeptName());
+				evaluationDeptProcess.setAppraisalYear(evaluationDeptBusinessAssessment.getAppraisalYear());
+			}
+
+			if (null != evaluationDeptBusinessPlan||null!=evaluationDeptBusinessAssessment) {
+				evaluationDeptProcess.setDeptId(String.valueOf(data.get("id")));
+				evaluationDeptProcess.setDeptNo(String.valueOf(data.get("no")));
+				evaluationDeptProcess.setDeptPersonalName(String.valueOf(data.get("name")));
+				b = evaluationDeptProcessService.save(evaluationDeptProcess);
+			}
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error("添加人员失败！");
+		}
+	}
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationDeptProcessMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationDeptProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-08
+ */
+public interface EvaluationDeptProcessMapper extends BaseMapper<EvaluationDeptProcess> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptProcess.java

@@ -0,0 +1,61 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *  本部--年度计划和年度完成情况--指标填写人员指定类
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("evaluation_dept_process")
+@ApiModel(value="EvaluationDeptProcess对象", description="")
+public class EvaluationDeptProcess implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "业务类型 PLAN-计划  ASS-完成")
+    private String businessType;
+
+    @ApiModelProperty(value = "业务主键")
+    private String businessId;
+
+    @ApiModelProperty(value = "流程实例ID")
+    private String instId;
+
+    @ApiModelProperty(value = "部门ID")
+    private String deptId;
+
+    @ApiModelProperty(value = "部门编号")
+    private String deptNo;
+
+    @ApiModelProperty(value = "部门人员名称")
+    private String deptPersonalName;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+	@ApiModelProperty(value = "部门名称")
+	private String deptName;
+
+	@ApiModelProperty(value = "考评年度")
+	private String appraisalYear;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptProcessService.java

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationDeptProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-08
+ */
+public interface IEvaluationDeptProcessService extends IService<EvaluationDeptProcess> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.dao.EvaluationDeptProcessMapper;
+import com.ims.eval.entity.EvaluationDeptProcess;
+import com.ims.eval.service.IEvaluationDeptProcessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-02-08
+ */
+@Service
+public class EvaluationDeptProcessServiceImpl extends ServiceImpl<EvaluationDeptProcessMapper, EvaluationDeptProcess> implements IEvaluationDeptProcessService {
+
+}

ims-service/ims-eval/src/main/resources/mappers/EvaluationDeptBusinessContentMapper.xml

@@ -53,7 +53,7 @@
 
     <select id="detailsList" resultType="com.ims.eval.entity.EvaluationDeptBusinessContent">
         select edbc.* from evaluation_dept_business_content edbc
-        left join evaluation_dept ed on ed.dept_id = edbc.dept_id
+        left join evaluation_dept ed on ed.dept_id = edbc.dept_id and ed.del_flag='1'
         <where>
             <if test="businessPlanId != null and businessPlanId != ''">
                 AND edbc.business_plan_id = #{businessPlanId}