补充查询用户名和流程分类名称

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -34,6 +34,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.api.CostInFoApi;
 import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.enums.CodeEnum;
 import com.ankaibei.workFlow.webadmin.ankaibei.mapper.ProjectInfoMapper;
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
 import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.CostInfoVo;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
@@ -70,6 +71,8 @@ public class CostInfoController {
     @Autowired
     private CostInFoApi costInFoApi;
     @Autowired
+    private UserInfoMapper userInfoMapper;
+    @Autowired
     private FlowApiService flowApiService;
     @Autowired
     private FlowEntryService flowEntryService;
@@ -565,7 +568,8 @@ public class CostInfoController {
         //查询到任务信息中包含的全部项目和表单数据
         List<ProjectInfoEntity> projectInfos = projectInfoMapper.findAllById(projectIds);
         List<FlowWorkOrder> instanceIdIn = flowWorkOrderService.findAllByProcessInstanceIdIn(processInstanceIds);
-
+        Date userBefore = new Date();
+        System.err.println("查询用户名前：" + userBefore.getTime());
         for (FlowTaskVo taskVo : flowTaskVoListByQueryTypeRsg) {
             for (ProjectInfoEntity info : projectInfos) {
                 if (info.getProjectId().equals(taskVo.getProjectId())) {
@@ -576,11 +580,17 @@ public class CostInfoController {
             for (FlowWorkOrder order : instanceIdIn) {
                 if (order.getProcessInstanceId().equals(taskVo.getProcessInstanceId())) {
                     taskVo.setProcessInstanceInitiator(order.getSubmitUsername());
+                    String showName = userInfoMapper.findByLoginNameEqualsAndDeletedFlagIs(order.getSubmitUsername(), 1).getShowName();
+                    taskVo.setShowName(showName == null ? "" : showName);
                     taskVo.setFlowTaskStatus(order.getFlowStatus() + "");
                     break;
                 }
             }
         }
+        Date userAF = new Date();
+        System.err.println("查询用户名后：" + userAF.getTime());
+        System.err.println("查询用户名耗时+++++：" + (userAF.getTime() - userBefore.getTime()));
+
         return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(flowTaskVoListByQueryTypeRsg, Long.valueOf(flowTaskVoListByQueryType.size())));
     }
 
@@ -597,6 +607,7 @@ public class CostInfoController {
                 taskVo.setProjectId(projectId);
             }
             taskVo.setCostType(queryType);
+            taskVo.setCategoryName(queryType);
             projectIds.add(projectId);
             processInstanceIds.add(taskVo.getProcessInstanceId());
         }
@@ -624,6 +635,7 @@ public class CostInfoController {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("task_id").toString()));
             }
             taskVo.setCostType(queryType);
+            taskVo.setCategoryName(queryType);
             projectIds.add(projectId);
             processInstanceIds.add(taskVo.getProcessInstanceId());
         }
@@ -651,6 +663,7 @@ public class CostInfoController {
                 taskVo.setApplyDataId(Integer.parseInt(masterAndOneToOne.get("man_id").toString()));
             }
             taskVo.setCostType(queryType);
+            taskVo.setCategoryName(queryType);
             projectIds.add(projectId);
             processInstanceIds.add(taskVo.getProcessInstanceId());
         }
