소스 검색

feat: task check page display ppkg name

shc 5 달 전
부모
커밋
b19f534145

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/vo/TaskRespVO.java

@@ -44,6 +44,7 @@ public final class TaskRespVO {
 
     // 包信息
     private String pkgName;
+    private String relPkgName;
 
     private String pkgStartTime;
 

+ 0 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/TaskManager.java

@@ -38,7 +38,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;

+ 0 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskV2Mapper.java

@@ -9,7 +9,6 @@ import java.time.LocalDateTime;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 /**
  * 任务mapper
@@ -36,6 +35,4 @@ public interface WmTaskV2Mapper extends BaseMapper<WmTask> {
       @Param("taskStatus") String taskStatus
       );
 
-
-  List<WmTask> selectByIds(@Param("ids") List<Long> ids);
 }

+ 3 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskV2Mapper.xml

@@ -14,6 +14,7 @@
     <result property="taskUserId" column="task_user_id"/>
     <result property="entId" column="dept_id"/>
     <result property="pkgName" column="score_package_name"/>
+    <result property="relPkgName" column="rel_pkg_name"/>
     <result property="pkgStartTime" column="start_time"/>
     <result property="pkgEndTime" column="end_time"/>
     <result property="provAbbr" column="prov_abbr"/>
@@ -34,12 +35,14 @@
     t.create_time,
     pkg.dept_id,
     pkg.score_package_name,
+    ppkg.score_package_name AS rel_pkg_name,
     pkg.start_time,
     pkg.end_time,
     pkg.prov_abbr,
     pkg.drugtable
     FROM wm_task AS t
     LEFT JOIN wm_score_package AS pkg ON pkg.id = t.score_package_id
+    LEFT JOIN wm_score_package AS ppkg ON ppkg.id = pkg.relation_score_id
     INNER JOIN (SELECT DISTINCT tmp.target_id AS task_id
                 FROM (SELECT h.target_id, SUM(DISTINCT h.node_id) AS node_sum
                       FROM sys_chain_node_check_his AS h