列表修改

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java

@@ -9,4 +9,8 @@ public interface EvaluateTaskConstant {
      * 开启权重
      */
     public static final Long EVALUATE_TASK_WEIGHT_STATUS_YD = 1L;
+    /**
+     * Indicator_type
+     */
+    public static final String INDICATOR_TYPE_ND = "Indicator_type";
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java

@@ -7,6 +7,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
@@ -43,6 +45,8 @@ public class SynchronousController {
 
     @Autowired
     private ICoscoSupplierBaseService coscoSupplierBaseService;
+    @Autowired
+    private ICoscoEvaluateTaskService coscoEvaluateTaskService;
 
 
 
@@ -116,7 +120,13 @@ public class SynchronousController {
         return BaseResponse.success(coscoSupplierBaseService.updateCoscoSupplierBase(vo));
     }
 
-
+    /**
+     * 供应商评价审核审批回调接口
+     */
+    @PostMapping("/evaluateApprove")
+    public BaseResponse evaluateApprove(@RequestBody AddCoscoEvaluateTaskVo vo) {
+        return BaseResponse.success(coscoEvaluateTaskService.evaluateApprove(vo));
+    }
 
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistMapper.java

@@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
 import io.lettuce.core.dynamic.annotation.Param;
 
@@ -78,4 +79,10 @@ public interface CoscoBlacklistMapper {
      * @return
      */
     CoscoBlacklist selectByWorkFlowId(String workFlowId);
+
+    /**
+     * 查询到期供应商
+     * @return
+     */
+    List<BecomeDueVo> selectBecomeDue();
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml

@@ -229,5 +229,15 @@
         FROM cosco_blacklist cb
     </select>
 
+    <select id="selectBecomeDue" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo">
+        select cb.dept_id   deptId,
+               cb.create_by creater,
+               csb.name
+
+        from cosco_blacklist cb
+                 join cosco_blacklist_supplier cbs on cb.id = cbs.blacklist_id
+                 join cosco_supplier_base csb on csb.id = cbs.blacklist_id
+        where DATE (cb.end_time) = DATE (now()) and cb.approve_status=2 and cb.restore_approve_status!=2
+    </select>
 
 </mapper>

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
 
@@ -95,4 +96,10 @@ public interface ICoscoBlacklistService {
      * @return
      */
     int restoreSubmit(AddBlackListVo listVo);
+
+    /**
+     * 获取到期供应商
+     * @return
+     */
+    List<BecomeDueVo> selectBecomeDue();
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java

@@ -4,24 +4,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistSupplierService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
 import com.chinaunicom.zyhy.ebtp.supplier.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -50,7 +51,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
     @Override
     public BlackListInfoVo selectCoscoBlacklistById(String id) {
         CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectCoscoBlacklistById(id);
-        BlackListInfoVo vo =new BlackListInfoVo();
+        BlackListInfoVo vo = new BlackListInfoVo();
         vo.setId(coscoBlacklist.getId());
         vo.setBlacklistReason(coscoBlacklist.getBlacklistReason());
         vo.setBacklistType(coscoBlacklist.getBacklistType());
@@ -58,8 +59,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
         CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier();
         coscoBlacklistSupplier.setBlacklistId(id);
         List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
-        List<String> supperList=new ArrayList<>();
+        List<String> supperList = new ArrayList<>();
-        coscoBlacklistSuppliers.forEach(cosupplier ->{
+        coscoBlacklistSuppliers.forEach(cosupplier -> {
             supperList.add(cosupplier.getSupplierId());
         });
         vo.setSupplierList(coscoSupplierBaseMapper.selectSupplierByIds(supperList));
@@ -136,7 +137,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
     public IPage<BlackListVo> getPage(BlackListVo template) {
         IPage<BlackListVo> p = new Page<>(template.getBasePageRequest().getPageNo(),
                 template.getBasePageRequest().getPageSize());
-        return coscoBlacklistMapper.selectPage(p,template);
+        return coscoBlacklistMapper.selectPage(p, template);
     }
 
     @Override
@@ -146,6 +147,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
         CoscoBlacklist coscoBlacklist = new CoscoBlacklist();
         coscoBlacklist.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
         coscoBlacklist.setId(listVo.getId());
+
+
         coscoBlacklist.setWorkFlowId(PropertyUtils.getSnowflakeId());
 
         return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
@@ -153,10 +156,11 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
 
     /**
      * 恢复审批提交
+     *
      * @param listVo
      * @return
      */
-    public int restoreSubmit(AddBlackListVo listVo){
+    public int restoreSubmit(AddBlackListVo listVo) {
         CoscoBlacklist coscoBlacklist = new CoscoBlacklist();
         coscoBlacklist.setRestoreApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
         coscoBlacklist.setId(listVo.getId());
@@ -165,37 +169,41 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
         return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
     }
 
+    @Override
+    public List<BecomeDueVo> selectBecomeDue() {
+        return coscoBlacklistMapper.selectBecomeDue();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int receiveApprove(CoscoBlacklist list) {
         CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
-        if(CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())){
+        if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
             coscoBlacklist.setApproveStatus(list.getApproveStatus());
             coscoBlacklist.setStartTime(new Date());
             //获取加入黑名单时间
-            coscoBlacklist.setEndTime(DateUtils.plusYears(5));
+            coscoBlacklist.setEndTime(DateUtils.plusYears(Integer.parseInt(coscoBlacklist.getTimelimitType())));
             coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
-            if(CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())){
+            if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) {
                 CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier();
                 coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId());
                 List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
-                coscoBlacklistSuppliers.forEach(cosupplier ->{
+                coscoBlacklistSuppliers.forEach(cosupplier -> {
                     //判断黑名单
-                    if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){
+                    if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
                         CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
                         coscoSupplierBase.setId(cosupplier.getSupplierId());
                         coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE);
                         coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
                     }
                     //判断灰名单
-                    if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){
+                    if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
                         CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
                         coscoSupplierBase.setId(cosupplier.getSupplierId());
                         coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE);
                         coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
                     }
                 });
-
             }
         }
         return 0;
@@ -204,23 +212,25 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
     @Override
     public int blacklistRestoreApprove(CoscoBlacklist list) {
         CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getRestoreWorkFlowId());
-        if(CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getRestoreApproveStatus())){
+        if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getRestoreApproveStatus())) {
             coscoBlacklist.setRestoreApproveStatus(list.getRestoreApproveStatus());
-            coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
+            if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) {
-            if(CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())){
                 CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier();
                 coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId());
                 List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
-                coscoBlacklistSuppliers.forEach(cosupplier ->{
+                //获取添加时限
+                DictProject dictProject = new DictProject();
+                dictProject.setParentCode(EvaluateTaskConstant.INDICATOR_TYPE_ND);
+                coscoBlacklistSuppliers.forEach(cosupplier -> {
                     //判断黑名单
-                    if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){
+                    if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
                         CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
                         coscoSupplierBase.setId(cosupplier.getSupplierId());
                         coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE);
                         coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
                     }
                     //判断灰名单
-                    if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){
+                    if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
                         CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
                         coscoSupplierBase.setId(cosupplier.getSupplierId());
                         coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE);
@@ -229,6 +239,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
                 });
 
             }
+            coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
         }
         return 0;
     }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java

