Merge branch 'hotfix-20221201-entapprove' into temp-pre

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 ("2".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态，才设置
-						map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
-					} else {
-						map.put("reportApprovalOpinion", "1");
-					}
+					map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
 				} else if (dept.getLevel() == 3) {//一级代理商类型
-					if ("2".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态，才设置
-						map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
-					} else {
-						map.put("reportApprovalOpinion", "1");
-					}
+					map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
 				} else if (dept.getLevel() == 4) {//二级代理商类型
-					if ("2".equals(wmtask.getReportDrugApprovalStatus())) {
-						// 只有已提交待审批的状态，才设置
-						map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
-					} else {
-						map.put("reportApprovalOpinion", "1");
-					}
+					map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
 				}
 				// 姓名
 				if (StringUtils.isNumeric(wmtask.getTaskUserId())) {