|
|
@@ -24,19 +24,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmReport;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.WmTask;
|
|
|
import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.mapper.WmReportMapper;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmReportService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
|
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.*;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
|
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -60,6 +59,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
private final WmTaskService wmTaskService;
|
|
|
private final WmReportMapper wmReportMapper;
|
|
|
private final SysDeptService sysDeptService;
|
|
|
+ private final SysUserService sysUserService;
|
|
|
|
|
|
@Override
|
|
|
public IPage<WmReport> getReportListPage(Page page, WmReport wmReport, String scoreId, String name){
|
|
|
@@ -293,6 +293,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
// map.put("reportApprovalOpinion",wmtask.getReportSecondApprovalOpinion());
|
|
|
map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
|
|
|
}
|
|
|
+ // 姓名
|
|
|
+ if (StringUtils.isNumeric(wmTask.getTaskUserId())) {
|
|
|
+ SysUser user = sysUserService.getById(Integer.parseInt(wmTask.getTaskUserId()));
|
|
|
+ map.put("taskUsername", user.getRealname());
|
|
|
+ }
|
|
|
return map;
|
|
|
}).collect(Collectors.toList());
|
|
|
|