@@ -0,0 +1,20 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo;
+
+import lombok.Data;
+
+@Data
+public class BecomeDueVo {
+    /**
+     * 部门id
+     */
+    private String deptId;
+    /**
+     * 供应商名称
+     */
+    private String name;
+    /**
+     * 创建人
+     */
+    private String creater;
+
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibraryVo.java

@@ -8,8 +8,12 @@ import java.util.List;
 
 @Data
 public class AddCoscoCategoryLibraryVo extends CoscoCategoryLibrary {
-
+    /**
+     * 品类信息
+     */
     private List<AddCategoryIdVos> categoryIds;
-
+    /**
+     * 附件信息
+     */
     private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments;
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java

@@ -91,6 +91,19 @@ public class CoscoEvaluateTaskController extends BaseController {
         return BaseResponse.success(coscoEvaluateTaskService.addTask(addCoscoEvaluateTaskVo));
     }
 
+    /**
+     * 提交供应商评价任务
+     * @param addCoscoEvaluateTaskVo
+     * @return
+     */
+    @PostMapping("/submit")
+    public BaseResponse submit(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskService.selectById(addCoscoEvaluateTaskVo.getId());
+        if(coscoEvaluateTask.getApproveStatus()!=null){
+            return BaseResponse.fail("任务已提交");
+        }
+        return BaseResponse.success(coscoEvaluateTaskService.submit(addCoscoEvaluateTaskVo));
+    }
 
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java

@@ -36,6 +36,12 @@ public class CoscoEvaluateTaskSupplierController extends BaseController {
     }
 
 
+    @GetMapping("/getScoreResult")
+    public BaseResponse getScoreResult(String id) {
+        return BaseResponse.success(coscoEvaluateTaskSupplierService.getScoreResult(id));
+    }
+
+
     /**
      * 获取【供应商评价_评价任务关联供应商表】详细信息
      */

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java

@@ -74,4 +74,10 @@ public interface CoscoEvaluateTaskMapper {
      * @return
      */
     List<CoscoEvaluateTask> selectCloseTask();
+
+    /**
+     * 根据工作流id查询评价任务信息
+     * @param workFlowId
+     */
+    CoscoEvaluateTask selectByWorkFlowId(String workFlowId);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml

@@ -25,11 +25,17 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="lastUpdateTime" column="last_update_time"/>
+        <result property="approveStatus" column="approve_status"/>
+        <result property="workFlowId" column="work_flow_id"/>
+        <result property="templateName" column="template_name"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
 
     <sql id="selectCoscoEvaluateTaskVo">
         select id,
                evaluate_theme,
+               approve_status,
+               work_flow_id,
                dept_id,
                evaluate_year,
                start_time,
@@ -103,10 +109,66 @@
         </where>
     </select>
 
+
+    <select id="selectByWorkFlowId" parameterType="String"
+            resultMap="CoscoEvaluateTaskResult">
+        select cet.id,
+               cet.evaluate_theme,
+               cet.dept_id,
+               cet.evaluate_year,
+               cet.start_time,
+               cet.end_time,
+               cet.template_id,
+               cet.category_limitation,
+               cet.category_id,
+               cet.weight_status,
+               cet.weight_dept,
+               cet.weight_value,
+               cet.status,
+               cet.del_flag,
+               cet.create_by,
+               cet.create_time,
+               cet.update_by,
+               cet.update_time,
+               cete.template_name,
+               cec.category_name,
+               cet.approve_status,
+               cet.work_flow_id
+            cet.last_update_time
+        from cosco_evaluate_task cet
+                 left join cosco_evaluate_template cete on cete.id = cet.template_id
+                 left join cosco_category cec on cec.id = cet.category_id
+        where cet.work_flow_id = #{workFlowId}
+    </select>
     <select id="selectCoscoEvaluateTaskById" parameterType="String"
             resultMap="CoscoEvaluateTaskResult">
-        <include refid="selectCoscoEvaluateTaskVo"/>
+        select cet.id,
-        where id = #{id}
+               cet.evaluate_theme,
+               cet.dept_id,
+               cet.evaluate_year,
+               cet.start_time,
+               cet.end_time,
+               cet.template_id,
+               cet.category_limitation,
+               cet.category_id,
+               cet.weight_status,
+               cet.weight_dept,
+               cet.weight_value,
+               cet.status,
+               cet.del_flag,
+               cet.create_by,
+               cet.create_time,
+               cet.update_by,
+               cet.update_time,
+               cete.template_name,
+               cec.category_name,
+               cet.approve_status,
+               cet.work_flow_id,
+               cet.last_update_time
+        from cosco_evaluate_task cet
+        left join cosco_evaluate_template cete on cete.id = cet.template_id
+        left join cosco_category cec on cec.id = cet.category_id
+        where cet.id = #{id}
     </select>
 
     <insert id="insertCoscoEvaluateTask"
@@ -287,6 +349,12 @@
         cet.start_time as startTime,
         cet.end_time as endTime,
         cet.status,
+        cet.approve_status,
+        case
+        when cet.approve_status = 0 then '审核中'
+        when cet.approve_status = 1 then '审核通过'
+        when cet.approve_status = 2 then '审核未通过'
+        else '未审核' end as approveStatusName,
         case
         when cet.status = 0 then '待评价'
         when cet.status = 1 then '评价中'

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTemplateMapper.xml

@@ -22,6 +22,11 @@
         <result property="indicatorTypeMore" column="indicator_type_more"/>
         <result property="indicatorStMore" column="indicator_st_more"/>
         <result property="indicatorNdMore" column="indicator_nd_more"/>
+        <result property="copyTemplateName" column="copy_template_name"/>
+
+        <result property="categoryName" column="category_name"/>
+
+
     </resultMap>
 
     <sql id="selectCoscoEvaluateTemplateVo">
@@ -103,8 +108,28 @@
 
     <select id="selectCoscoEvaluateTemplateById" parameterType="String"
             resultMap="CoscoEvaluateTemplateResult">
-        <include refid="selectCoscoEvaluateTemplateVo"/>
+        select cet.id,
-        where id = #{id}
+               cet.template_name,
+               cet.template_type,
+               cet2.template_name as copy_template_name,
+               cet.copy_template_id,
+               cet.category_limitation,
+               cet.category_id,
+               cet.status,
+               cet.del_flag,
+               cet.create_by,
+               cet.create_time,
+               cet.update_by,
+               cet.update_time,
+               cet.indicator_type_more,
+               cet.indicator_st_more,
+               cet.indicator_nd_more,
+               cc.category_name,
+               cet.last_update_time
+        from cosco_evaluate_template cet
+                 left join cosco_category cc on cet.category_id=cc.id
+        left join cosco_evaluate_template cet2 on cet.copy_template_id=cet2.id
+        where cet.id = #{id}
     </select>
 
     <insert id="insertCoscoEvaluateTemplate"

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTask.java

@@ -94,5 +94,16 @@ public class CoscoEvaluateTask extends BaseEntity {
     private Date createTime;
     private Date updateTime;
 
+    private String templateName;
+    private String categoryName;
+    /**
+     * 审批状态(0.审批中、1.通过、2.驳回)
+     */
+    private Long approveStatus;
+    /**
+     * 审批工作流id
+     */
+    private String workFlowId;
+
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTemplate.java

@@ -59,5 +59,7 @@ public class CoscoEvaluateTemplate extends BaseEntity {
      */
     private Long indicatorNdMore;
 
+    private String categoryName;
 
+    private String copyTemplateName;
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskService.java

@@ -86,4 +86,22 @@ public interface ICoscoEvaluateTaskService {
      */
     IPage<TaskPageVo> getTaskPage(TaskPageVo taskListVo);
 
+    /**
+     * 根据id查询数据
+     * @param id
+     * @return
+     */
+    CoscoEvaluateTask selectById(String id);
+
+    /**
+     * 提交任务到oa
+     * @param addCoscoEvaluateTaskVo
+     * @return
+     */
+    int submit(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo);
+
+    /**
+     * 供应商评价审核审批回调接口
+     */
+    int evaluateApprove(AddCoscoEvaluateTaskVo vo);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskSupplierService.java

@@ -69,4 +69,6 @@ public interface ICoscoEvaluateTaskSupplierService {
     IPage<SupplierDimensionVo> getSupplierDimension(SupplierDimensionVo vo);
 
     IPage<CoscoEvaluateTaskSupplier> getPage(CoscoEvaluateTaskSupplier taskListVo);
+
+    Object getScoreResult(String id);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
@@ -79,6 +80,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
             addCoscoEvaluateTaskVo.setWeightDept(coscoEvaluateTask.getWeightDept());
             addCoscoEvaluateTaskVo.setWeightValue(coscoEvaluateTask.getWeightValue());
             addCoscoEvaluateTaskVo.setStatus(coscoEvaluateTask.getStatus());
+            addCoscoEvaluateTaskVo.setTemplateName(coscoEvaluateTask.getTemplateName());
+            addCoscoEvaluateTaskVo.setCategoryName(coscoEvaluateTask.getCategoryName());
             //获取项目列表及用户信息
             CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
             coscoEvaluateTaskSupplier.setEvaluateTaskId(id);
@@ -205,6 +208,35 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         return coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
     }
 
+    @Override
+    public CoscoEvaluateTask selectById(String id) {
+        return coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(id);
+    }
+
+    /**
+     * 任务提交
+     * @param addCoscoEvaluateTaskVo
+     * @return
+     */
+    @Override
+    public int submit(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        addCoscoEvaluateTaskVo.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT);
+        addCoscoEvaluateTaskVo.setUpdateTime(new Date());
+        addCoscoEvaluateTaskVo.setWorkFlowId(PropertyUtils.getSnowflakeId());
+        return coscoEvaluateTaskMapper.updateCoscoEvaluateTask(addCoscoEvaluateTaskVo);
+    }
+
+    /**
+     * 供应商评价审核审批回调接口
+     */
+    @Override
+    public int evaluateApprove(AddCoscoEvaluateTaskVo vo) {
+        CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
+        coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
+        coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
+        return 0;
+    }
+
     /**
      * 添加任务
      *

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java

@@ -1,16 +1,19 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierMapper;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
 
 /**
@@ -23,6 +26,16 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTa
 public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskSupplierService {
     @Autowired
     private CoscoEvaluateTaskSupplierMapper coscoEvaluateTaskSupplierMapper;
+    @Autowired
+    private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper;
+    @Autowired
+    private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
+    @Autowired
+    private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper;
+    @Autowired
+    private CoscoEvaluateScoringResultMapper coscoEvaluateScoringResultMapper;
+    @Autowired
+    private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper;
 
     /**
      * 查询【供应商评价_评价任务关联供应商表】
@@ -94,6 +107,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
 
     /**
      * 供应商维度评价列表
+     *
      * @param vo
      * @return
      */
@@ -110,4 +124,49 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
                 taskListVo.getBasePageRequest().getPageSize());
         return coscoEvaluateTaskSupplierMapper.getPage(p, taskListVo);
     }
+
+    @Override
+    public TaskIndicatorBaseVo getScoreResult(String id) {
+        CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierById(id);
+        CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplier.getEvaluateTaskId());
+        BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplier.getSupplierId());
+        TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
+        taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
+        taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
+        List<TaskIndicatorVo> taskIndicatorVo = new ArrayList<>();
+        CoscoEvaluateScoringResult result = new CoscoEvaluateScoringResult();
+        result.setEvaluateTaskSupplierId(id);
+        List<CoscoEvaluateScoringResult> coscoEvaluateScoringResults = coscoEvaluateScoringResultMapper.selectCoscoEvaluateScoringResultList(result);
+        CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd = new CoscoEvaluateTemplateIndicatorNd();
+        coscoEvaluateTemplateIndicatorNd.setTemplateId(coscoEvaluateTask.getTemplateId());
+        List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds = coscoEvaluateTemplateIndicatorNdMapper.selectCoscoEvaluateTemplateIndicatorNdList(coscoEvaluateTemplateIndicatorNd);
+        CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt = new CoscoEvaluateTemplateIndicatorSt();
+        coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId());
+        List<CoscoEvaluateTemplateIndicatorSt> coscoEvaluateTemplateIndicatorSts =
+                coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt);
+        coscoEvaluateTemplateIndicatorSts.forEach(st -> {
+            List<CoscoEvaluateTemplateIndicatorNd> collect = coscoEvaluateTemplateIndicatorNds.stream().filter(scoring -> scoring.getIndicatorStId().equals(st.getId())).collect(Collectors.toList());
+            List<TaskSubIndicatorVo> subIndicator = new ArrayList<>();
+            for (CoscoEvaluateTemplateIndicatorNd evaluateTemplateIndicatorNd : collect) {
+                TaskSubIndicatorVo vo = new TaskSubIndicatorVo();
+                vo.setId(evaluateTemplateIndicatorNd.getId());
+                vo.setSubIndicator(evaluateTemplateIndicatorNd.getSubIndicator());
+                vo.setSubScore(evaluateTemplateIndicatorNd.getScore());
+                vo.setStarIndicator(evaluateTemplateIndicatorNd.getIsStar());
+                List<CoscoEvaluateScoringResult> collect1 = coscoEvaluateScoringResults.stream().filter(scoring -> scoring.getIndicatorNdId().equals(evaluateTemplateIndicatorNd.getId())).collect(Collectors.toList());
+                if (collect1.size() > 0) {
+                    vo.setScoreNum(collect1.get(0).getIndicatorScore().toString());
+                }
+                subIndicator.add(vo);
+            }
+            TaskIndicatorVo vo = new TaskIndicatorVo();
+            vo.setBaseIndicator(st.getBaseIndicator());
+            vo.setIndicatorDesc(st.getDescIndicator());
+            vo.setScore(st.getScore());
+            vo.setSubIndicator(subIndicator);
+            taskIndicatorVo.add(vo);
+        });
+        taskIndicatorBaseVo.setTaskIndicatorVo(taskIndicatorVo);
+        return taskIndicatorBaseVo;
+    }
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java

