|
@@ -20,18 +20,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.SysCheckChainNodeCheckHistoryDTO;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaPharmacy;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageSettleNote;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
|
|
|
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.CommonEvidenceDTO;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.enums.ChannelEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
|
|
@@ -47,18 +37,9 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmReportMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmTaskContentMapper;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysPublicParamService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysUserService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmDaPharmacyService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmScoreTaskTypeService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.*;
|
|
|
import com.qunzhixinxi.hnqz.admin.util.RegUtils;
|
|
|
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
|
import com.qunzhixinxi.hnqz.common.core.exception.BizException;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
|
|
@@ -124,10 +105,11 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
private final WmScorePackageStatusService wmScorePackageStatusService;
|
|
|
private final SysPublicParamService sysPublicParamService;
|
|
|
private final WmScoreTaskTypeService wmScoreTaskTypeService;
|
|
|
+ private final WmTaskTypeService taskTypeService;
|
|
|
private final SysUserService userService;
|
|
|
- private WmDaHospitalService wmDaHospitalService;
|
|
|
- private WmDaPharmacyService wmDaPharmacyService;
|
|
|
- private WmDaDistributionService wmDaDistributionService;
|
|
|
+ private final WmDaHospitalService wmDaHospitalService;
|
|
|
+ private final WmDaPharmacyService wmDaPharmacyService;
|
|
|
+ private final WmDaDistributionService wmDaDistributionService;
|
|
|
private final RedisTemplate<String, Object> redisTemplate;
|
|
|
private final UpmsConfig upmsConfig;
|
|
|
private final SysCheckChainManager checkChainManager;
|
|
@@ -1470,8 +1452,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
wmTask.setScorePackageLevel1Id(wmTask.getScorePackageId());
|
|
|
wmTask.setScorePackageId(null);
|
|
|
}
|
|
|
- wmTask.setDelFlag("0");
|
|
|
- wmTask.setRealFlag("0");
|
|
|
+ wmTask.setDelFlag(CommonConstants.STATUS_NORMAL);
|
|
|
+ wmTask.setRealFlag(CommonConstants.STATUS_NORMAL);
|
|
|
|
|
|
IPage<WmTask> taskPage = wmTaskMapper.getWmTaskList(page, wmTask);
|
|
|
if (CollUtil.isNotEmpty(taskPage.getRecords())) {
|
|
@@ -1487,21 +1469,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
if (CollUtil.isNotEmpty(approvalUserIds)) {
|
|
|
List<SysUser> users = userService.listByIds(approvalUserIds);
|
|
|
userMap = users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
|
|
|
-
|
|
|
- //taskPage.getRecords().stream()
|
|
|
- // .filter(r -> r.getApprovalUserId() != null)
|
|
|
- // .forEach(r -> r.setApprovalUserName(userMap.get(r.getApprovalUserId())));
|
|
|
-
|
|
|
}
|
|
|
|
|
|
for (WmTask task : taskPage.getRecords()) {
|
|
|
if (task.getApprovalUserId() != null && CollUtil.isNotEmpty(userMap)) {
|
|
|
task.setApprovalUserName(userMap.get(task.getApprovalUserId()));
|
|
|
}
|
|
|
-
|
|
|
task.setCheckState(targetLatestCheckState.get(Integer.parseInt(task.getId())));
|
|
|
- }
|
|
|
|
|
|
+ // 任务类型的名称
|
|
|
+ String taskTypeId = task.getTaskTypeId();
|
|
|
+ WmTaskType taskType = taskTypeService.getById(taskTypeId);
|
|
|
+ if (Objects.nonNull(taskType)){
|
|
|
+ task.setTaskTypeName(taskType.getTaskTypeName());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return R.ok(taskPage);
|