@@ -696,6 +709,7 @@ public class CostInfoController {
             if (masterAndOneToOne.get("cost_type") != null) {
                 taskVo.setCostType(masterAndOneToOne.get("cost_type").toString());
             }
+            taskVo.setCategoryName(queryType);
             projectIds.add(projectId);
             processInstanceIds.add(taskVo.getProcessInstanceId());
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/UserInfoMapper.java

@@ -23,6 +23,8 @@ public interface UserInfoMapper extends JpaRepository<UserInfoEntity, String>, J
 
     /**
      * 根据id查询用户信息
+     *
+     * @return 查询到的用户对象
      */
     @Query(value = "SELECT * FROM work_sys_user where user_id in (?1)"
             , countQuery = "SELECT count(1) FROM work_sys_user where user_id in (?1)", nativeQuery = true)
@@ -32,8 +34,19 @@ public interface UserInfoMapper extends JpaRepository<UserInfoEntity, String>, J
      * 根据id查询用户信息
      *
      * @param userId
+     * @return 查询到的用户对象
      */
     @Query(value = "SELECT * FROM work_sys_user where user_id = ?1"
             , countQuery = "SELECT count(1) FROM work_sys_user where user_id in ?1", nativeQuery = true)
     UserInfoEntity findByUserIdEquals(String userId);
+
+
+    /**
+     * 根据id查询用户信息
+     *
+     * @param loginName   用户账号
+     * @param deletedFlag 是否已删除
+     * @return 查询到的用户对象
+     */
+    UserInfoEntity findByLoginNameEqualsAndDeletedFlagIs(String loginName, int deletedFlag);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysUserInfoMapper.java

@@ -1,20 +0,0 @@
-package com.ankaibei.workFlow.webadmin.upms.dao;
-
-import com.ankaibei.workFlow.common.core.base.dao.BaseDaoMapper;
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
-import com.ankaibei.workFlow.webadmin.upms.model.SysUser;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 用户管理数据操作访问接口。
- *
- * @author Buzhanyi
- * @date 2022-09-25
- */
-public interface SysUserInfoMapper extends BaseDaoMapper<UserInfoEntity> {
-
-    List<UserInfoEntity> getSysUsersByDeptId(@Param("deptId") String deptId);
-}

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/SysUserMapper.java

@@ -1,6 +1,7 @@
 package com.ankaibei.workFlow.webadmin.upms.dao;
 
 import com.ankaibei.workFlow.common.core.base.dao.BaseDaoMapper;
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
 import com.ankaibei.workFlow.webadmin.upms.model.SysUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -151,6 +152,13 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
     List<Map<String, Object>> getSysMenuListWithDetail(
             @Param("userId") Long userId, @Param("menuName") String menuName);
 
-    //List<SysUser> getSysUsersByDeptId(@Param("deptId") Long deptId);
+    /**
+     * 查询部门下用户
+     *
+     * @param deptId
+     * @return
+     */
+    List<UserInfoEntity> getSysUsersByDeptId(@Param("deptId") String deptId);
+
 }
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/mapper/SysUserInfoMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ankaibei.workFlow.webadmin.upms.dao.SysUserInfoMapper">
-    <resultMap id="BaseResultMap" type="com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity">
-        <id column="user_id" jdbcType="VARCHAR" property="userId"/>
-        <result column="login_name" jdbcType="VARCHAR" property="loginName"/>
-        <result column="password" jdbcType="VARCHAR" property="password"/>
-        <result column="show_name" jdbcType="VARCHAR" property="showName"/>
-        <result column="dept_id" jdbcType="BIGINT" property="deptId"/>
-        <result column="user_type" jdbcType="INTEGER" property="userType"/>
-        <result column="head_image_url" jdbcType="VARCHAR" property="headImageUrl"/>
-        <result column="user_status" jdbcType="INTEGER" property="userStatus"/>
-        <result column="email" jdbcType="VARCHAR" property="email"/>
-        <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
-        <result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
-        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
-        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="region" jdbcType="VARCHAR" property="region"/>
-        <result column="job_number" jdbcType="BIGINT" property="jobNumber"/>
-    </resultMap>
-
-
-    <select id="getSysUsersByDeptId" resultMap="BaseResultMap">
-        SELECT
-        work_sys_user.*
-        FROM
-        work_sys_user
-        <where>
-            work_sys_user.dept_id = #{deptId}
-        </where>
-        and deleted_flag ='1'
-        ORDER BY create_time desc
-    </select>
-</mapper>

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dao/mapper/SysUserMapper.xml

@@ -300,15 +300,15 @@
     </select>
 
 
-    <!--    <select id="getSysUsersByDeptId" resultMap="BaseResultMap">-->
-    <!--        SELECT-->
-    <!--        work_sys_user.*-->
-    <!--        FROM-->
-    <!--        work_sys_user-->
-    <!--        <where>-->
-    <!--            work_sys_user.dept_id = #{deptId}-->
-    <!--        </where>-->
-    <!--        and deleted_flag ='1'-->
-    <!--        ORDER BY create_time desc-->
-    <!--    </select>-->
+    <select id="getSysUsersByDeptId" resultMap="BaseResultMap">
+        SELECT
+        work_sys_user.*
+        FROM
+        work_sys_user
+        <where>
+            work_sys_user.dept_id = #{deptId}
+        </where>
+        and deleted_flag ='1'
+        ORDER BY create_time desc
+    </select>
 </mapper>

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -57,8 +57,6 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
     private IdGeneratorWrapper idGenerator;
     @Autowired
     private PasswordEncoder passwordEncoder;
-    @Autowired
-    private SysUserInfoMapper sysUserInfoMapper;
 
     /**
      * 返回当前Service的主表Mapper对象。
@@ -425,7 +423,7 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
 
     @Override
     public List<UserInfoEntity> getSysUsersByDeptId(String deptId) {
-        List<UserInfoEntity> userList = sysUserInfoMapper.getSysUsersByDeptId(deptId);
+        List<UserInfoEntity> userList = sysUserMapper.getSysUsersByDeptId(deptId);
         return userList;
     }
 }