@@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
 
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ScheduledTasksService;
@@ -33,6 +35,9 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
     @Autowired
     private CoscoEvaluateTaskDeptWeightMapper coscoEvaluateTaskDeptWeightMapper;
 
+    @Autowired
+    private ICoscoBlacklistService coscoBlacklistService;
+
     /**
      * 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务
      */
@@ -165,4 +170,18 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
         coscoEvaluateScoringResult.setCreateTime(new Date());
         coscoEvaluateScoringResults.add(coscoEvaluateScoringResult);
     }
+
+
+    /**
+     * 黑名单到期提醒
+     */
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void blacklistExpire() {
+        //黑名单到期提醒
+        List<BecomeDueVo> becomeDueVos = coscoBlacklistService.selectBecomeDue();
+        //添加消息
+        becomeDueVos.forEach(becomeDueVo ->{
+
+        });
+    }
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java

@@ -50,6 +50,16 @@ public class CoscoEvaluateTaskListVo {
      * 评价名称
      */
     private String statusName;
+
+    /**
+     * 审批状态(0.待审批、1.审批通过、2.审批未通过)
+     */
+    private String approveStatus;
+
+    /**
+     * 审批状态名称
+     */
+    private String approveStatusName;
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java

@@ -1,28 +1,18 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 
 /**
@@ -49,6 +39,14 @@ public class CoscoSupplierBaseController extends BaseController {
         return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase));
     }
 
+    /**
+     * 分页查询已准入的供应商给用户进行选择
+     */
+    @PostMapping("/getSupplierPage")
+    public BaseResponse<IPage<SupplierPageVo>> getSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody SupplierPageVo supplierPageVo) {
+        return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierPageVo));
+    }
+
 
     /**
      * 供应商注册
@@ -134,15 +132,4 @@ public class CoscoSupplierBaseController extends BaseController {
     }
 
 
-    /**
-     * 获取选择供应商信息
-     * @return 返回结果
-     */
-    @ApiOperation("查询分页数据")
-    @PostMapping("/getSupplierPage")
-    public BaseResponse<IPage<BlackSupplierVo>> getSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody BlackSupplierVo supplierVo) {
-
-        return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierVo));
-    }
-
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java

