添加字段

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java

@@ -3,9 +3,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierUserMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewScoring;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTask;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplierUser;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskSupplierUserService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualAddScoreVo;
@@ -35,6 +38,8 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
     @Autowired
     private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
     @Autowired
+    private CoscoAnnualreviewTaskMapper coscoAnnualreviewTaskMapper;
+    @Autowired
     private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper;
 
     /**
@@ -45,10 +50,21 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
      */
     @Override
     public AnnualreviewTaskSupplierUserInfoVo selectCoscoAnnualreviewTaskSupplierUserById(String id) {
+        //获取人员信息
         CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserById(id);
+        //获取供应商信息
         BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoAnnualreviewTaskSupplierUser.getSupplierId());
+        //获取任务信息
+        CoscoAnnualreviewTask coscoAnnualreviewTask = coscoAnnualreviewTaskMapper.selectCoscoAnnualreviewTaskById(coscoAnnualreviewTaskSupplierUser.getAnnualreviewTaskId());
+        //返回封装
         AnnualreviewTaskSupplierUserInfoVo vo = new AnnualreviewTaskSupplierUserInfoVo();
+        vo.setId(id);
         vo.setName(baseCategoryNameVo.getName());
+        vo.setDeptName(SupplierUserConstant.CREATE_DEPT);
+        vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
+        vo.setReviewerName(SupplierUserConstant.USER_NAME);
+        vo.setStartTime(coscoAnnualreviewTask.getStartTime());
+        vo.setEndTime(coscoAnnualreviewTask.getEndTime());
         vo.setCategory(baseCategoryNameVo.getCategoryName());
         vo.setTaskIndicatorVo(coscoAnnualreviewScoringMapper.selectIndList(id));
         return vo;

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java

@@ -1,13 +1,17 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
+
+    private String id;
     /**
      * 供应商
      */
@@ -16,6 +20,31 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
      * 供应品类
      */
     private String category;
+
+    /**
+     * 审查主题
+     */
+    private String themName;
+    /**
+     * 所属部门
+     */
+    private String deptName;
+    /**
+     * 审查人
+     */
+    private String reviewerName;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+
     /**
      * 打分项集合
      */