feat: 复审同步修改

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

@@ -752,7 +752,12 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 					map.put("reportApprovalOpinion",wmtask.getReportDrugApprovalOpinion());
 				}else if("1".equals(scorePackage.getTypeid())){//一级代理商类型
 //					map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
-					map.put("reportApprovalOpinion",wmtask.getReportDrugApprovalOpinion());
+					if (StrUtil.isNotBlank(wmtask.getReportDrugApprovalOpinion())) {
+						map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
+					} else {
+						// 解决一级代理商自己给自己发包的情况
+						map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
+					}
 				}else if("2".equals(scorePackage.getTypeid())){//二级代理商类型
 //					map.put("reportApprovalOpinion",wmtask.getReportSecondApprovalOpinion());
 					map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());

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

@@ -2524,6 +2524,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		if (!CollUtil.toList(TaskStatusEnum.APPROVED.val(), TaskStatusEnum.FAIL_APPROVED.val()).contains(queryTask.getTaskStatus())) {
 			throw new RuntimeException("任务状态不支持复审");
 		}
+		if (queryTask.getReportDrugId() != null || queryTask.getReportOneId() != null || queryTask.getReportSecondId() != null) {
+			throw new RuntimeException("已生成报告");
+		}
 
 		// 查询积分包
 		String scorePackageId = queryTask.getScorePackageId();

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

@@ -973,7 +973,10 @@
 		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.review_task_count
+		t.review_task_count,
+		t.report_drug_id,
+		t.report_one_id,
+		t.report_second_id
 		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