@@ -5,6 +5,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
@@ -81,5 +82,11 @@ public interface CoscoSupplierBaseMapper {
      */
     List<BlackSupplierVo> selectSupplierByIds(List<String> supperList);
 
-    IPage<BlackSupplierVo> getSupplierPage(IPage<CoscoSupplierBase> page, @Param("vo") BlackSupplierVo vo);
+    /**
+     * 查询选择人员
+     * @param page
+     * @param vo
+     * @return
+     */
+    IPage<SupplierPageVo> getSupplierPage(IPage<CoscoSupplierBase> page, @Param("vo") SupplierPageVo  vo);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java

@@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 
 import java.util.List;
 
@@ -67,8 +68,8 @@ public interface ICoscoSupplierBaseService {
 
     /**
      * 获取选择供应商信息
-     * @param supplierVo
+     * @param supplierPageVo
      * @return
      */
-    IPage<BlackSupplierVo> getSupplierPage(BlackSupplierVo supplierVo);
+    IPage<SupplierPageVo> getSupplierPage(SupplierPageVo supplierPageVo);
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java

@@ -15,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -410,9 +411,9 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
     }
 
     @Override
-    public IPage<BlackSupplierVo> getSupplierPage(BlackSupplierVo supplierVo) {
+    public IPage<SupplierPageVo> getSupplierPage(SupplierPageVo supplierPageVo) {
-        IPage<CoscoSupplierBase> page = new Page<>(supplierVo.getBasePageRequest().getPageNo(), supplierVo.getBasePageRequest().getPageSize());
+        IPage<CoscoSupplierBase> page = new Page<>(supplierPageVo.getBasePageRequest().getPageNo(), supplierPageVo.getBasePageRequest().getPageSize());
 
-        return coscoSupplierBaseMapper.getSupplierPage(page ,supplierVo);
+        return coscoSupplierBaseMapper.getSupplierPage(page ,supplierPageVo);
     }
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java

@@ -0,0 +1,54 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SupplierPageVo {
+
+    /** 供应商ID */
+    private String id;
+
+    /** 供应商名称 */
+    private String name;
+
+    /** 部门ID */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /** 准入时间 */
+    private Date admissionTime;
+
+    /** 所属品类（多个以逗号分隔） */
+    private String categoryName;
+
+    /** 最新评价等级 */
+    private String levelName;
+
+    /** 最新评价时间 */
+    private Date evaluationTime;
+
+    /**
+     * 黑名单部门list
+     */
+    private List<String> blackListDept;
+    /**
+     * 查询部门list
+     */
+    private List<String> deptList;
+
+    @ApiModelProperty(value = "分页对象信息")
+    private BasePageRequest basePageRequest;
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java

@@ -0,0 +1,95 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 项目字典Controller
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@RestController
+@RequestMapping("/cosco/dictProject")
+public class DictProjectController extends BaseController {
+    @Autowired
+    private IDictProjectService dictProjectService;
+
+    /**
+     * 顶级列表查询
+     * @param dictProject
+     * @return
+     */
+    @PostMapping("/getTopLevelList")
+    public BaseResponse<IPage<DictProject>> getTopLevelList(@RequestBody DictProject dictProject){
+        dictProject.setParentCode("/");
+        return BaseResponse.success(dictProjectService.getPage(dictProject));
+    }
+
+    /**
+     * 二级列表查询
+     * @param dictProject
+     * @return
+     */
+    @PostMapping("/getSecondaryList")
+    public BaseResponse<IPage<DictProject>> getSecondaryList(@RequestBody DictProject dictProject){
+        return BaseResponse.success(dictProjectService.getPage(dictProject));
+    }
+
+
+    /**
+     * 获取所有列表
+     * @param parentCode
+     * @return
+     */
+    @GetMapping("/getAllList/{parentCode}")
+    public BaseResponse getAllList(@PathVariable String parentCode) {
+        DictProject dictProject = new DictProject();
+        dictProject.setParentCode(parentCode);
+        List<DictProject> list = dictProjectService.selectDictProjectList(dictProject);
+        return BaseResponse.success(list);
+    }
+
+
+
+    /**
+     * 获取项目字典详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public BaseResponse getInfo(@PathVariable("id") Long id) {
+        return BaseResponse.success(dictProjectService.selectDictProjectById(id));
+    }
+
+    /**
+     * 新增项目字典
+     */
+    @PostMapping
+    public BaseResponse add(@RequestBody DictProject dictProject) {
+        return BaseResponse.success(dictProjectService.insertDictProject(dictProject));
+    }
+
+    /**
+     * 修改项目字典
+     */
+    @PutMapping
+    public BaseResponse edit(@RequestBody DictProject dictProject) {
+        return BaseResponse.success(dictProjectService.updateDictProject(dictProject));
+    }
+
+    /**
+     * 删除项目字典
+     */
+	@DeleteMapping("/{ids}")
+    public BaseResponse remove(@PathVariable Long[] ids) {
+        return BaseResponse.success(dictProjectService.deleteDictProjectByIds(ids));
+    }
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java

@@ -0,0 +1,71 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 项目字典Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+public interface DictProjectMapper {
+    /**
+     * 查询项目字典
+     *
+     * @param id 项目字典主键
+     * @return 项目字典
+     */
+    public DictProject selectDictProjectById(Long id);
+
+    /**
+     * 查询项目字典列表
+     *
+     * @param dictProject 项目字典
+     * @return 项目字典集合
+     */
+    public List<DictProject> selectDictProjectList(DictProject dictProject);
+
+    /**
+     * 新增项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    public int insertDictProject(DictProject dictProject);
+
+    /**
+     * 修改项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    public int updateDictProject(DictProject dictProject);
+
+    /**
+     * 删除项目字典
+     *
+     * @param id 项目字典主键
+     * @return 结果
+     */
+    public int deleteDictProjectById(Long id);
+
+    /**
+     * 批量删除项目字典
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDictProjectByIds(Long[] ids);
+
+    /**
+     * 列表信息
+     * @param p
+     * @param vo
+     * @return
+     */
+    IPage<DictProject> selectPage(IPage<DictProject> p,@Param("vo") DictProject vo);
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictProjectMapper">
+
+    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject" id="DictProjectResult">
+        <result property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="dicName" column="dic_name"/>
+        <result property="parentCode" column="parent_code"/>
+        <result property="parentType" column="parent_type"/>
+        <result property="defaultFlag" column="default_flag"/>
+        <result property="useFlag" column="use_flag"/>
+        <result property="orderFlag" column="order_flag"/>
+        <result property="description" column="description"/>
+        <result property="dictTypeCode" column="dict_type_code"/>
+        <result property="dictTypeName" column="dict_type_name"/>
+    </resultMap>
+
+    <sql id="selectDictProjectVo">
+        select id,
+               code,
+               dic_name,
+               parent_code,
+               parent_type,
+               default_flag,
+               use_flag,
+               order_flag,
+               description,
+               dict_type_code,
+               dict_type_name
+        from dict_project
+    </sql>
+
+    <select id="selectPage"  parameterType="map"
+            resultMap="DictProjectResult">
+        <include refid="selectDictProjectVo"/>
+        <where>
+            <if test="vo.dicName != null  and vo.dicName != ''">
+                and dic_name like concat('%', #{vo.dicName}, '%')
+            </if>
+            <if test="vo.parentCode != null  and vo.parentCode != ''">
+                and parent_code = #{vo.parentCode}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDictProjectList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject"
+            resultMap="DictProjectResult">
+        <include refid="selectDictProjectVo"/>
+        <where>
+            <if test="code != null  and code != ''">
+                and code = #{code}
+            </if>
+            <if test="dicName != null  and dicName != ''">
+                and dic_name like concat('%', #{dicName}, '%')
+            </if>
+            <if test="parentCode != null  and parentCode != ''">
+                and parent_code = #{parentCode}
+            </if>
+            <if test="parentType != null  and parentType != ''">
+                and parent_type = #{parentType}
+            </if>
+            <if test="defaultFlag != null  and defaultFlag != ''">
+                and default_flag = #{defaultFlag}
+            </if>
+            <if test="useFlag != null  and useFlag != ''">
+                and use_flag = #{useFlag}
+            </if>
+            <if test="orderFlag != null ">
+                and order_flag = #{orderFlag}
+            </if>
+            <if test="description != null  and description != ''">
+                and description = #{description}
+            </if>
+            <if test="dictTypeCode != null  and dictTypeCode != ''">
+                and dict_type_code = #{dictTypeCode}
+            </if>
+            <if test="dictTypeName != null  and dictTypeName != ''">
+                and dict_type_name like concat('%', #{dictTypeName}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDictProjectById" parameterType="Long"
+            resultMap="DictProjectResult">
+        <include refid="selectDictProjectVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertDictProject" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject"
+            useGeneratedKeys="true"
+            keyProperty="id">
+        insert into dict_project
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="dicName != null">dic_name,</if>
+            <if test="parentCode != null">parent_code,</if>
+            <if test="parentType != null">parent_type,</if>
+            <if test="defaultFlag != null">default_flag,</if>
+            <if test="useFlag != null">use_flag,</if>
+            <if test="orderFlag != null">order_flag,</if>
+            <if test="description != null">description,</if>
+            <if test="dictTypeCode != null">dict_type_code,</if>
+            <if test="dictTypeName != null">dict_type_name,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="dicName != null">#{dicName},</if>
+            <if test="parentCode != null">#{parentCode},</if>
+            <if test="parentType != null">#{parentType},</if>
+            <if test="defaultFlag != null">#{defaultFlag},</if>
+            <if test="useFlag != null">#{useFlag},</if>
+            <if test="orderFlag != null">#{orderFlag},</if>
+            <if test="description != null">#{description},</if>
+            <if test="dictTypeCode != null">#{dictTypeCode},</if>
+            <if test="dictTypeName != null">#{dictTypeName},</if>
+        </trim>
+    </insert>
+    <insert id="batchDictProject" parameterType="java.util.List">
+        insert into dict_project
+        ( id, code, dic_name, parent_code, parent_type, default_flag, use_flag, order_flag, description, dict_type_code,
+        dict_type_name)
+        values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.code}, #{item.dicName}, #{item.parentCode}, #{item.parentType}, #{item.defaultFlag},
+            #{item.useFlag}, #{item.orderFlag}, #{item.description}, #{item.dictTypeCode}, #{item.dictTypeName})
+        </foreach>
+    </insert>
+    <update id="updateDictProject" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject">
+        update dict_project
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code =
+                #{code},
+            </if>
+            <if test="dicName != null">dic_name =
+                #{dicName},
+            </if>
+            <if test="parentCode != null">parent_code =
+                #{parentCode},
+            </if>
+            <if test="parentType != null">parent_type =
+                #{parentType},
+            </if>
+            <if test="defaultFlag != null">default_flag =
+                #{defaultFlag},
+            </if>
+            <if test="useFlag != null">use_flag =
+                #{useFlag},
+            </if>
+            <if test="orderFlag != null">order_flag =
+                #{orderFlag},
+            </if>
+            <if test="description != null">description =
+                #{description},
+            </if>
+            <if test="dictTypeCode != null">dict_type_code =
+                #{dictTypeCode},
+            </if>
+            <if test="dictTypeName != null">dict_type_name =
+                #{dictTypeName},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteDictProjectById" parameterType="Long">
+        update dict_project
+        set del_flag = 2
+        where id = #{id}
+    </update>
+
+    <update id="deleteDictProjectByIds" parameterType="String">
+        update dict_project set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java

@@ -0,0 +1,53 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.entity;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
+import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 项目字典对象 dict_project
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@Data
+public class DictProject extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 字典code */
+    private String code;
+
+    /** 字典名称 */
+    private String dicName;
+
+    /** 父类code */
+    private String parentCode;
+
+    /** 父类类型 */
+    private String parentType;
+
+    /** 是否默认 */
+    private String defaultFlag;
+
+    /** 是否应用 */
+    private String useFlag;
+
+    /** 排序 */
+    private Long orderFlag;
+
+    /** 描述 */
+    private String description;
+
+    /** 分组编码 */
+    private String dictTypeCode;
+
+    /** 分组名称 */
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "分页对象信息")
+    private BasePageRequest basePageRequest;
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java

@@ -0,0 +1,69 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+
+import java.util.List;
+
+/**
+ * 项目字典Service接口
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+public interface IDictProjectService {
+    /**
+     * 查询项目字典
+     *
+     * @param id 项目字典主键
+     * @return 项目字典
+     */
+    public DictProject selectDictProjectById(Long id);
+
+    /**
+     * 查询项目字典列表
+     *
+     * @param dictProject 项目字典
+     * @return 项目字典集合
+     */
+    public List<DictProject> selectDictProjectList(DictProject dictProject);
+
+    /**
+     * 新增项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    public int insertDictProject(DictProject dictProject);
+
+    /**
+     * 修改项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    public int updateDictProject(DictProject dictProject);
+
+    /**
+     * 批量删除项目字典
+     *
+     * @param ids 需要删除的项目字典主键集合
+     * @return 结果
+     */
+    public int deleteDictProjectByIds(Long[] ids);
+
+    /**
+     * 删除项目字典信息
+     *
+     * @param id 项目字典主键
+     * @return 结果
+     */
+    public int deleteDictProjectById(Long id);
+
+    /**
+     * 顶级列表
+     * @param dictProject
+     * @return
+     */
+    IPage<DictProject> getPage(DictProject dictProject);
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java

@@ -0,0 +1,98 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictProjectMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目字典Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@Service
+public class DictProjectServiceImpl implements IDictProjectService {
+    @Autowired
+    private DictProjectMapper dictProjectMapper;
+
+    /**
+     * 查询项目字典
+     *
+     * @param id 项目字典主键
+     * @return 项目字典
+     */
+    @Override
+    public DictProject selectDictProjectById(Long id) {
+        return dictProjectMapper.selectDictProjectById(id);
+    }
+
+    /**
+     * 查询项目字典列表
+     *
+     * @param dictProject 项目字典
+     * @return 项目字典
+     */
+    @Override
+    public List<DictProject> selectDictProjectList(DictProject dictProject) {
+        return dictProjectMapper.selectDictProjectList(dictProject);
+    }
+
+    /**
+     * 新增项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    @Override
+    public int insertDictProject(DictProject dictProject) {
+        return dictProjectMapper.insertDictProject(dictProject);
+    }
+
+    /**
+     * 修改项目字典
+     *
+     * @param dictProject 项目字典
+     * @return 结果
+     */
+    @Override
+    public int updateDictProject(DictProject dictProject) {
+        return dictProjectMapper.updateDictProject(dictProject);
+    }
+
+    /**
+     * 批量删除项目字典
+     *
+     * @param ids 需要删除的项目字典主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDictProjectByIds(Long[] ids) {
+        return dictProjectMapper.deleteDictProjectByIds(ids);
+    }
+
+    /**
+     * 删除项目字典信息
+     *
+     * @param id 项目字典主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDictProjectById(Long id) {
+        return dictProjectMapper.deleteDictProjectById(id);
+    }
+
+    @Override
+    public IPage<DictProject> getPage(DictProject dictProject) {
+        IPage<DictProject> p = new Page<>(dictProject.getBasePageRequest().getPageNo(),
+                dictProject.getBasePageRequest().getPageSize());
+        return dictProjectMapper.selectPage(p, dictProject);
+    }
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java

@@ -8,8 +8,7 @@ public class DateUtils {
 
     public static Date plusYears(int year){
         LocalDate currentDate = LocalDate.now(); // 获取当前日期
-        int yearsToAdd = 5; // 要添加的年数
+        LocalDate futureDate = currentDate.plusYears(year); // 加年限
-        LocalDate futureDate = currentDate.plusYears(yearsToAdd); // 加年限
         return  Date.from(futureDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
     }