|
@@ -137,11 +137,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
- //Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
|
|
|
- //Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
|
|
|
- //List<WmScorePackage> scorePackageList = wmScorePackageService.listByIds(scoreIds);
|
|
|
+ // Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
|
|
|
+ // Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
|
|
|
+ // List<WmScorePackage> scorePackageList = wmScorePackageService.listByIds(scoreIds);
|
|
|
//// 积分包对应的审核管理费
|
|
|
- //Map<String, BigDecimal> packageAuditManagFeeRatesMap = scorePackageList.stream()
|
|
|
+ // Map<String, BigDecimal> packageAuditManagFeeRatesMap = scorePackageList.stream()
|
|
|
// .collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getAuditManagementFeeRates));
|
|
|
|
|
|
for (WmReport report : records) {
|
|
@@ -249,7 +249,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public R updateReportStatus(WmReport wmReport) {
|
|
|
HnqzUser user = SecurityUtils.getUser();
|
|
|
- //提交修改状态,更新时间
|
|
|
+ // 提交修改状态,更新时间
|
|
|
LambdaUpdateWrapper<WmReport> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.set(WmReport::getUpdatePeople, user.getId());
|
|
|
updateWrapper.set(WmReport::getUpdateTime, LocalDateTime.now());
|
|
@@ -260,7 +260,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
return R.failed("更新报告状态失败");
|
|
|
|
|
|
}
|
|
|
- //报告状态更新之后,要同时更新任务的报告审核状态
|
|
|
+ // 报告状态更新之后,要同时更新任务的报告审核状态
|
|
|
updateTaskStatusByReport(wmReport);
|
|
|
|
|
|
return R.ok("成功");
|
|
@@ -275,10 +275,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void updateTaskStatusByReport(WmReport wmReport) {
|
|
|
WmScorePackage scorePackage = wmScorePackageService.getById(wmReport.getScoreId());
|
|
|
- //typeid 0 药企 1一级代理商 2二级代理商 3全职学术推广员 4兼职学术推广员
|
|
|
+ // typeid 0 药企 1一级代理商 2二级代理商 3全职学术推广员 4兼职学术推广员
|
|
|
LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
if ("1".equals(wmReport.getDelFlag())) {
|
|
|
updateWrapper.set(WmTask::getReportDrugId, null);
|
|
|
updateWrapper.set(WmTask::getReportDrugApprovalOpinion, null);
|
|
@@ -286,18 +286,18 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
}
|
|
|
updateWrapper.set(WmTask::getReportDrugApprovalStatus, wmReport.getReportStatus());
|
|
|
updateWrapper.eq(WmTask::getReportDrugId, wmReport.getId());
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
if ("1".equals(wmReport.getDelFlag())) {
|
|
|
updateWrapper.set(WmTask::getReportOneId, null);
|
|
|
updateWrapper.set(WmTask::getReportOneApprovalOpinion, null);
|
|
|
updateWrapper.set(WmTask::getReportOneApprovalInfo, null);
|
|
|
}
|
|
|
- if (SecurityUtils.getRoles().contains(3)) {//药企
|
|
|
+ if (SecurityUtils.getRoles().contains(3)) {// 药企
|
|
|
updateWrapper.set(WmTask::getReportDrugApprovalStatus, wmReport.getReportStatus());
|
|
|
}
|
|
|
updateWrapper.set(WmTask::getReportOneApprovalStatus, wmReport.getReportStatus());
|
|
|
updateWrapper.eq(WmTask::getReportOneId, wmReport.getId());
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
if ("1".equals(wmReport.getDelFlag())) {
|
|
|
updateWrapper.set(WmTask::getReportSecondId, null);
|
|
|
updateWrapper.set(WmTask::getReportSecondApprovalOpinion, null);
|
|
@@ -377,7 +377,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalInfo, approvalInfo);
|
|
|
}
|
|
|
} else if (roles.contains(4)) {
|
|
|
- //一级代理商类型
|
|
|
+ // 一级代理商类型
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalOpinion, approvalOpinion);
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalInfo, approvalInfo);
|
|
@@ -403,13 +403,13 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
}
|
|
|
|
|
|
WmTask taskSelect = new WmTask();
|
|
|
- if ("0".equals(reportScorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(reportScorePackage.getTypeid())) {// 药企
|
|
|
taskSelect.setReportDrugId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportDrugApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("1".equals(reportScorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(reportScorePackage.getTypeid())) {// 一级代理商类型
|
|
|
taskSelect.setReportOneId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportOneApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("2".equals(reportScorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(reportScorePackage.getTypeid())) {// 二级代理商类型
|
|
|
taskSelect.setReportSecondId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportSecondApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
}
|
|
@@ -526,15 +526,15 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
/**
|
|
|
* 结算报告审批-快速批量任务审核
|
|
|
*
|
|
|
- * @param reportId 报告id
|
|
|
- * @param taskIdList 任务id列表
|
|
|
- * @param approvalOpinion 审核状态(1-通过,2-不通过)
|
|
|
- * @param approvalInfo 审批说明
|
|
|
+ * @param reportId 报告id
|
|
|
+ * @param taskIdAndNodeIdMap 任务id列表
|
|
|
+ * @param approvalOpinion 审核状态(1-通过,2-不通过)
|
|
|
+ * @param approvalInfo 审批说明
|
|
|
* @return 审核结果
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public Boolean batchApprovalTask(String reportId, List<String> taskIdList, String approvalOpinion, String approvalInfo) {
|
|
|
+ public Boolean batchApprovalTask(String reportId, Map<String, Integer> taskIdAndNodeIdMap, String approvalOpinion, String approvalInfo) {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
Integer operatorId = SecurityUtils.getUser().getId();
|
|
|
|
|
@@ -547,7 +547,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
}
|
|
|
|
|
|
// 批量查询任务
|
|
|
- List<WmTask> wmTasks = wmTaskService.listByIds(taskIdList);
|
|
|
+ List<WmTask> wmTasks = wmTaskService.listByIds(taskIdAndNodeIdMap.keySet());
|
|
|
Map<String, WmTask> taskMap = wmTasks.stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
|
|
|
|
Set<String> scorePackageIds = wmTasks.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet());
|
|
@@ -562,7 +562,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
Integer reportScorePackageId = queryReport.getScoreId();
|
|
|
WmScorePackage reportScorePackage = wmScorePackageService.getById(reportScorePackageId);
|
|
|
|
|
|
- taskIdList.forEach(id -> {
|
|
|
+ taskIdAndNodeIdMap.keySet().forEach(id -> {
|
|
|
// 查询这条任务
|
|
|
WmTask queryTask = taskMap.get(id);
|
|
|
if (queryTask == null) {
|
|
@@ -591,7 +591,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalInfo, approvalInfo);
|
|
|
}
|
|
|
} else if (roles.contains(4)) {
|
|
|
- //一级代理商类型
|
|
|
+ // 一级代理商类型
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalOpinion, approvalOpinion);
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalInfo, approvalInfo);
|
|
@@ -619,16 +619,25 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
throw new RuntimeException("操作失败,请重试");
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ SysCheckChainNodeCheckHistoryDTO.OnCreate res = new SysCheckChainNodeCheckHistoryDTO.OnCreate();
|
|
|
+ res.setNodeId(taskIdAndNodeIdMap.get(id));
|
|
|
+ res.setTargetId(Integer.valueOf(id));
|
|
|
+ res.setCheckResult("1".equals(approvalOpinion));
|
|
|
+ res.setCheckMessage("1".equals(approvalOpinion) ? "批量通过" : "批量拒绝");
|
|
|
+
|
|
|
+ checkChainManager.doCheck(Collections.singletonList(res), SecurityUtils.getUser());
|
|
|
+
|
|
|
});
|
|
|
|
|
|
WmTask taskSelect = new WmTask();
|
|
|
- if ("0".equals(reportScorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(reportScorePackage.getTypeid())) {// 药企
|
|
|
taskSelect.setReportDrugId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportDrugApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("1".equals(reportScorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(reportScorePackage.getTypeid())) {// 一级代理商类型
|
|
|
taskSelect.setReportOneId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportOneApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("2".equals(reportScorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(reportScorePackage.getTypeid())) {// 二级代理商类型
|
|
|
taskSelect.setReportSecondId(Integer.valueOf(reportId));
|
|
|
taskSelect.setReportSecondApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
}
|
|
@@ -753,7 +762,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
|
|
|
WmScorePackage scorePackage = wmScorePackageService.getById(wmReport.getScoreId());
|
|
|
//// 如果是源头积分包,则判断是否审核入库调查信息
|
|
|
- //if (StringUtils.isBlank(scorePackage.getRelationScoreId())) {
|
|
|
+ // if (StringUtils.isBlank(scorePackage.getRelationScoreId())) {
|
|
|
// List<WmTask> tasks = wmTaskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getId, taskIds));
|
|
|
// // 调查信息审核(15、30-医院 16-商业公司 18-药店)
|
|
|
// tasks.forEach(task -> {
|
|
@@ -793,11 +802,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
Integer userId = SecurityUtils.getUser().getId();
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
|
- //更新任务表审批意见,查询所有未审核的任务,判断报告关联任务是否全部审核
|
|
|
+ // 更新任务表审批意见,查询所有未审核的任务,判断报告关联任务是否全部审核
|
|
|
LambdaUpdateWrapper<WmTask> updateTaskWrapper = new LambdaUpdateWrapper<>();
|
|
|
WmTask wmTask = new WmTask();
|
|
|
- //if (SecurityUtils.getRoles().contains(3)) {//药企
|
|
|
- if (SecurityUtils.getRoles().contains(39)) {//总经理
|
|
|
+ // if (SecurityUtils.getRoles().contains(3)) {//药企
|
|
|
+ if (SecurityUtils.getRoles().contains(39)) {// 总经理
|
|
|
updateTaskWrapper.set(WmTask::getReportDrugApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
|
|
|
updateTaskWrapper.set(WmTask::getReportDrugApprovalOpinion, approvalOpinion);
|
|
|
updateTaskWrapper.set(WmTask::getReportDrugApprovalInfo, approvalInfo);
|
|
@@ -810,8 +819,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
|
|
|
}
|
|
|
|
|
|
- //else if (SecurityUtils.getRoles().contains(4)) {//一级代理商类型
|
|
|
- else if (SecurityUtils.getRoles().contains(4)) {//区域
|
|
|
+ // else if (SecurityUtils.getRoles().contains(4)) {//一级代理商类型
|
|
|
+ else if (SecurityUtils.getRoles().contains(4)) {// 区域
|
|
|
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalStatus, ReportEnum.REPORT_STATUS_CREATE.getType());
|
|
|
updateTaskWrapper.set(WmTask::getReportOneApprovalOpinion, approvalOpinion);
|
|
@@ -823,13 +832,13 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
wmTask.setReportDrugId(wmReport.getId());
|
|
|
wmTask.setReportDrugApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
wmTask.setReportOneId(wmReport.getId());
|
|
|
wmTask.setReportOneApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
wmTask.setReportSecondId(wmReport.getId());
|
|
|
wmTask.setReportSecondApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
|
|
|
}
|
|
@@ -859,16 +868,16 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
checkChainManager.doCheck(collect, SecurityUtils.getUser());
|
|
|
|
|
|
|
|
|
- //该报告关联的所有未提交的任务
|
|
|
+ // 该报告关联的所有未提交的任务
|
|
|
List<WmTask> taskList = wmTaskService.list(Wrappers.query(wmTask));
|
|
|
|
|
|
// 更新报告状态 START======================================================
|
|
|
- //提交修改状态,更新时间
|
|
|
+ // 提交修改状态,更新时间
|
|
|
LambdaUpdateWrapper<WmReport> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
- //判断任务是不是已经全部审核完成,所有的任务都完成才算完成
|
|
|
- if (taskList.isEmpty()) {//taskList为空,说明任务都已审核
|
|
|
+ // 判断任务是不是已经全部审核完成,所有的任务都完成才算完成
|
|
|
+ if (taskList.isEmpty()) {// taskList为空,说明任务都已审核
|
|
|
updateWrapper.set(WmReport::getReportStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
|
|
|
- } else {//不为空,说明是部分审批
|
|
|
+ } else {// 不为空,说明是部分审批
|
|
|
updateWrapper.set(WmReport::getReportStatus, ReportEnum.REPORT_STATUS_PART_APPROVAL.getType());
|
|
|
}
|
|
|
updateWrapper.set(WmReport::getUpdatePeople, userId);
|
|
@@ -891,7 +900,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
WmScorePackageStatus scorePackageStatus = new WmScorePackageStatus();
|
|
|
scorePackageStatus.setPackageId(task.getScorePackageId());
|
|
|
scorePackageStatus.setUserId(task.getTaskUserId());
|
|
|
- scorePackageStatus.setStatus("2");//接单审核通过
|
|
|
+ scorePackageStatus.setStatus("2");// 接单审核通过
|
|
|
WmScorePackageStatus updateScorePackageStatus = wmScorePackageStatusService.getOne(Wrappers.query(scorePackageStatus));
|
|
|
// 查询已提交的任务(除去审核不通过的任务)
|
|
|
Wrapper<WmTask> taskQueryWrapper = Wrappers.<WmTask>lambdaQuery()
|
|
@@ -1012,39 +1021,39 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
WmScorePackage scorePackage = wmScorePackageService.getById(wmReport.getScoreId());
|
|
|
LambdaQueryWrapper<WmTask> lambdaQueryWrapper = Wrappers.<WmTask>query().lambda();
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, wmReport.getId())
|
|
|
- .or().eq(WmTask::getReportOneId, wmReport.getId())
|
|
|
- .or().eq(WmTask::getReportSecondId, wmReport.getId()));
|
|
|
+ .or().eq(WmTask::getReportOneId, wmReport.getId())
|
|
|
+ .or().eq(WmTask::getReportSecondId, wmReport.getId()));
|
|
|
// 如果是审批页面,则过滤掉通过和不通过的数据(reportDrugApprovalOpinion或reportOneApprovalOpinion:1通过,2不通过)
|
|
|
if (isApprovalPage != null && isApprovalPage.equals(1)) {
|
|
|
lambdaQueryWrapper.eq(WmTask::getTaskStatus, "3");
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion)
|
|
|
.eq(WmTask::getReportOneApprovalOpinion, "1")
|
|
|
.eq(WmTask::getReportOneApprovalStatus, "2")
|
|
|
);
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
|
|
|
}
|
|
|
} else {
|
|
|
// 查看页面, 审核状态筛选条件
|
|
|
if (StrUtil.equals("0", reportApprovalOpinion)) {
|
|
|
// 未审核的条件
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
|
|
|
}
|
|
|
} else if (StrUtil.equalsAny(reportApprovalOpinion, "1", "2")) {
|
|
|
// 审核通过/不通过的条件
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, reportApprovalOpinion);
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, reportApprovalOpinion);
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
lambdaQueryWrapper.eq(WmTask::getReportOneApprovalOpinion, reportApprovalOpinion);
|
|
|
}
|
|
|
}
|
|
@@ -1105,10 +1114,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
Map map = JSON.parseObject(JSON.toJSONString(wmtask), Map.class);
|
|
|
map.put("reportNo", wmReport.getReportNo());
|
|
|
map.put("scoreId", wmReport.getScoreId());
|
|
|
- if ("0".equals(scorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(scorePackage.getTypeid())) {// 药企
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
|
map.put("reportApprovalInfo", wmtask.getReportDrugApprovalInfo());
|
|
|
- } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(scorePackage.getTypeid())) {// 一级代理商类型
|
|
|
// map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
|
|
|
if (StrUtil.isNotBlank(wmtask.getReportDrugApprovalOpinion())) {
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
@@ -1118,7 +1127,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
|
|
|
map.put("reportApprovalInfo", wmtask.getReportOneApprovalInfo());
|
|
|
}
|
|
|
- } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(scorePackage.getTypeid())) {// 二级代理商类型
|
|
|
// map.put("reportApprovalOpinion",wmtask.getReportSecondApprovalOpinion());
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
|
|
|
map.put("reportApprovalInfo", wmtask.getReportOneApprovalInfo());
|
|
@@ -1282,11 +1291,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
Map<String, Object> map = JSON.parseObject(JSON.toJSONString(wmtask), Map.class);
|
|
|
map.put("reportNo", wmtask.getReportNo());
|
|
|
map.put("scoreId", wmtask.getScoreId());
|
|
|
- if (dept.getLevel() == 2) {//药企
|
|
|
+ if (dept.getLevel() == 2) {// 药企
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
|
- } else if (dept.getLevel() == 3) {//一级代理商类型
|
|
|
+ } else if (dept.getLevel() == 3) {// 一级代理商类型
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
|
- } else if (dept.getLevel() == 4) {//二级代理商类型
|
|
|
+ } else if (dept.getLevel() == 4) {// 二级代理商类型
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
|
|
|
}
|
|
|
// 姓名
|
|
@@ -1337,11 +1346,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, reportId)
|
|
|
.or().eq(WmTask::getReportOneId, reportId)
|
|
|
.or().eq(WmTask::getReportSecondId, reportId));
|
|
|
- if ("0".equals(reportScorePackage.getTypeid())) {//药企
|
|
|
+ if ("0".equals(reportScorePackage.getTypeid())) {// 药企
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
|
|
|
- } else if ("1".equals(reportScorePackage.getTypeid())) {//一级代理商类型
|
|
|
+ } else if ("1".equals(reportScorePackage.getTypeid())) {// 一级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
|
|
|
- } else if ("2".equals(reportScorePackage.getTypeid())) {//二级代理商类型
|
|
|
+ } else if ("2".equals(reportScorePackage.getTypeid())) {// 二级代理商类型
|
|
|
lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(taskTypeId)) {
|
|
@@ -1436,7 +1445,15 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
List<SysUser> userList = sysUserService.listByIds(taskList.stream().map(WmTask::getTaskUserId).collect(Collectors.toSet()));
|
|
|
Map<Integer, String> userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
|
|
|
|
|
|
+ // 任务审核状态
|
|
|
+ Set<Integer> taskIds = taskList.stream().mapToInt(task -> Integer.parseInt(task.getId())).boxed().collect(Collectors.toSet());
|
|
|
+
|
|
|
+ Map<Integer, Map<String, Object>> targetLatestCheckState = checkChainManager.getTargetLatestCheckState(taskIds);
|
|
|
+
|
|
|
taskList.forEach(wmTask -> {
|
|
|
+
|
|
|
+ wmTask.setCheckState(targetLatestCheckState.get(Integer.parseInt(wmTask.getId())));
|
|
|
+
|
|
|
WmScorePackage scorePackage = scorePackageMap.get(wmTask.getScorePackageId());
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>();
|