feat: 结算报告审批-任务复审

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

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -43,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -240,6 +242,30 @@ public class WmReportController {
 		return wmReportService.approvalReport(wmReport1,taskIds,approvalOpinion,approvalInfo);
 	}
 
+	/**
+	 * 结算报告审批-任务复审
+	 *
+	 * @param reportId        报告id
+	 * @param taskId          任务id
+	 * @param approvalOpinion 审核状态(1-通过，2-不通过)
+	 * @param approvalInfo    审批说明
+	 * @return 复审结果
+	 */
+	@SysLog("结算报告审批-任务复审")
+	@PostMapping("/review-task")
+	public R<?> reviewTask(@RequestBody Map<String, String> requestMap) {
+		String reportId = requestMap.get("reportId");
+		String taskId = requestMap.get("taskId");
+		String approvalOpinion = requestMap.get("approvalOpinion");
+		String approvalInfo = requestMap.get("approvalInfo");
+
+		if (!StrUtil.isAllNotBlank(reportId, taskId, approvalOpinion, approvalInfo)) {
+			return R.failed("必填参数为空");
+		}
+
+		return R.ok(wmReportService.reviewTask(reportId, taskId, approvalOpinion, approvalInfo));
+	}
+
 	/**
 	 * 结算报告--审批
 	 * reportStatus 1:待提交，2:已提交待审批 3：已部分审批  4：已退回 5:已审批待结单 6:已结单

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

@@ -38,6 +38,17 @@ public interface WmReportService extends IService<WmReport> {
 
 	R del(WmReport wmReport);
 
+	/**
+	 * 结算报告审批-任务复审
+	 *
+	 * @param reportId        报告id
+	 * @param taskId          任务id
+	 * @param approvalOpinion 审核状态(1-通过，2-不通过)
+	 * @param approvalInfo    审批说明
+	 * @return 复审结果
+	 */
+	Boolean reviewTask(String reportId, String taskId, String approvalOpinion, String approvalInfo);
+
 	R approvalReport(WmReport wmReport, List<String> taskIds, String approvalOpinion, String approvalInfo);
 
 	/**

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

@@ -45,6 +45,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.entity.dto.WmDeptTaskTypeConfigJsonDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.WmTaskVO;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
+import com.qunzhixinxi.hnqz.admin.enums.PackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
@@ -288,6 +289,200 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		wmTaskService.update(updateWrapper);
 	}
 
+	/**
+	 * 结算报告审批-任务复审
+	 *
+	 * @param reportId        报告id
+	 * @param taskId          任务id
+	 * @param approvalOpinion 审核状态(1-通过，2-不通过)
+	 * @param approvalInfo    审批说明
+	 * @return 复审结果
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean reviewTask(String reportId, String taskId, String approvalOpinion, String approvalInfo) {
+		WmReport queryReport = this.getById(reportId);
+		if(queryReport == null){
+			throw new RuntimeException("未查询到报告信息");
+		}
+		if (!CollUtil.toList(ReportEnum.REPORT_STATUS_SETTLE.getType(), ReportEnum.REPORT_STATUS_PART_APPROVAL.getType()).contains(queryReport.getReportStatus())) {
+			throw new RuntimeException("报告状态不支持复审");
+		}
+
+		// 查询任务
+		WmTask queryTask = wmTaskService.getById(taskId);
+
+		if (queryTask.getReviewTaskCount() > 0) {
+			throw new RuntimeException("不能重复审核");
+		}
+
+		LocalDateTime now = LocalDateTime.now();
+		Integer operatorId = SecurityUtils.getUser().getId();
+
+		// 查询企业对应的积分包
+		Integer reportScorePackageId = queryReport.getScoreId();
+		WmScorePackage reportScorePackage = wmScorePackageService.getById(reportScorePackageId);
+		// 查询任务对应的积分包
+		String taskScorePackageId = queryTask.getScorePackageId();
+		WmScorePackage taskScorePackage = wmScorePackageService.getById(taskScorePackageId);
+
+		// STEP1: 更新任务企业审核状态
+		LambdaUpdateWrapper<WmTask> updateTaskWrapper = new LambdaUpdateWrapper<>();
+		updateTaskWrapper.eq(WmTask::getId, taskId);
+		updateTaskWrapper.eq(queryTask.getUpdateTime() != null, WmTask::getUpdateTime, queryTask.getUpdateTime());
+		updateTaskWrapper.eq(queryTask.getUpdateUser() != null, WmTask::getUpdateUser, queryTask.getUpdateUser());
+		List<Integer> roles = SecurityUtils.getRoles();
+		if (roles.contains(3)) {
+			// 药企
+			updateTaskWrapper.set(WmTask::getReportDrugApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
+			updateTaskWrapper.set(WmTask::getReportDrugApprovalOpinion, approvalOpinion);
+			updateTaskWrapper.set(WmTask::getReportDrugApprovalInfo, approvalInfo);
+			if ("1".equals(reportScorePackage.getTypeid())) {
+				updateTaskWrapper.set(WmTask::getReportOneApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
+				updateTaskWrapper.set(WmTask::getReportOneApprovalOpinion, approvalOpinion);
+				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);
+			if ("2".equals(reportScorePackage.getTypeid())) {
+				updateTaskWrapper.set(WmTask::getReportSecondApprovalStatus, ReportEnum.REPORT_STATUS_SETTLE.getType());
+				updateTaskWrapper.set(WmTask::getReportSecondApprovalOpinion, approvalOpinion);
+				updateTaskWrapper.set(WmTask::getReportSecondApprovalInfo, approvalInfo);
+			}
+		}
+		// 审核状态同步
+		String taskStatus = "1".equals(approvalOpinion) ?
+				TaskStatusEnum.APPROVED.val() : TaskStatusEnum.FAIL_APPROVED.val();
+		updateTaskWrapper.set(WmTask::getTaskStatus, taskStatus);
+		updateTaskWrapper.set(WmTask::getRealFlag, "0");
+		updateTaskWrapper.set(WmTask::getDeptReviewTaskCount, 1);
+		updateTaskWrapper.set(WmTask::getUpdateTime, now);
+		updateTaskWrapper.set(WmTask::getUpdateUser, operatorId);
+		log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项approvalOpinion={},approvalInfo={},taskStatus={},realFlag={},deptReviewTaskCount={},updateTime={},updateUser={}",
+				taskId, queryTask.getUpdateTime(), queryTask.getUpdateUser(), approvalOpinion, approvalInfo, taskStatus, "0", 1, now, operatorId);
+		boolean updateTask = wmTaskService.update(updateTaskWrapper);
+		if (!updateTask) {
+			throw new RuntimeException("操作失败，请重试");
+		}
+
+		WmTask taskSelect = new WmTask();
+		if ("0".equals(reportScorePackage.getTypeid())) {//药企
+			taskSelect.setReportDrugId(Integer.valueOf(reportId));
+			taskSelect.setReportDrugApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
+		} else if ("1".equals(reportScorePackage.getTypeid())) {//一级代理商类型
+			taskSelect.setReportOneId(Integer.valueOf(reportId));
+			taskSelect.setReportOneApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
+		} else if ("2".equals(reportScorePackage.getTypeid())) {//二级代理商类型
+			taskSelect.setReportSecondId(Integer.valueOf(reportId));
+			taskSelect.setReportSecondApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
+		}
+		// 查询提交给企业的待审核的任务
+		int toApproveTaskCount = wmTaskMapper.selectCount(Wrappers.lambdaQuery(taskSelect)
+				.eq(WmTask::getScorePackageId, taskScorePackageId));
+
+		// STEP2: 更新报告状态
+		LambdaUpdateWrapper<WmReport> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.eq(WmReport::getId, Integer.valueOf(reportId));
+		updateWrapper.eq(queryReport.getUpdateTime() != null, WmReport::getUpdateTime, queryReport.getUpdateTime());
+		updateWrapper.eq(queryReport.getUpdatePeople() != null, WmReport::getUpdatePeople, queryReport.getUpdatePeople());
+		// 待审核任务数为空 则说明提交给企业的任务都已审核，否则是部分审核
+		String reportStatus = toApproveTaskCount <= 0 ?
+				ReportEnum.REPORT_STATUS_SETTLE.getType() : ReportEnum.REPORT_STATUS_PART_APPROVAL.getType();
+		updateWrapper.set(WmReport::getReportStatus, reportStatus);
+		updateWrapper.set(WmReport::getUpdatePeople, operatorId);
+		updateWrapper.set(WmReport::getUpdateTime, now);
+		log.info("report更新参数：条件id={},updateTime={},updatePeople={},更新项reportStatus={},updatePeople={},updateTime={}",
+				reportId, queryReport.getUpdateTime(), queryReport.getUpdatePeople(), reportStatus, operatorId, now);
+		boolean updateReport = this.update(updateWrapper);
+		if (!updateReport) {
+			throw new RuntimeException("操作失败，请重试");
+		}
+
+		// 查询已提交的任务（除去审核不通过的任务）
+		List<WmTask> submitedTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+				.eq(WmTask::getScorePackageId, taskScorePackageId)
+				.ne(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val())
+				.eq(WmTask::getRealFlag, "0"));
+		// 统计判断任务累计积分是否达到积分包的预设值
+		int totalTaskScore = submitedTaskList.stream().mapToInt(WmTask::getScore).sum();
+
+		// STEP3: 更新领包记录
+		List<WmScorePackageStatus> packageStatusList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
+				.eq(WmScorePackageStatus::getStatus, PackageStatusEnum.APPROVED.val())
+				.eq(WmScorePackageStatus::getPackageId, taskScorePackageId));
+		if (CollUtil.isNotEmpty(packageStatusList)) {
+			String taskAddFlagStr = totalTaskScore >= reportScorePackage.getScore() ? "0" : "1";
+			// 修改领包记录状态
+			packageStatusList.forEach(packageStatus -> {
+				LambdaUpdateWrapper<WmScorePackageStatus> updateStatusWrapper = Wrappers.<WmScorePackageStatus>lambdaUpdate()
+						.eq(WmScorePackageStatus::getId, packageStatus.getId())
+						.eq(packageStatus.getUpdateTime() != null, WmScorePackageStatus::getUpdateTime, packageStatus.getUpdateTime())
+						.eq(packageStatus.getUpdateUser() != null, WmScorePackageStatus::getUpdateUser, packageStatus.getUpdateUser())
+						.set(WmScorePackageStatus::getTaskAddFlag, taskAddFlagStr)
+						.set(WmScorePackageStatus::getUpdateTime, now)
+						.set(WmScorePackageStatus::getUpdateUser, operatorId);
+				log.info("pacakgeStatus更新参数：条件id={},updateTime={},updateUser={},更新项taskAddFlag={},updateTime={},updateUser={}",
+						packageStatus.getId(), packageStatus.getUpdateTime(), packageStatus.getUpdateUser(), taskAddFlagStr, now, operatorId);
+				boolean pacakgeStatusUpdate = wmScorePackageStatusService.update(updateStatusWrapper);
+				if (!pacakgeStatusUpdate) {
+					throw new RuntimeException("操作失败，请重试");
+				}
+			});
+		}
+
+		// STEP4: 更新积分包状态
+		if ("2".equals(approvalOpinion)) {
+			// 审核不通过，则释放积分值，从而直接可以重新做任务
+			String scorePackageStatus = totalTaskScore >= reportScorePackage.getScore() ?
+					ScorePackageStatusEnum.TO_BE_SETTLED.val() : ScorePackageStatusEnum.IN_PROGRESS.val();
+			String taskAddFlagStr = totalTaskScore >= reportScorePackage.getScore() ? "0" : "1";
+			// 更新积分包
+			log.info("scorePackage更新参数：条件id={},updateTime={},updateUser={},更新项scorePackageStatus={},taskAddFlag={},updateTime={},updateUser={}",
+					taskScorePackageId, taskScorePackage.getUpdateTime(), taskScorePackage.getUpdateUser(), scorePackageStatus, taskAddFlagStr, now, operatorId);
+			boolean updateScorePackage = wmScorePackageService.update(Wrappers.<WmScorePackage>lambdaUpdate()
+					.eq(WmScorePackage::getId, taskScorePackageId)
+					.eq(reportScorePackage.getUpdateTime() != null, WmScorePackage::getUpdateTime, reportScorePackage.getUpdateTime())
+					.eq(reportScorePackage.getUpdateUser() != null, WmScorePackage::getUpdateUser, reportScorePackage.getUpdateUser())
+					.set(WmScorePackage::getScorePackageStatus, scorePackageStatus)
+					.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr)
+					.set(WmScorePackage::getUpdateTime, now)
+					.set(WmScorePackage::getUpdateUser, operatorId));
+			if (!updateScorePackage) {
+				throw new RuntimeException("操作失败，请重试");
+			}
+		} else if ("1".equals(approvalOpinion)) {
+			// 审核通过，则判断企业审核通过积分值是否达到积分包的预设值
+			List<WmTask> approvalTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+					.eq(WmTask::getScorePackageId, taskScorePackageId)
+					.eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val())
+					.eq(WmTask::getRealFlag, "0")
+					.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
+							.or().eq(WmTask::getReportOneApprovalOpinion, "1")));
+			int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
+			String scorePackageStatus = totalScore >= reportScorePackage.getScore() ?
+					ScorePackageStatusEnum.TO_BE_SETTLED.val() : ScorePackageStatusEnum.IN_PROGRESS.val();
+			String taskAddFlagStr = totalScore >= reportScorePackage.getScore() ? "0" : "1";
+			// 更新积分包
+			log.info("scorePackage更新参数：条件id={},updateTime={},updateUser={},更新项scorePackageStatus={},taskAddFlag={},updateTime={},updateUser={}",
+					taskScorePackageId, taskScorePackage.getUpdateTime(), taskScorePackage.getUpdateUser(), scorePackageStatus, taskAddFlagStr, now, operatorId);
+			boolean updateScorePackage = wmScorePackageService.update(Wrappers.<WmScorePackage>lambdaUpdate()
+					.eq(WmScorePackage::getId, taskScorePackageId)
+					.eq(reportScorePackage.getUpdateTime() != null, WmScorePackage::getUpdateTime, reportScorePackage.getUpdateTime())
+					.eq(reportScorePackage.getUpdateUser() != null, WmScorePackage::getUpdateUser, reportScorePackage.getUpdateUser())
+					.set(WmScorePackage::getScorePackageStatus, scorePackageStatus)
+					.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr)
+					.set(WmScorePackage::getUpdateTime, now)
+					.set(WmScorePackage::getUpdateUser, operatorId));
+			if (!updateScorePackage) {
+				throw new RuntimeException("操作失败，请重试");
+			}
+		}
+
+		return Boolean.TRUE;
+	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)

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

@@ -2512,6 +2512,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean reviewTask(String id, String taskStatus, String taskStatusInfo) {
 		LocalDateTime now = LocalDateTime.now();
+		Integer operatorId = SecurityUtils.getUser().getId();
 		boolean approved = TaskStatusEnum.APPROVED.val().equals(taskStatus);
 		// 查询这条任务
 		WmTask queryTask = this.getById(id);
@@ -2521,19 +2522,24 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		if (queryTask.getReviewTaskCount() > 0) {
 			throw new RuntimeException("不能重复审核");
 		}
+		if (!CollUtil.toList(TaskStatusEnum.APPROVED.val(), TaskStatusEnum.FAIL_APPROVED.val()).contains(queryTask.getTaskStatus())) {
+			throw new RuntimeException("任务状态不支持复审");
+		}
 
 		// STEP1：更新task状态
 		String realFlag = approved ? CommonConstants.STATUS_NORMAL : CommonConstants.STATUS_DEL;
 		LambdaUpdateWrapper<WmTask> taskUpdateWrapper = Wrappers.<WmTask>lambdaUpdate()
 				.eq(WmTask::getId, id)
-				.eq(WmTask::getUpdateTime, queryTask.getUpdateTime())
+				.eq(queryTask.getUpdateTime() != null, WmTask::getUpdateTime, queryTask.getUpdateTime())
+				.eq(queryTask.getUpdateUser() != null, WmTask::getUpdateUser, queryTask.getUpdateUser())
 				.set(WmTask::getTaskStatus, taskStatus)
 				.set(WmTask::getRealFlag, realFlag)
 				.set(WmTask::getTaskStatusInfo, taskStatusInfo)
 				.set(WmTask::getReviewTaskCount, 1)
-				.set(WmTask::getUpdateTime, now);
-		log.info("task更新参数：条件id={},updateTime={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={}",
-				id, queryTask.getUpdateTime(), taskStatus, realFlag, taskStatusInfo, now);
+				.set(WmTask::getUpdateTime, now)
+				.set(WmTask::getUpdateUser, operatorId);
+		log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
+				id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, realFlag, taskStatusInfo, now, operatorId);
 		boolean taskUpdate = this.update(taskUpdateWrapper);
 		if (!taskUpdate) {
 			throw new RuntimeException("操作失败，请重试");
@@ -2560,11 +2566,13 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 			packageStatusList.forEach(packageStatus -> {
 				LambdaUpdateWrapper<WmScorePackageStatus> updateWrapper = Wrappers.<WmScorePackageStatus>lambdaUpdate()
 						.eq(WmScorePackageStatus::getId, packageStatus.getId())
-						.eq(WmScorePackageStatus::getUpdateTime, packageStatus.getUpdateTime())
+						.eq(packageStatus.getUpdateTime() != null, WmScorePackageStatus::getUpdateTime, packageStatus.getUpdateTime())
+						.eq(packageStatus.getUpdateUser() != null, WmScorePackageStatus::getUpdateUser, packageStatus.getUpdateUser())
 						.set(WmScorePackageStatus::getTaskAddFlag, taskAddFlagStr)
-						.set(WmScorePackageStatus::getUpdateTime, now);
-				log.info("pacakgeStatus更新参数：条件id={},updateTime={},更新项taskAddFlag={},updateTime={}",
-						packageStatus.getId(), packageStatus.getUpdateTime(), taskAddFlagStr, now);
+						.set(WmScorePackageStatus::getUpdateTime, now)
+						.set(WmScorePackageStatus::getUpdateUser, operatorId);
+				log.info("pacakgeStatus更新参数：条件id={},updateTime={},updateUser={},更新项taskAddFlag={},updateTime={},updateUser={}",
+						packageStatus.getId(), packageStatus.getUpdateTime(), packageStatus.getUpdateUser(), taskAddFlagStr, now, operatorId);
 				boolean pacakgeStatusUpdate = wmScorePackageStatusService.update(updateWrapper);
 				if (!pacakgeStatusUpdate) {
 					throw new RuntimeException("操作失败，请重试");
@@ -2577,11 +2585,12 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				PackageFinishStatusEnum.NOT_COMPLETE.val() : PackageFinishStatusEnum.COMPLETED.val();
 		LambdaUpdateWrapper<WmScorePackage> scorePackageUpdateWrapper = Wrappers.<WmScorePackage>lambdaUpdate()
 				.eq(WmScorePackage::getId, scorePackageId)
-				.eq(WmScorePackage::getUpdateTime, wmScorePackage.getUpdateTime())
-				// 积分包完成状态
+				.eq(wmScorePackage.getUpdateTime() != null, WmScorePackage::getUpdateTime, wmScorePackage.getUpdateTime())
+				.eq(wmScorePackage.getUpdateUser() != null, WmScorePackage::getUpdateUser, wmScorePackage.getUpdateUser())
 				.set(WmScorePackage::getPackageFinishStatus, packageFinishStatus)
-				// 是否可以做任务：已完成不可以做任务
-				.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr);
+				.set(WmScorePackage::getTaskAddFlag, taskAddFlagStr)
+				.set(WmScorePackage::getUpdateUser, wmScorePackage.getUpdateUser())
+				.set(WmScorePackage::getUpdateTime, now);
 		if (!taskAddFlag) {
 			// 积分包完成时间
 			scorePackageUpdateWrapper.set(WmScorePackage::getPackageFinishTime, now);
@@ -2591,8 +2600,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		} else {
 			scorePackageUpdateWrapper.set(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.IN_PROGRESS.val());
 		}
-		log.info("scorePackage更新参数：条件id={},updateTime={},更新项packageFinishStatus={},taskAddFlag={}",
-				scorePackageId, wmScorePackage.getUpdateTime(), packageFinishStatus, taskAddFlagStr);
+		log.info("scorePackage更新参数：条件id={},updateTime={},updateUser={},更新项packageFinishStatus={},taskAddFlag={},updateTime={},updateUser={}",
+				scorePackageId, wmScorePackage.getUpdateTime(), wmScorePackage.getUpdateUser(), packageFinishStatus, taskAddFlagStr, now, operatorId);
 		boolean packageUpdate = wmScorePackageService.update(scorePackageUpdateWrapper);
 		if (!packageUpdate) {
 			throw new RuntimeException("操作失败，请重试");
@@ -2604,7 +2613,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		}
 
 		// 移除图片缓存
-		this.removePicCache(queryTask);
+//		this.removePicCache(queryTask);
 
 		return Boolean.TRUE;
 	}
@@ -2618,8 +2627,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 	 */
 	private void task15_30_16_18(WmTask task, String taskStatus, String taskStatusInfo) {
 		if (!StrUtil.equals(taskStatus, TaskStatusEnum.FAIL_APPROVED.val())) {
-			// 复审不通过，则回退调查信息数据 TODO
-
+			// 复审不通过，暂不进行回退操作
 			return;
 		}
 		// 调查信息审核（15、30-医院 16-商业公司 18-药店）

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -73,6 +73,8 @@
 		<result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
 		<result property="taskStatusInfo" column="task_status_info"/>
 		<result property="taskFrom" column="task_from"/>
+		<result property="reviewTaskCount" column="review_task_count"/>
+		<result property="deptReviewTaskCount" column="dept_review_task_count"/>
 
 	</resultMap>
 
@@ -970,7 +972,8 @@
 		t.submit_status AS submit_status,
 		t.share_img_url AS share_img_url,
 		t.plat_audit_status AS plat_audit_status,
-		t.task_info_img AS task_info_img
+		t.task_info_img AS task_info_img,
+		t.review_task_count
 		FROM wm_task t
 		left join sys_user u on  u.user_id=t.task_user_id
 		left join sys_dept d on d.dept_id=t.dept_id