fix：修改试运行内容

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/WmTaskTypeVO.java

@@ -18,6 +18,7 @@ public class WmTaskTypeVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String id;
+
     /**
      * 任务类型名称
      */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -639,7 +639,7 @@ public class WmDaAgentController {
                         newOne.setDeptId(wmDaAgent.getDeptId());
                         newOne.setCreateTime(LocalDateTime.now());
                         newOne.setStatus("0");
-                        newOne.setBaseId(wmTaskType2.getId());
+                        newOne.setBaseId(wmTaskType2.getBaseId());
                         wmTaskTypeMapper.insert(newOne);
                     }
                 } else if (3 == sysDept.getLevel()) {
@@ -668,7 +668,7 @@ public class WmDaAgentController {
                         newOne.setDeptId(wmDaAgent.getDeptId());
                         newOne.setCreateTime(LocalDateTime.now());
                         newOne.setStatus("0");
-                        newOne.setBaseId(wmTaskType2.getId());
+                        newOne.setBaseId(wmTaskType2.getBaseId());
                         wmTaskTypeMapper.insert(newOne);
                     }
                 }
@@ -727,7 +727,7 @@ public class WmDaAgentController {
                     newOne.setDeptId(list3.get(0).getDeptId());
                     newOne.setCreateTime(LocalDateTime.now());
                     newOne.setStatus("0");
-                    newOne.setBaseId(wmTaskType1.getId());
+                    newOne.setBaseId(wmTaskType1.getBaseId());
                     wmTaskTypeMapper.insert(newOne);
                 }
             }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -182,6 +182,7 @@ public class WmTaskTypeController {
 
         queryWrapper.eq(StrUtil.isNotBlank(wmTaskType.getTaskTypeLevel()), WmTaskType::getTaskTypeLevel, wmTaskType.getTaskTypeLevel())
                 .eq(wmTaskType.getRuleId() != null, WmTaskType::getRuleId, wmTaskType.getRuleId())
+                .like(StrUtil.isNotBlank(wmTaskType.getBaseId()), WmTaskType::getBaseId, wmTaskType.getBaseId())
                 .eq(StrUtil.isNotBlank(wmTaskType.getTaskTypeName()), WmTaskType::getTaskTypeName, wmTaskType.getTaskTypeName())
                 .eq(StrUtil.isNotBlank(wmTaskType.getEnableFlag()), WmTaskType::getEnableFlag, wmTaskType.getEnableFlag())
                 .eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.getVal())
@@ -258,10 +259,15 @@ public class WmTaskTypeController {
             }
         }
 
+        // 获取baseId
+        Map<String, String> taskTypeIdToBaseIdMap = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery().le(WmTaskType::getId, "100"))
+                .stream().collect(Collectors.toMap(WmTaskType::getTaskTypeName, WmTaskType::getBaseId));
+
         LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.lambdaQuery(wmTaskType);
         List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
                 "统计分析", "临床监察", "通用", "患者教育");
         queryWrapper.notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);
+        queryWrapper.like(StrUtil.isNotBlank(wmTaskType.getBaseId()), WmTaskType::getBaseId, wmTaskType.getBaseId());
         queryWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.getVal());
 
         Page<WmTaskType> pageResult = wmTaskTypeService.page(page, queryWrapper);
@@ -279,6 +285,7 @@ public class WmTaskTypeController {
             } else {
                 typeVO.setScore(String.valueOf(taskType.getScore()));
             }
+            typeVO.setBaseId(taskTypeIdToBaseIdMap.get(taskType.getTaskTypeName()));
             voList.add(typeVO);
         });
         voPage.setRecords(voList);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -262,6 +262,7 @@ public class SysImplementPlanManager {
         // 事业部管理员||药企（只查询我下发的）
         else if (entLevel == -1) {
             wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                    .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
                     .eq(SysImplementPlan::getParentId, 0);
         }
         // 平台||营销中心（查询全部）
@@ -270,7 +271,7 @@ public class SysImplementPlanManager {
         }
 
         if (ArrayUtil.isNotEmpty(period) && period.length == 2) {
-            wrapper.between(SysImplementPlan::getCreateTime, period[0], period[1]);
+            wrapper.between(SysImplementPlan::getCreateTime, period[0], period[1].plusMonths(1).minusDays(1));
         }
 
         return implementPlanService.page(new Page<>(current, size), wrapper);
@@ -436,6 +437,9 @@ public class SysImplementPlanManager {
             return Collections.emptyList();
         }
 
+        // 判断拆解拆解状态是否可用 todo
+        // plans.stream().map(SysImplementPlanlan::get)
+
 
         // 获取承接人ID
         Set<Integer> consigneeIds = plans.stream().mapToInt(SysImplementPlan::getConsigneeId).boxed().collect(Collectors.toSet());
@@ -466,7 +470,7 @@ public class SysImplementPlanManager {
             copied.setSkuInfo(skuInfo);
 
             // 拆解详情
-            SysImplPlanDetails details = implPlanDetailsService.getDetailsByPlanId(p.getPlanId());
+            SysImplPlanDetails details = implPlanDetailsService.getDetailsByPlanId(p.getPlanId(), UpmsState.ImplPlanDetailsState.PASSED);
             copied.setPlanDetails(details);
             if (details != null) {
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysImplPlanDetailsService.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplPlanDetails;
 
 /**
@@ -33,5 +34,5 @@ public interface SysImplPlanDetailsService extends IService<SysImplPlanDetails>
      * @param planId 计划ID
      * @return 计划详情
      */
-    SysImplPlanDetails getDetailsByPlanId(Integer planId);
+    SysImplPlanDetails getDetailsByPlanId(Integer planId, UpmsState.ImplPlanDetailsState detailsState);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysImplPlanDetailsServiceImpl.java

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplPlanDetails;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplementPlan;
 import com.qunzhixinxi.hnqz.admin.mapper.SysImplPlanDetailsMapper;
@@ -55,8 +56,12 @@ public class SysImplPlanDetailsServiceImpl extends ServiceImpl<SysImplPlanDetail
      * @return 计划详情
      */
     @Override
-    public SysImplPlanDetails getDetailsByPlanId(Integer planId) {
-        List<SysImplPlanDetails> list = this.list(Wrappers.<SysImplPlanDetails>lambdaQuery().eq(SysImplPlanDetails::getPlanId, planId));
+    public SysImplPlanDetails getDetailsByPlanId(Integer planId, UpmsState.ImplPlanDetailsState detailsState) {
+        List<SysImplPlanDetails> list = this.list(Wrappers.<SysImplPlanDetails>lambdaQuery()
+                .eq(SysImplPlanDetails::getDetailsState, detailsState)
+                .eq(SysImplPlanDetails::getPlanId, planId)
+                .orderByDesc(SysImplPlanDetails::getCreateTime)
+        );
         return CollUtil.isNotEmpty(list) ? list.get(0) : null;
     }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -176,7 +176,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
                     t.setCreateUser(userId);
                     t.setUpdateTime(now);
                     t.setUpdateUser(userId);
-                    t.setBaseId(tt.getId());
+                    t.setBaseId(tt.getBaseId());
                     t.setRealFlag(tt.getRealFlag());
                     t.setRuleId(entity.getId().toString());
                     t.setParentId(tt.getParentId());