From b6f22eb1211be90cacfa1c3c6a6622edec2784f7 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 16 Jul 2025 17:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=B8=E9=87=8F=E5=8F=8A?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/AnnualreviewTaskConstant.java | 25 ++++++++++++++++++- .../base/constant/TaskSelectConstant.java | 10 ++++++++ .../CoscoAnnualreviewTaskServiceImpl.java | 12 +++++++++ ...nualreviewTaskSupplierUserServiceImpl.java | 4 +++ .../coscoAnnualreview/vo/AddTaskVo.java | 12 +++++++++ .../vo/AnnualreviewTaskSupplierUserVo.java | 8 ++++++ .../vo/CoscoAnnualreviewTaskListVo.java | 4 +++ .../mapper/CoscoAnnualreviewTaskMapper.xml | 1 + ...oscoAnnualreviewTaskSupplierUserMapper.xml | 3 ++- 9 files changed, 77 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java index b679fc8..e717ae6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java @@ -21,7 +21,7 @@ public final class AnnualreviewTaskConstant { /** * 进行中 */ - public static final String IN_PROGRESS = "1L"; + public static final Long IN_PROGRESS = 1L; /** * 已完成 */ @@ -34,4 +34,27 @@ public final class AnnualreviewTaskConstant { * 审核不合格 */ public static final Long APPROVE_FAIL = 2L; + + /** + * 获取状态名称 + * + * @param status 状态值 + * @return 状态名称 + */ + public static String getStatusName(Long status) { + if (status == null) { + return "未知状态"; + } + switch (status.intValue()) { + case 0: + return "未开始"; + case 1: + return "进行中"; + case 2: + return "已结束"; + default: + return "未知状态"; + } + } + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java index 7de33f9..2e49721 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java @@ -9,4 +9,14 @@ public class TaskSelectConstant { * 用户 user */ public static final String USER = "user"; + + /** + * if(vo.getStatus().equals(0L)){ + * vo.setStatusName("未开始"); + * }else if (vo.getStatus().equals(1L)) { + * vo.setStatusName("进行中"); + * }else if (vo.getStatus().equals(2L)){ + * vo.setStatusName("已结束"); + * } + */ } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index 4d17828..fb9ae39 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -17,6 +17,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.SupplierPeopleVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; @@ -50,7 +52,11 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS @Autowired private IUserService userService; @Autowired + private CoscoAnnualreviewTemplateMapper coscoAnnualreviewTemplateMapper; + @Autowired private IOrgService orgService; + @Autowired + private CoscoCategoryMapper organizationMapper; /** * 查询供应商年审_年审任务主 @@ -70,9 +76,14 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS vo.setStartTime(coscoAnnualreviewTask.getStartTime()); vo.setAnnualreviewYear(coscoAnnualreviewTask.getAnnualreviewYear()); vo.setEndTime(coscoAnnualreviewTask.getEndTime()); + vo.setTemplateName(coscoAnnualreviewTemplateMapper.selectCoscoAnnualreviewTemplateById(coscoAnnualreviewTask.getTemplateId()).getTemplateName()); + if(coscoAnnualreviewTask.getCategoryId()!=null){ + vo.setCategoryName(organizationMapper.selectCategoryNameById(coscoAnnualreviewTask.getCategoryId())); + } vo.setCategoryId(coscoAnnualreviewTask.getCategoryId()); vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation()); vo.setStatus(coscoAnnualreviewTask.getStatus()); + vo.setStatusName(AnnualreviewTaskConstant.getStatusName(vo.getStatus())); List list = new ArrayList<>(); //根据任务id获取添加供应商信息 CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier(); @@ -274,6 +285,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS //获取查询任务部门信息 List deptIds = new ArrayList<>(); coscoAnnualreviewTaskListVoIPage.getRecords().forEach(ss -> { + ss.setCategoryName(organizationMapper.selectCategoryNameById(ss.getCategoryId())); OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(ss.getDeptId()); ss.setDeptName(orgDeptInfo.getOrgName()); }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java index f3ea956..29c3465 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java @@ -20,6 +20,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualAddScoreVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualTaskIndicatorVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierUserInfoVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierUserVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; @@ -48,6 +49,8 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua @Autowired private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper; @Autowired + private CoscoCategoryMapper coscoCategoryMapper; + @Autowired private IOrgService orgService; /** @@ -170,6 +173,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userVo1.getUserDeptId()); vo.setTenantName(orgDeptInfo.getOrgName()); } + vo.setCategoryName(coscoCategoryMapper.selectCategoryNameById(vo.getCategoryId())); }); return annualreviewTaskSupplierUserVoIPage; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java index 3d5c0dd..6b60758 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AddTaskVo.java @@ -21,4 +21,16 @@ public class AddTaskVo extends CoscoAnnualreviewTask { * 人员信息 */ private List userList; + /** + * 评价模板名称 + */ + private String templateName; + /** + * 品类名称 + */ + private String categoryName; + /** + * 评价状态名称 + */ + private String statusName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java index ee1ff1e..0d7418a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java @@ -82,6 +82,14 @@ public class AnnualreviewTaskSupplierUserVo implements Serializable { * 是否合格 */ private String qualified; + /** + * 品类id + */ + private String categoryId; + /** + * 品类名称 + */ + private String categoryName; /** * 部门id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java index 718d081..433c733 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java @@ -38,6 +38,10 @@ public class CoscoAnnualreviewTaskListVo implements Serializable { private String createBy; + private String categoryId; + + private String categoryName; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index 5c71dec..21bd790 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -218,6 +218,7 @@ cat.annualreview_theme AS annualreviewTheme, cat.start_time startTime, cat.end_time endTime, + cat.category_id AS categoryId, cat.`status`, cat.dept_id AS deptId, "单位" as deptName, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml index a4bd09f..49e81ff 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml @@ -45,7 +45,8 @@ csb.NAME, csb.id as supplierId, cat.dept_id as deptId, - cat.annualreview_theme, + cat.annualreview_theme as annualreviewTheme, + cat.category_id categoryId, '单位' AS deptName, cat.start_time startTime, cat.end_time endTime,