Jelajahi Sumber

fix: 企业审核限制只查询配置了的任务

lixuesong 2 tahun lalu
induk
melakukan
4cc60ca9c4

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

@@ -663,26 +663,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				map.put("reportNo", wmtask.getReportNo());
 				map.put("scoreId", wmtask.getScoreId());
 				if (dept.getLevel() == 2) {//药企
-//					if ("0".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态,才设置
-						map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
-//					} else {
-//						map.put("reportApprovalOpinion", "-");
-//					}
+					map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
 				} else if (dept.getLevel() == 3) {//一级代理商类型
-//					if ("0".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态,才设置
-						map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
-//					} else {
-//						map.put("reportApprovalOpinion", "-");
-//					}
+					map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
 				} else if (dept.getLevel() == 4) {//二级代理商类型
-//					if ("0".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态,才设置
-						map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
-//					} else {
-//						map.put("reportApprovalOpinion", "-");
-//					}
+					map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
 				}
 				// 姓名
 				if (StringUtils.isNumeric(wmtask.getTaskUserId())) {