内控获取部门领导人，内控任务上报接口完善

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.control.entity.UserFilesInfo;
 import org.springblade.control.vo.UserFilesInfoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -42,4 +43,5 @@ public interface UserFilesInfoMapper extends BaseMapper<UserFilesInfo> {
 	// 获取详情
 	UserFilesInfoVO getUserFileDetail(String id);
 
+    String getLeaderNameByDeptId(@Param("deptId") long deptId);
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.xml

@@ -83,4 +83,7 @@
             (SELECT dict_name from c_dict_info a where a.code='political_type' and parent_id!=0 and dict_value =a.political_type) as politicalName
         from c_view_user_files_info a where  id=#{id} and  is_deleted=0
     </select>
+    <select id="getLeaderNameByDeptId" resultType="java.lang.String">
+        select name from blade_user WHERE is_leader like concat('%',#{deptId},'%')
+    </select>
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -1200,8 +1200,8 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 ProjectCostBudget projectCostBudget = jdbcTemplate.query("select plan_task_desc,task_user,id from c_project_cost_budget where id = " + dataId, new BeanPropertyRowMapper<>(ProjectCostBudget.class)).stream().findAny().orElse(null);
                 if (taskProcessInfo1 != null && projectCostBudget != null) {
                     //获取任务完成时间
-                    TaskPlanUpdateStatusInfo taskPlanUpdateStatusInfo = jdbcTemplate.query("select completion_time from c_task_plan_update_status_info where update_type = 1 and approve_task_id = " + approveTaskId + " and plan_task_id = " + dataId, new BeanPropertyRowMapper<>(TaskPlanUpdateStatusInfo.class)).stream().findAny().orElse(null);
-                    if (taskProcessInfo1.getTaskName().contains("完成任务")){
+                    TaskPlanUpdateStatusInfo taskPlanUpdateStatusInfo = jdbcTemplate.query("select * from c_task_plan_update_status_info where approve_task_id = " + approveTaskId + " and plan_task_id = " + dataId, new BeanPropertyRowMapper<>(TaskPlanUpdateStatusInfo.class)).stream().findAny().orElse(null);
+                    if (taskProcessInfo1.getTaskName().contains("任务完成")){
                         if (taskPlanUpdateStatusInfo != null && taskProcessInfo1.getStatus().equals(2)) { //已完成的任务才推送
                             //修改任务实际完成时间、金额
                             LocalDate localDate = taskPlanUpdateStatusInfo.getCompletionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@@ -1209,9 +1209,11 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                         }
                         //日志操作信息
                         planInformService.taskFinishedInform(projectCostBudget.getPlanTaskDesc(), projectCostBudget.getTaskUser(), SecureUtil.getUserName(), taskProcessInfo1.getStatus());
-                    }else if (taskProcessInfo1.getTaskName().contains("转移任务")){
-                        projectCostBudgetService.taskChangeStats(Long.parseLong(dataId),taskProcessInfo1.getReportUserId());
+                    }else if (taskProcessInfo1.getTaskName().contains("任务转移")){
+                        //修改任务人
+                        jdbcTemplate.execute("update c_project_cost_budget set task_user = "+taskPlanUpdateStatusInfo.getTransferObject() + " where id = "+ dataId);
                         //日志操作信息
+                        projectCostBudgetService.taskChangeStats(Long.parseLong(dataId),taskProcessInfo1.getReportUserId());
                         planInformService.taskChangedInform(taskPlanUpdateStatusInfo.getStartTransferObject(),taskPlanUpdateStatusInfo.getTransferObject(), SecureUtil.getUserName(),projectCostBudget.getPlanTaskDesc());
                     }
                 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/UserFilesInfoServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.service.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.springblade.control.entity.UserFilesInfo;
 import org.springblade.control.vo.UserFilesInfoVO;
 import org.springblade.control.mapper.UserFilesInfoMapper;
@@ -40,7 +41,14 @@ public class UserFilesInfoServiceImpl extends BaseServiceImpl<UserFilesInfoMappe
 
 	@Override
 	public UserFilesInfoVO getUserFileDetail(String id) {
-		return baseMapper.getUserFileDetail(id);
+		UserFilesInfoVO vo = baseMapper.getUserFileDetail(id);
+		if (StringUtils.isBlank(vo.getLeaderName())){
+			String name = baseMapper.getLeaderNameByDeptId(vo.getDeptId());
+			if (StringUtils.isNotBlank(name)){
+				vo.setLeaderName(name);
+			}
+		}
+		return vo;
 	}
 
 }