feat: 调查信息审核

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

@@ -19,6 +19,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -1458,6 +1459,37 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		updateWrapper.in(WmTask::getId, ids);
 		List<WmTask> wmTaskList = list(updateWrapper);
 
+		// 调查信息审核（15、30-医院 16-商业公司 18-药店）
+		wmTaskList.forEach(task -> {
+			String approvalOpinion = wmTask.getTaskStatus().equals(TaskStatusEnum.APPROVED.val()) ? "1" : "2";
+			if ("15".equals(task.getTaskTypeId()) || "30".equals(task.getTaskTypeId())) {
+				Map<String, Object> data = (Map<String, Object>) wmDaHospitalService.approvalHospital(task.getId()).getData();
+				WmTask _wmTask = (WmTask) data.get("wmTask");
+				Map<String, String> paramMap = BeanUtil.toBean(data.get("newinfo"), Map.class);
+				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
+				paramMap.put("approvalOpinion", approvalOpinion);
+				paramMap.put("compareResult", _wmTask.getCompareResult());
+				paramMap.put("taskId", task.getId());
+				wmDaHospitalService.updateByApproval(paramMap);
+			} else if ("16".equals(task.getTaskTypeId())) {
+				Map<String, Object> data = (Map<String, Object>) wmDaDistributionService.approvalDistribution(task.getId()).getData();
+				WmTask _wmTask = (WmTask) data.get("wmTask");
+				Map<String, String> paramMap = BeanUtil.toBean(data.get("newinfo"), Map.class);
+				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
+				paramMap.put("approvalOpinion", approvalOpinion);
+				paramMap.put("compareResult", _wmTask.getCompareResult());
+				paramMap.put("taskId", task.getId());
+				wmDaDistributionService.updateByApproval(paramMap);
+			} else if ("18".equals(task.getTaskTypeId())) {
+				Map<String, String> paramMap = MapUtil.newHashMap(4);
+				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
+				paramMap.put("approvalOpinion", approvalOpinion);
+				paramMap.put("compareResult", task.getCompareResult());
+				paramMap.put("taskId", task.getId());
+				wmDaPharmacyService.updateByapproval(paramMap);
+			}
+		});
+
 		switch (wmTask.getTaskStatus()){
 			case "3": // 审核通过
 
@@ -1522,37 +1554,6 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		//即，将real_flag=9更新成real_flag=1,将task_status=2更新成task_status=4
 		wmScorePackageStatusService.updateScorePackageStatus(scorePackageId);
 
-		// 调查信息审核（15、30-医院 16-商业公司 18-药店）
-		wmTaskList.forEach(task -> {
-			String approvalOpinion = wmTask.getTaskStatus().equals(TaskStatusEnum.APPROVED.val()) ? "1" : "2";
-			if ("15".equals(task.getTaskTypeId()) || "30".equals(task.getTaskTypeId())) {
-				Map<String, Object> data = (Map<String, Object>) wmDaHospitalService.approvalHospital(task.getId()).getData();
-				WmTask _wmTask = (WmTask) data.get("wmTask");
-				Map<String, String> paramMap = BeanUtil.toBean(data.get("info"), Map.class);
-				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
-				paramMap.put("approvalOpinion", approvalOpinion);
-				paramMap.put("compareResult", _wmTask.getCompareResult());
-				paramMap.put("taskId", task.getId());
-				wmDaHospitalService.updateByApproval(paramMap);
-			} else if ("16".equals(task.getTaskTypeId())) {
-				Map<String, Object> data = (Map<String, Object>) wmDaDistributionService.approvalDistribution(task.getId()).getData();
-				WmTask _wmTask = (WmTask) data.get("wmTask");
-				Map<String, String> paramMap = BeanUtil.toBean(data.get("info"), Map.class);
-				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
-				paramMap.put("approvalOpinion", approvalOpinion);
-				paramMap.put("compareResult", _wmTask.getCompareResult());
-				paramMap.put("taskId", task.getId());
-				wmDaDistributionService.updateByApproval(paramMap);
-			} else if ("18".equals(task.getTaskTypeId())) {
-				Map<String, Object> data = (Map<String, Object>) wmDaPharmacyService.approvalPharmacy(task.getId()).getData();
-				Map<String, String> paramMap = BeanUtil.toBean(data.get("info"), Map.class);
-				paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
-				paramMap.put("approvalOpinion", approvalOpinion);
-				paramMap.put("taskId", task.getId());
-				wmDaPharmacyService.updateByapproval(paramMap);
-			}
-		});
-
 		return R.ok("审核成功");
 	}