|
|
@@ -1060,18 +1060,22 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
map.put("reportNo",wmReport.getReportNo());
|
|
|
map.put("scoreId",wmReport.getScoreId());
|
|
|
if("0".equals(scorePackage.getTypeid())){//药企
|
|
|
- map.put("reportApprovalOpinion",wmtask.getReportDrugApprovalOpinion());
|
|
|
+ map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
|
+ map.put("reportApprovalInfo", wmtask.getReportDrugApprovalInfo());
|
|
|
}else if("1".equals(scorePackage.getTypeid())){//一级代理商类型
|
|
|
// map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
|
|
|
if (StrUtil.isNotBlank(wmtask.getReportDrugApprovalOpinion())) {
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportDrugApprovalOpinion());
|
|
|
+ map.put("reportApprovalInfo", wmtask.getReportDrugApprovalInfo());
|
|
|
} else {
|
|
|
// 解决一级代理商自己给自己发包的情况
|
|
|
map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
|
|
|
+ map.put("reportApprovalInfo", wmtask.getReportOneApprovalInfo());
|
|
|
}
|
|
|
}else if("2".equals(scorePackage.getTypeid())){//二级代理商类型
|
|
|
// map.put("reportApprovalOpinion",wmtask.getReportSecondApprovalOpinion());
|
|
|
- map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
|
|
|
+ map.put("reportApprovalOpinion", wmtask.getReportOneApprovalOpinion());
|
|
|
+ map.put("reportApprovalInfo", wmtask.getReportOneApprovalInfo());
|
|
|
}
|
|
|
// 姓名
|
|
|
if (StringUtils.isNumeric(wmtask.getTaskUserId())) {
|
