评价修改

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

@@ -10,4 +10,8 @@ public interface SupplierUserConstant {
     public static final Long SCORE_STATUS_YD=1L;
 
     public static final String USER_NAME="admin";
+
+    public static final String DEPT_ID="dept001";
+
+    public static final String PARENT_DEPT_ID="dept002";
 }

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

@@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService;
+import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,8 +22,8 @@ public class UserController {
 
 
     @GetMapping("/getUserList")
-    public BaseResponse getUserList() {
+    public BaseResponse getUserList(SelectUserVo vo) {
-        return BaseResponse.success(userService.getUser());
+        return BaseResponse.success(userService.getUser(vo.getUserIds()));
     }
 
     @GetMapping("/getDeptList")

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java

@@ -4,7 +4,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class UserService {
@@ -21,16 +23,25 @@ public class UserService {
     }
 
 
-    public List<UserVo> getUser() {
+    public List<UserVo> getUser(List<String> userIds) {
         List<UserVo> userList = new ArrayList<>();
+        Map<String,String> map = new HashMap<>();
+        if(userIds!=null){
+            for (String userId : userIds) {
+                map.put(userId,userId);
+            }
+        }
 
         for (int i = 1; i <= 10; i++) {
             UserVo user = new UserVo();
             user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010
             user.setUserName("用户" + i);
             user.setUserDept("部门" + ((i % 3) + 1));         // 部门1、部门2、部门3轮换
-            user.setUserDeptId("D" + ((i % 3) + 1));          // D1、D2、D3轮换
+            user.setUserDeptId("D" + ((i % 3) + 1));
-            userList.add(user);
+            String s = map.get(user.getUserId());
+            if(s==null){
+                userList.add(user);
+            }
         }
         return userList;
     }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/SelectUserVo.java

@@ -0,0 +1,10 @@
+package com.chinaunicom.zyhy.ebtp.supplier.base.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SelectUserVo {
+    private List<String> userIds;
+}

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java

@@ -12,6 +12,8 @@ public class UserVo {
      * 用户id
      */
     private String userId;
+
+    private Boolean isSelected=true;
     /**
      * 用户部门
      */

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

@@ -1,6 +1,7 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
 
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
@@ -74,7 +75,7 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
                 }
             });
             coscoAnnualreviewTask.setStatus(AnnualreviewTaskConstant.COMPLETED);
-            coscoAnnualreviewTask.setUpdateBy("admin");
+            coscoAnnualreviewTask.setUpdateBy(SupplierUserConstant.USER_NAME);
             coscoAnnualreviewTask.setUpdateTime(new Date());
             coscoAnnualreviewTaskMapper.updateCoscoAnnualreviewTask(coscoAnnualreviewTask);
         }

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

@@ -1,9 +1,12 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class BlackSupplierVo {
 
@@ -15,6 +18,11 @@ public class BlackSupplierVo {
      * 供应商名称
      */
     private String supplierName;
+
+    /**
+     * 社会信用代码
+     */
+    private String socialCreditCode;
     /**
      * 部门名称
      */
@@ -26,15 +34,17 @@ public class BlackSupplierVo {
     /**
      * 准入物品名称
      */
-    private String  categoryName;
+    private String categoryName;
     /**
      * 评价名称
      */
-    private String  themeName;
+    private String themeName;
     /**
      * 评价时间
      */
-    private String  evaluateTime;
+    private String evaluateTime;
+
+    private List<TaskUserVo> userList;
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml

@@ -4,11 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierMapper">
 
-    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier" id="CoscoCategoryLibrarySupplierResult">
+    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier"
-            <result property="id" column="id"/>
+               id="CoscoCategoryLibrarySupplierResult">
-            <result property="categoryLibrarySupplierApplyId" column="category_library_supplier_apply_id"/>
+        <result property="id" column="id"/>
-            <result property="categoryLibraryId" column="category_library_id"/>
+        <result property="categoryLibrarySupplierApplyId" column="category_library_supplier_apply_id"/>
-            <result property="supplierId" column="supplier_id"/>
+        <result property="categoryLibraryId" column="category_library_id"/>
+        <result property="supplierId" column="supplier_id"/>
     </resultMap>
 
     <sql id="selectCoscoCategoryLibrarySupplierVo">
@@ -16,40 +17,47 @@
         from cosco_category_library_supplier
     </sql>
 
-    <select id="selectCoscoCategoryLibrarySupplierList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier" resultMap="CoscoCategoryLibrarySupplierResult">
+    <select id="selectCoscoCategoryLibrarySupplierList"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier"
+            resultMap="CoscoCategoryLibrarySupplierResult">
         <include refid="selectCoscoCategoryLibrarySupplierVo"/>
         <where>
-                        <if test="categoryLibrarySupplierApplyId != null  and categoryLibrarySupplierApplyId != ''">
+            <if test="categoryLibrarySupplierApplyId != null  and categoryLibrarySupplierApplyId != ''">
-                            and category_library_supplier_apply_id = #{categoryLibrarySupplierApplyId}
+                and category_library_supplier_apply_id = #{categoryLibrarySupplierApplyId}
-                        </if>
+            </if>
-                        <if test="categoryLibraryId != null  and categoryLibraryId != ''">
+            <if test="categoryLibraryId != null  and categoryLibraryId != ''">
-                            and category_library_id = #{categoryLibraryId}
+                and category_library_id = #{categoryLibraryId}
-                        </if>
+            </if>
-                        <if test="supplierId != null  and supplierId != ''">
+            <if test="supplierId != null  and supplierId != ''">
-                            and supplier_id = #{supplierId}
+                and supplier_id = #{supplierId}
-                        </if>
+            </if>
         </where>
     </select>
 
     <select id="selectCoscoCategoryLibrarySupplierById" parameterType="String"
             resultMap="CoscoCategoryLibrarySupplierResult">
-            <include refid="selectCoscoCategoryLibrarySupplierVo"/>
+        <include refid="selectCoscoCategoryLibrarySupplierVo"/>
-            where id = #{id}
+        where id = #{id}
     </select>
 
-    <insert id="insertCoscoCategoryLibrarySupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier">
+    <insert id="insertCoscoCategoryLibrarySupplier"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier">
         insert into cosco_category_library_supplier
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,</if>
+            <if test="id != null">id,</if>
-                    <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">category_library_supplier_apply_id,</if>
+            <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">
-                    <if test="categoryLibraryId != null and categoryLibraryId != ''">category_library_id,</if>
+                category_library_supplier_apply_id,
-                    <if test="supplierId != null and supplierId != ''">supplier_id,</if>
+            </if>
+            <if test="categoryLibraryId != null and categoryLibraryId != ''">category_library_id,</if>
+            <if test="supplierId != null and supplierId != ''">supplier_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},</if>
+            <if test="id != null">#{id},</if>
-                    <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">#{categoryLibrarySupplierApplyId},</if>
+            <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">
-                    <if test="categoryLibraryId != null and categoryLibraryId != ''">#{categoryLibraryId},</if>
+                #{categoryLibrarySupplierApplyId},
-                    <if test="supplierId != null and supplierId != ''">#{supplierId},</if>
+            </if>
+            <if test="categoryLibraryId != null and categoryLibraryId != ''">#{categoryLibraryId},</if>
+            <if test="supplierId != null and supplierId != ''">#{supplierId},</if>
         </trim>
     </insert>
     <insert id="batchCoscoCategoryLibrarySupplier" parameterType="java.util.List">
@@ -60,24 +68,27 @@
             ( #{item.id}, #{item.categoryLibrarySupplierApplyId}, #{item.categoryLibraryId}, #{item.supplierId})
         </foreach>
     </insert>
-    <update id="updateCoscoCategoryLibrarySupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier">
+    <update id="updateCoscoCategoryLibrarySupplier"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier">
         update cosco_category_library_supplier
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">category_library_supplier_apply_id =
+            <if test="categoryLibrarySupplierApplyId != null and categoryLibrarySupplierApplyId != ''">
-                        #{categoryLibrarySupplierApplyId},
+                category_library_supplier_apply_id =
-                    </if>
+                #{categoryLibrarySupplierApplyId},
-                    <if test="categoryLibraryId != null and categoryLibraryId != ''">category_library_id =
+            </if>
-                        #{categoryLibraryId},
+            <if test="categoryLibraryId != null and categoryLibraryId != ''">category_library_id =
-                    </if>
+                #{categoryLibraryId},
-                    <if test="supplierId != null and supplierId != ''">supplier_id =
+            </if>
-                        #{supplierId},
+            <if test="supplierId != null and supplierId != ''">supplier_id =
-                    </if>
+                #{supplierId},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <update id="deleteCoscoCategoryLibrarySupplierById" parameterType="String">
-        update cosco_category_library_supplier set del_flag = 2
+        update cosco_category_library_supplier
+        set del_flag = 2
         where id = #{id}
     </update>
 
@@ -90,8 +101,10 @@
 
     <select id="selectSupplierByApplyId" parameterType="string"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo">
-        select csb.name,csb.enterprise_type area,csb.supplier_type supplierCategory
+        select csb.name, csb.enterprise_type area, csb.supplier_type supplierCategory, csb.id ,
-        from cosco_category_library_supplier ccls join cosco_supplier_base csb on ccls.supplier_id=csb.id
+               csb.social_credit_code unifiedSocialCreditCode
-        where ccls.category_library_supplier_apply_id =#{id}
+        from cosco_category_library_supplier ccls
+                 join cosco_supplier_base csb on ccls.supplier_id = csb.id
+        where ccls.category_library_supplier_apply_id = #{id}
     </select>
 </mapper>

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java

@@ -76,7 +76,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
         coscoCategoryLibrary.setCreateTime(LocalDateTime.now());
         coscoCategoryLibrary.setCreateBy(SupplierUserConstant.USER_NAME);
         coscoCategoryLibrary.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
-        coscoCategoryLibrary.setApplyDeptId("dept001");
+        coscoCategoryLibrary.setApplyDeptId(SupplierUserConstant.DEPT_ID);
         coscoCategoryLibrary.setId(PropertyUtils.getSnowflakeId());
         if (coscoCategoryLibrary.getApproveType().equals(CoscoCategoryConstant.BUILD_TYPE_OFFLINE)) {
             coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS);

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

@@ -105,5 +105,12 @@ public class CoscoEvaluateTaskController extends BaseController {
         return BaseResponse.success(coscoEvaluateTaskService.submit(addCoscoEvaluateTaskVo));
     }
 
+    @PostMapping("/incrementalDivisionOfLaborAdditionAdd")
+    public BaseResponse incrementalDivisionOfLaborAdditionAdd(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        return BaseResponse.success(coscoEvaluateTaskService.incrementalDivisionOfLaborAdditionAdd(addCoscoEvaluateTaskVo));
+    }
+
+
+
 
 }

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

@@ -84,4 +84,9 @@ public interface CoscoEvaluateScoringMapper {
      */
     List<CalculateAndObtainScoresVo> selectCalculateAndObtainScores(String id);
 
+    /**
+     * 根据任务id删除
+     * @param taskId
+     */
+    void deleteByTaskId(String taskId);
 }

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

@@ -0,0 +1,61 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao;
+
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept;
+
+import java.util.List;
+
+/**
+ * 供应商评价_分派下级单位完善评价人Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-06-26
+ */
+public interface CoscoEvaluateTaskAssignDeptMapper {
+    /**
+     * 查询供应商评价_分派下级单位完善评价人
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 供应商评价_分派下级单位完善评价人
+     */
+    public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id);
+
+    /**
+     * 查询供应商评价_分派下级单位完善评价人列表
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 供应商评价_分派下级单位完善评价人集合
+     */
+    public List<CoscoEvaluateTaskAssignDept> selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 新增供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 修改供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 删除供应商评价_分派下级单位完善评价人
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 结果
+     */
+    public int deleteCoscoEvaluateTaskAssignDeptById(String id);
+
+    /**
+     * 批量删除供应商评价_分派下级单位完善评价人
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids);
+}

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

@@ -64,4 +64,6 @@ public interface CoscoEvaluateTaskDeptWeightMapper {
      * @param list
      */
     void batchCoscoEvaluateTaskDeptWeight(List<CoscoEvaluateTaskDeptWeight> list);
+
+    void deleteByTaskId(String id);
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.DivisionVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo;
 import io.lettuce.core.dynamic.annotation.Param;
@@ -87,4 +88,11 @@ public interface CoscoEvaluateTaskMapper {
      * @return
      */
     List<NoTaskVo> selectNoTask();
+
+    /**
+     * 查询评价任务信息
+     * @param taskListVo
+     * @return
+     */
+    List<DivisionVo> selectDivisionVo(CoscoEvaluateTaskListVo taskListVo);
 }

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

@@ -63,4 +63,10 @@ public interface CoscoEvaluateTaskUserIndicatorMapper {
      * @return 结果
      */
     public int deleteCoscoEvaluateTaskUserIndicatorByEvaluateTaskSupplierUserIds(String[] evaluateTaskSupplierUserIds);
+
+    /**
+     * 根据任务id删除
+     * @param taskId
+     */
+    void deleteByTaskId(String taskId);
 }

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

@@ -156,6 +156,13 @@
             #{id}
         </foreach>
     </update>
+    <delete id="deleteByTaskId" parameterType="string">
+        delete
+        from cosco_evaluate_scoring
+        where evaluate_task_supplier_user_id in
+              (select id from cosco_evaluate_task_supplier_user where evaluate_task_id = #{taskId})
+    </delete>
+
     <select id="selectTaskSubIndicatorVo" parameterType="string"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskSubIndicatorVo">
         select ces.id,
@@ -175,10 +182,10 @@
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CalculateAndObtainScoresVo">
         select cetsu.user_id, ces.score, ces.indicator_nd_id, '1' as dept_id, cets.supplier_id
         from cosco_evaluate_scoring ces
-        join cosco_evaluate_task_supplier_user cetsu
+                 join cosco_evaluate_task_supplier_user cetsu
-        on cetsu.id = ces.evaluate_task_supplier_user_id and cetsu.del_flag = 'normal'
+                      on cetsu.id = ces.evaluate_task_supplier_user_id and cetsu.del_flag = 'normal'
-        join cosco_evaluate_task_supplier cets
+                 join cosco_evaluate_task_supplier cets
-        on cets.evaluate_task_id = cetsu.evaluate_task_id and cets.supplier_id = cetsu.supplier_id
+                      on cets.evaluate_task_id = cetsu.evaluate_task_id and cets.supplier_id = cetsu.supplier_id
         where ces.score is not null
           and cetsu.evaluate_task_id = #{taskId}
     </select>

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

@@ -0,0 +1,90 @@
+<?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.coscoEvaluate.dao.CoscoEvaluateTaskAssignDeptMapper">
+
+    <resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept" id="CoscoEvaluateTaskAssignDeptResult">
+            <result property="id" column="id"/>
+            <result property="evaluateTaskId" column="evaluate_task_id"/>
+            <result property="parentDeptId" column="parent_dept_id"/>
+            <result property="status" column="status"/>
+    </resultMap>
+
+    <sql id="selectCoscoEvaluateTaskAssignDeptVo">
+        select id, evaluate_task_id, parent_dept_id, status
+        from cosco_evaluate_task_assign_dept
+    </sql>
+
+    <select id="selectCoscoEvaluateTaskAssignDeptList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept" resultMap="CoscoEvaluateTaskAssignDeptResult">
+        <include refid="selectCoscoEvaluateTaskAssignDeptVo"/>
+        <where>
+                        <if test="evaluateTaskId != null  and evaluateTaskId != ''">
+                            and evaluate_task_id = #{evaluateTaskId}
+                        </if>
+                        <if test="parentDeptId != null  and parentDeptId != ''">
+                            and parent_dept_id = #{parentDeptId}
+                        </if>
+                        <if test="status != null ">
+                            and status = #{status}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectCoscoEvaluateTaskAssignDeptById" parameterType="String"
+            resultMap="CoscoEvaluateTaskAssignDeptResult">
+            <include refid="selectCoscoEvaluateTaskAssignDeptVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertCoscoEvaluateTaskAssignDept" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept">
+        insert into cosco_evaluate_task_assign_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,</if>
+                    <if test="evaluateTaskId != null and evaluateTaskId != ''">evaluate_task_id,</if>
+                    <if test="parentDeptId != null and parentDeptId != ''">parent_dept_id,</if>
+                    <if test="status != null">status,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},</if>
+                    <if test="evaluateTaskId != null and evaluateTaskId != ''">#{evaluateTaskId},</if>
+                    <if test="parentDeptId != null and parentDeptId != ''">#{parentDeptId},</if>
+                    <if test="status != null">#{status},</if>
+        </trim>
+    </insert>
+    <insert id="batchCoscoEvaluateTaskAssignDept" parameterType="java.util.List">
+        insert into cosco_evaluate_task_assign_dept
+        ( id, evaluate_task_id, parent_dept_id, status)
+        values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.evaluateTaskId}, #{item.parentDeptId}, #{item.status})
+        </foreach>
+    </insert>
+    <update id="updateCoscoEvaluateTaskAssignDept" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept">
+        update cosco_evaluate_task_assign_dept
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="evaluateTaskId != null and evaluateTaskId != ''">evaluate_task_id =
+                        #{evaluateTaskId},
+                    </if>
+                    <if test="parentDeptId != null and parentDeptId != ''">parent_dept_id =
+                        #{parentDeptId},
+                    </if>
+                    <if test="status != null">status =
+                        #{status},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteCoscoEvaluateTaskAssignDeptById" parameterType="String">
+        update cosco_evaluate_task_assign_dept set del_flag = 2
+        where id = #{id}
+    </update>
+
+    <update id="deleteCoscoEvaluateTaskAssignDeptByIds" parameterType="String">
+        update cosco_evaluate_task_assign_dept 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/coscoEvaluate/dao/mapper/CoscoEvaluateTaskDeptWeightMapper.xml

@@ -99,4 +99,7 @@
             #{id}
         </foreach>
     </update>
+    <delete id="deleteByTaskId" parameterType="string">
+        delete from cosco_evaluate_task_dept_weight where evaluate_task_id=#{taskId}
+    </delete>
 </mapper>

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

@@ -117,6 +117,26 @@
         where cet.status = 0
           and start_time <= now()
     </select>
+    <select id="selectDivisionVo" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.DivisionVo"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
+        select cet.id as taskId,
+        case when cetad.status = 1 and cetad2.status is null then 1 else 2 end as division
+        from cosco_evaluate_task cet
+         join cosco_evaluate_task_assign_dept cetad
+        on cet.id = cetad.evaluate_task_id and cetad.parent_dept_id = #{parentDeptId} and
+        cetad.status = 1
+        left join cosco_evaluate_task_assign_dept cetad2
+        on cet.id = cetad2.evaluate_task_id and cetad2.parent_dept_id = #{deptId}
+        <where>
+            <if test="taskIds!=null and taskIds.size>0">
+                 cet.id in (
+                <foreach item="item" collection="taskIds" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+        </where>
+    </select>
 
     <select id="selectByWorkFlowId" parameterType="String"
             resultMap="CoscoEvaluateTaskResult">
@@ -353,7 +373,7 @@
         </where>
         group by id
     </select>
-    <select id="selectMyPage" parameterType="map"
+    <select id="selectMyPage"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
         select cet.id,
         cet.evaluate_theme as evaluateTheme,
@@ -361,6 +381,7 @@
         cet.start_time as startTime,
         cet.end_time as endTime,
         cet.status,
+        cet.dept_id as deptId,
         cet.approve_status,
         case
         when cet.approve_status = 0 then '审核中'
@@ -371,7 +392,6 @@
         when cet.status = 0 then '待评价'
         when cet.status = 1 then '评价中'
         when cet.status = 2 then '已结束' end as statusName
-
         from cosco_evaluate_task cet
         <where>
             and cet.del_flag='normal'
@@ -382,6 +402,7 @@
                 and cet.status=#{vo.status}
             </if>
         </where>
+        order by cet.create_time desc
     </select>
 
 

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

@@ -98,7 +98,7 @@
         cets.create_time,
         cets.update_by,
         cets.update_time,
-        cc.category_name ,
+        case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
         cets.last_update_time,
         csb.name as supplier_name
         from cosco_evaluate_task_supplier cets
@@ -266,7 +266,8 @@
         cet.evaluate_theme evaluateTheme,
         cet.start_time startTime,
         cet.end_time endTime,
-        cc.category_name as categoryName,
+        case when cc.category_name is null then '未指定'
+        else cc.category_name end as categoryName,
         cet.STATUS ,
         cet.dept_id as deptId,
         cetsu.review_status reviewStatus,

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

@@ -66,4 +66,8 @@
             #{evaluateTaskSupplierUserId}
         </foreach>
     </update>
+    <delete id="deleteByTaskId">
+        delete from cosco_evaluate_task_user_indicator where evaluate_task_supplier_user_id in
+        (select id from cosco_evaluate_task_supplier_user where evaluate_task_id = #{taskId})
+    </delete>
 </mapper>

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

@@ -0,0 +1,30 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity;
+
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
+import lombok.Data;
+
+/**
+ * 供应商评价_分派下级单位完善评价人对象 cosco_evaluate_task_assign_dept
+ *
+ * @author ruoyi
+ * @date 2025-06-26
+ */
+@Data
+public class CoscoEvaluateTaskAssignDept extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 评价任务id(cosco_evaluate_task表主键) */
+    private String evaluateTaskId;
+
+    /** 上级本级部门ID */
+    private String parentDeptId;
+
+    /** 下派状态(0.本级截至、1.下派下级) */
+    private Long status;
+
+
+}

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

@@ -0,0 +1,68 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service;
+
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo;
+
+import java.util.List;
+
+/**
+ * 供应商评价_分派下级单位完善评价人Service接口
+ *
+ * @author ruoyi
+ * @date 2025-06-26
+ */
+public interface ICoscoEvaluateTaskAssignDeptService {
+    /**
+     * 查询供应商评价_分派下级单位完善评价人
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 供应商评价_分派下级单位完善评价人
+     */
+    public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id);
+
+    /**
+     * 查询供应商评价_分派下级单位完善评价人列表
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 供应商评价_分派下级单位完善评价人集合
+     */
+    public List<CoscoEvaluateTaskAssignDept> selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 新增供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 修改供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept);
+
+    /**
+     * 批量删除供应商评价_分派下级单位完善评价人
+     *
+     * @param ids 需要删除的供应商评价_分派下级单位完善评价人主键集合
+     * @return 结果
+     */
+    public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids);
+
+    /**
+     * 删除供应商评价_分派下级单位完善评价人信息
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 结果
+     */
+    public int deleteCoscoEvaluateTaskAssignDeptById(String id);
+
+    /**
+     * 加入分派下级部门
+     * @param addCoscoEvaluateTaskVo
+     */
+    void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo);
+}

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

@@ -101,4 +101,11 @@ public interface ICoscoEvaluateTaskService {
      * 供应商评价审核审批回调接口
      */
     ApproveVo evaluateApprove(AddCoscoEvaluateTaskVo vo);
+
+    /**
+     * 增量人员分工添加
+     * @param addCoscoEvaluateTaskVo
+     * @return
+     */
+    int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo);
 }

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

@@ -0,0 +1,104 @@
+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.SupplierUserConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskAssignDeptMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 供应商评价_分派下级单位完善评价人Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-06-26
+ */
+@Service
+public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTaskAssignDeptService {
+    @Autowired
+    private CoscoEvaluateTaskAssignDeptMapper coscoEvaluateTaskAssignDeptMapper;
+
+    /**
+     * 查询供应商评价_分派下级单位完善评价人
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 供应商评价_分派下级单位完善评价人
+     */
+    @Override
+    public CoscoEvaluateTaskAssignDept selectCoscoEvaluateTaskAssignDeptById(String id) {
+        return coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptById(id);
+    }
+
+    /**
+     * 查询供应商评价_分派下级单位完善评价人列表
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 供应商评价_分派下级单位完善评价人
+     */
+    @Override
+    public List<CoscoEvaluateTaskAssignDept> selectCoscoEvaluateTaskAssignDeptList(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) {
+        return coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(coscoEvaluateTaskAssignDept);
+    }
+
+    /**
+     * 新增供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    @Override
+    public int insertCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) {
+        return coscoEvaluateTaskAssignDeptMapper.insertCoscoEvaluateTaskAssignDept(coscoEvaluateTaskAssignDept);
+    }
+
+    /**
+     * 修改供应商评价_分派下级单位完善评价人
+     *
+     * @param coscoEvaluateTaskAssignDept 供应商评价_分派下级单位完善评价人
+     * @return 结果
+     */
+    @Override
+    public int updateCoscoEvaluateTaskAssignDept(CoscoEvaluateTaskAssignDept coscoEvaluateTaskAssignDept) {
+        return coscoEvaluateTaskAssignDeptMapper.updateCoscoEvaluateTaskAssignDept(coscoEvaluateTaskAssignDept);
+    }
+
+    /**
+     * 批量删除供应商评价_分派下级单位完善评价人
+     *
+     * @param ids 需要删除的供应商评价_分派下级单位完善评价人主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoscoEvaluateTaskAssignDeptByIds(String[] ids) {
+        return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptByIds(ids);
+    }
+
+    /**
+     * 删除供应商评价_分派下级单位完善评价人信息
+     *
+     * @param id 供应商评价_分派下级单位完善评价人主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoscoEvaluateTaskAssignDeptById(String id) {
+        return coscoEvaluateTaskAssignDeptMapper.deleteCoscoEvaluateTaskAssignDeptById(id);
+    }
+
+    @Override
+    public void insertAssignDept(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept();
+        dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
+        dept.setParentDeptId(SupplierUserConstant.DEPT_ID);
+        List<CoscoEvaluateTaskAssignDept> coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept);
+        if (coscoEvaluateTaskAssignDepts.size() == 0) {
+            dept.setId(PropertyUtils.getSnowflakeId());
+            dept.setStatus(addCoscoEvaluateTaskVo.getTaskStatus());
+            coscoEvaluateTaskAssignDeptMapper.insertCoscoEvaluateTaskAssignDept(dept);
+        }
+    }
+}

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

@@ -12,6 +12,7 @@ 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.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
@@ -19,6 +20,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
 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.*;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
@@ -60,6 +62,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
 
     @Autowired
     private CoscoEvaluateTaskDeptWeightMapper coscoEvaluateTaskDeptWeightMapper;
+    @Autowired
+    private ICoscoEvaluateTaskAssignDeptService coscoEvaluateTaskAssignDeptService;
 
     /**
      * 查询【供应商评价_评价任务主表】
@@ -121,17 +125,32 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
                 List<UserNdTypeVo> userNdTypeVos1 = map.get(userId);
                 vo.setType(userNdTypeVos1.get(0).getType());
 
-                if(vo.getType()== EvaluateTaskConstant.INDICATOR_TYPE_ND_1){
+                if (vo.getType() == EvaluateTaskConstant.INDICATOR_TYPE_ND_1) {
                     List<String> indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList());
                     vo.setIndicatorIds(indicatorIds);
-                }else{
+                } else {
                     vo.setIndicatorIds(new ArrayList<>());
                 }
 
                 vos.add(vo);
             });
             List<String> supplierIds = list.stream().map(TaskSupplierVo::getId).collect(Collectors.toList());
+            Map<String, List<String>> suppMap = list.stream().collect(Collectors.toMap(TaskSupplierVo::getId, TaskSupplierVo::getUserIds));
+            Map<String, UserVo> userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
             List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds);
+            blackSupplierVos.forEach(blackSupplierVo -> {
+                List<String> strings = suppMap.get(blackSupplierVo.getSupplierId());
+                List<TaskUserVo> taskUserVos = new ArrayList<>();
+                strings.forEach(userId -> {
+                    TaskUserVo vo = new TaskUserVo();
+                    vo.setId(userId);
+                    vo.setName(userMap.get(userId).getUserName());
+                    vo.setUserDept(userMap.get(userId).getUserDept());
+                    vo.setUserDeptId(userMap.get(userId).getUserDeptId());
+                    taskUserVos.add(vo);
+                });
+                blackSupplierVo.setUserList(taskUserVos);
+            });
             addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos);
             addCoscoEvaluateTaskVo.setIndicatorList(vos);
         } catch (Exception e) {
@@ -142,7 +161,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     }
 
     private List<UserVo> getUserList(List<CoscoEvaluateTaskSupplierUser> coscoEvaluateTaskSupplierUsers) {
-        List<UserVo> user = userService.getUser();
+        List<UserVo> user = userService.getUser(new ArrayList<>());
         Map<String, UserVo> map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
         Map<String, CoscoEvaluateTaskSupplierUser> suUser = coscoEvaluateTaskSupplierUsers.stream()
                 .collect(Collectors.toMap(
@@ -225,7 +244,18 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     public IPage<CoscoEvaluateTaskListVo> getPage(CoscoEvaluateTaskListVo taskListVo) {
         IPage<CoscoEvaluateTaskListVo> p = new Page<>(taskListVo.getBasePageRequest().getPageNo(),
                 taskListVo.getBasePageRequest().getPageSize());
-        return coscoEvaluateTaskMapper.selectMyPage(p, taskListVo);
+        IPage<CoscoEvaluateTaskListVo> coscoEvaluateTaskListVoIPage = coscoEvaluateTaskMapper.selectMyPage(p, taskListVo);
+        List<String> taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList());
+        taskListVo.setDeptId(SupplierUserConstant.DEPT_ID);
+        taskListVo.setTaskIds(taskIds);
+        taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID);
+        List<DivisionVo> vos = coscoEvaluateTaskMapper.selectDivisionVo(taskListVo);
+        Map<String, String> map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision));
+        coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> {
+            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0");
+            task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId()));
+        });
+        return coscoEvaluateTaskListVoIPage;
     }
 
     /**
@@ -288,6 +318,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         return aVo;
     }
 
+    @Override
+    public int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.DEPT_ID);
+        deleteAll(addCoscoEvaluateTaskVo);
+        addEvalTaskInfo(addCoscoEvaluateTaskVo);
+        return 0;
+    }
+
     /**
      * 添加任务
      *
@@ -303,99 +341,10 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
                 addCoscoEvaluateTaskVo(addCoscoEvaluateTaskVo);
             } else {
                 updateCoscoEvaluateTask(addCoscoEvaluateTaskVo);
-                coscoEvaluateTaskSupplierMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+            }
-                coscoEvaluateTaskSupplierUserMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+            deleteAll(addCoscoEvaluateTaskVo);
 
-            }
+            addEvalTaskInfo(addCoscoEvaluateTaskVo);
-            /**
-             * 权重信息添加
-             */
-            List<CoscoEvaluateTaskDeptWeight> taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList();
-            if (taskDeptWeightList.size() > 0) {
-                taskDeptWeightList.forEach(taskDeptWeight -> {
-                    taskDeptWeight.setId(PropertyUtils.getSnowflakeId());
-                    taskDeptWeight.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
-                    taskDeptWeight.setCreateTime(new Date());
-                });
-                coscoEvaluateTaskDeptWeightMapper.batchCoscoEvaluateTaskDeptWeight(taskDeptWeightList);
-            }
-            //供应商信息添加
-            List<TaskSupplierVo> supplierIds1 = addCoscoEvaluateTaskVo.getSupplierIds();
-            Map<String, List<String>> supplierUserIds = new HashMap<>();
-            List<String> supplierIds = new ArrayList<>();
-            for (TaskSupplierVo supplierId : supplierIds1) {
-                supplierIds.add(supplierId.getId());
-                supplierUserIds.put(supplierId.getId(), supplierId.getUserIds());
-            }
-            List<CoscoEvaluateTaskSupplier> list = new ArrayList<>();
-            for (String supplierId : supplierIds) {
-                CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
-                coscoEvaluateTaskSupplier.setId(PropertyUtils.getSnowflakeId());
-                coscoEvaluateTaskSupplier.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
-                coscoEvaluateTaskSupplier.setSupplierId(supplierId);
-                coscoEvaluateTaskSupplier.setCreateTime(new Date());
-                coscoEvaluateTaskSupplier.setUpdateTime(new Date());
-                coscoEvaluateTaskSupplier.setCreateBy("admin");
-                coscoEvaluateTaskSupplier.setUpdateBy("admin");
-                list.add(coscoEvaluateTaskSupplier);
-            }
-            Map<String, List<String>> map = new HashMap<>();
-            //获取模板所有二级项
-            CoscoEvaluateTemplateIndicatorNd nd = new CoscoEvaluateTemplateIndicatorNd();
-            nd.setTemplateId(addCoscoEvaluateTaskVo.getTemplateId());
-            List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds =
-                    coscoEvaluateTemplateIndicatorNdService.selectCoscoEvaluateTemplateIndicatorNdList(nd);
-            //匹配人员一级项和二级项
-            //获取人员选择
-            List<AdduserIndicatorVo> indicatorList = addCoscoEvaluateTaskVo.getIndicatorList();
-            Map<String, AdduserIndicatorVo> invoices = new HashMap<>();
-            indicatorList.forEach(indicatorVo -> {
-                adduserMap(map, indicatorVo, coscoEvaluateTemplateIndicatorNds);
-                invoices.put(indicatorVo.getUserId(), indicatorVo);
-            });
-            //获取项目添加人员
-            //人员二级项添加列表
-            List<CoscoEvaluateScoring> coscoEvaluateScorings = new ArrayList<>();
-            //人员添加列表
-            List<CoscoEvaluateTaskSupplierUser> coscoEvaluateTaskSupplierUsers = new ArrayList<>();
-            //人员一级项添加列表
-            List<CoscoEvaluateTaskUserIndicator> coscoEvaluateTaskSupplierUserIndicators = new ArrayList<>();
-            supplierUserIds.keySet().stream().forEach(supplierId -> {
-                List<String> strings = supplierUserIds.get(supplierId);
-                strings.forEach(userId -> {
-                    CoscoEvaluateTaskSupplierUser user = new CoscoEvaluateTaskSupplierUser();
-                    user.setId(PropertyUtils.getSnowflakeId());
-                    user.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
-                    user.setSupplierId(supplierId);
-                    user.setUserId(userId);
-                    user.setType(invoices.get(userId).getType());
-                    user.setCreateTime(new Date());
-                    user.setUpdateTime(new Date());
-                    user.setCreateBy("admin");
-                    user.setUpdateBy("admin");
-                    coscoEvaluateTaskSupplierUsers.add(user);
-                    map.get(userId).forEach(indicatorId -> {
-                        CoscoEvaluateTaskUserIndicator indicator = new CoscoEvaluateTaskUserIndicator();
-                        indicator.setIndicatorNdId(indicatorId);
-                        indicator.setEvaluateTaskSupplierUserId(user.getId());
-                        coscoEvaluateTaskSupplierUserIndicators.add(indicator);
-                        CoscoEvaluateScoring coscoEvaluateScoring = new CoscoEvaluateScoring();
-                        coscoEvaluateScoring.setId(PropertyUtils.getSnowflakeId());
-                        coscoEvaluateScoring.setEvaluateTaskSupplierUserId(user.getId());
-                        coscoEvaluateScoring.setIndicatorNdId(indicatorId);
-                        coscoEvaluateScoring.setCreateTime(new Date());
-                        coscoEvaluateScoring.setUpdateTime(new Date());
-                        coscoEvaluateScoring.setCreateBy("admin");
-                        coscoEvaluateScoring.setUpdateBy("admin");
-                        coscoEvaluateScorings.add(coscoEvaluateScoring);
-                    });
-                });
-            });
-
-            coscoEvaluateTaskSupplierMapper.batchCoscoEvaluateTaskSupplier(list);
-            coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings);
-            coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers);
-            coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException(e);
@@ -403,12 +352,118 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         return 1;
     }
 
+    private void deleteAll(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        coscoEvaluateTaskSupplierMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+        coscoEvaluateTaskSupplierUserMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+        coscoEvaluateScoringMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+        coscoEvaluateTaskUserIndicatorMapper.deleteByTaskId(addCoscoEvaluateTaskVo.getId());
+    }
+
+    private void addEvalTaskInfo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
+        /**
+         * 权重信息添加
+         */
+        List<CoscoEvaluateTaskDeptWeight> taskDeptWeightList = addCoscoEvaluateTaskVo.getTaskDeptWeightList();
+        if (taskDeptWeightList.size() > 0) {
+            taskDeptWeightList.forEach(taskDeptWeight -> {
+                taskDeptWeight.setId(PropertyUtils.getSnowflakeId());
+                taskDeptWeight.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
+                taskDeptWeight.setCreateTime(new Date());
+            });
+            coscoEvaluateTaskDeptWeightMapper.batchCoscoEvaluateTaskDeptWeight(taskDeptWeightList);
+        }
+        //供应商信息添加
+        List<TaskSupplierVo> supplierIds1 = addCoscoEvaluateTaskVo.getSupplierIds();
+        Map<String, List<String>> supplierUserIds = new HashMap<>();
+        List<String> supplierIds = new ArrayList<>();
+        for (TaskSupplierVo supplierId : supplierIds1) {
+            supplierIds.add(supplierId.getId());
+            supplierUserIds.put(supplierId.getId(), supplierId.getUserIds());
+        }
+        List<CoscoEvaluateTaskSupplier> list = new ArrayList<>();
+        for (String supplierId : supplierIds) {
+            CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier();
+            coscoEvaluateTaskSupplier.setId(PropertyUtils.getSnowflakeId());
+            coscoEvaluateTaskSupplier.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
+            coscoEvaluateTaskSupplier.setSupplierId(supplierId);
+            coscoEvaluateTaskSupplier.setCreateTime(new Date());
+            coscoEvaluateTaskSupplier.setUpdateTime(new Date());
+            coscoEvaluateTaskSupplier.setCreateBy(SupplierUserConstant.USER_NAME);
+            coscoEvaluateTaskSupplier.setUpdateBy(SupplierUserConstant.USER_NAME);
+            list.add(coscoEvaluateTaskSupplier);
+        }
+        Map<String, List<String>> map = new HashMap<>();
+        //获取模板所有二级项
+        CoscoEvaluateTemplateIndicatorNd nd = new CoscoEvaluateTemplateIndicatorNd();
+        nd.setTemplateId(addCoscoEvaluateTaskVo.getTemplateId());
+        List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds =
+                coscoEvaluateTemplateIndicatorNdService.selectCoscoEvaluateTemplateIndicatorNdList(nd);
+        //匹配人员一级项和二级项
+        //获取人员选择
+        List<AdduserIndicatorVo> indicatorList = addCoscoEvaluateTaskVo.getIndicatorList();
+        Map<String, AdduserIndicatorVo> invoices = new HashMap<>();
+        indicatorList.forEach(indicatorVo -> {
+            adduserMap(map, indicatorVo, coscoEvaluateTemplateIndicatorNds);
+            invoices.put(indicatorVo.getUserId(), indicatorVo);
+        });
+        //获取项目添加人员
+        //人员二级项添加列表
+        List<CoscoEvaluateScoring> coscoEvaluateScorings = new ArrayList<>();
+        //人员添加列表
+        List<CoscoEvaluateTaskSupplierUser> coscoEvaluateTaskSupplierUsers = new ArrayList<>();
+        //人员一级项添加列表
+        List<CoscoEvaluateTaskUserIndicator> coscoEvaluateTaskSupplierUserIndicators = new ArrayList<>();
+        supplierUserIds.keySet().stream().forEach(supplierId -> {
+            List<String> strings = supplierUserIds.get(supplierId);
+            strings.forEach(userId -> {
+                CoscoEvaluateTaskSupplierUser user = new CoscoEvaluateTaskSupplierUser();
+                user.setId(PropertyUtils.getSnowflakeId());
+                user.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
+                user.setSupplierId(supplierId);
+                user.setUserId(userId);
+                user.setType(invoices.get(userId).getType());
+                user.setCreateTime(new Date());
+                user.setUpdateTime(new Date());
+                user.setCreateBy(SupplierUserConstant.USER_NAME);
+                user.setUpdateBy(SupplierUserConstant.USER_NAME);
+                coscoEvaluateTaskSupplierUsers.add(user);
+                map.get(userId).forEach(indicatorId -> {
+                    CoscoEvaluateTaskUserIndicator indicator = new CoscoEvaluateTaskUserIndicator();
+                    indicator.setIndicatorNdId(indicatorId);
+                    indicator.setEvaluateTaskSupplierUserId(user.getId());
+                    coscoEvaluateTaskSupplierUserIndicators.add(indicator);
+                    CoscoEvaluateScoring coscoEvaluateScoring = new CoscoEvaluateScoring();
+                    coscoEvaluateScoring.setId(PropertyUtils.getSnowflakeId());
+                    coscoEvaluateScoring.setEvaluateTaskSupplierUserId(user.getId());
+                    coscoEvaluateScoring.setIndicatorNdId(indicatorId);
+                    coscoEvaluateScoring.setCreateTime(new Date());
+                    coscoEvaluateScoring.setUpdateTime(new Date());
+                    coscoEvaluateScoring.setCreateBy(SupplierUserConstant.USER_NAME);
+                    coscoEvaluateScoring.setUpdateBy(SupplierUserConstant.USER_NAME);
+                    coscoEvaluateScorings.add(coscoEvaluateScoring);
+                });
+            });
+        });
+
+        coscoEvaluateTaskSupplierMapper.batchCoscoEvaluateTaskSupplier(list);
+        coscoEvaluateScoringMapper.batchCoscoEvaluateScoring(coscoEvaluateScorings);
+        coscoEvaluateTaskSupplierUserMapper.batchCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUsers);
+        coscoEvaluateTaskUserIndicatorMapper.batchCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskSupplierUserIndicators);
+        /**
+         * 添加评价是否可以下级提交
+         */
+        if (addCoscoEvaluateTaskVo.getTaskStatus() != null) {
+            coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo);
+        }
+    }
+
     private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
         addCoscoEvaluateTaskVo.setCreateTime(new Date());
         addCoscoEvaluateTaskVo.setUpdateTime(new Date());
         addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId());
-        addCoscoEvaluateTaskVo.setCreateBy("admin");
+        addCoscoEvaluateTaskVo.setCreateBy(SupplierUserConstant.USER_NAME);
-        addCoscoEvaluateTaskVo.setUpdateBy("admin");
+        addCoscoEvaluateTaskVo.setUpdateBy(SupplierUserConstant.USER_NAME);
+        addCoscoEvaluateTaskVo.setDeptId(SupplierUserConstant.PARENT_DEPT_ID);
         coscoEvaluateTaskMapper.insertCoscoEvaluateTask(addCoscoEvaluateTaskVo);
     }
 

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

@@ -106,6 +106,14 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
 
     }
 
+    /**
+     * 计算分数
+     * @param calculateAndObtainScoresVos
+     * @param coscoEvaluateTaskSupplier
+     * @param coscoEvaluateScoringResults
+     * @param coscoEvaluateTaskDeptWeightes
+     * @return
+     */
     private static int getCalculateScore(List<CalculateAndObtainScoresVo> calculateAndObtainScoresVos, CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier, List<CoscoEvaluateScoringResult> coscoEvaluateScoringResults, List<CoscoEvaluateTaskDeptWeight> coscoEvaluateTaskDeptWeightes) {
         //基础百分比
         int basePercentage = 100;

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

@@ -4,6 +4,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskAssignDept;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskDeptWeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -43,5 +44,9 @@ public class AddCoscoEvaluateTaskVo extends CoscoEvaluateTask {
      * 用户信息列表
      */
     private List<UserVo> userList;
+    /**
+     * 是否下级部门可以添加评价信息
+     */
+    private Long taskStatus;
 
 }

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

@@ -14,6 +14,7 @@ public class AdduserIndicatorVo {
      * 评价类型(0 按评价单  1 按指标)
      */
     private Long type=0L;
+    private Boolean isSelected=true;
     /**
      * 指标id集合
      */

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CoscoEvaluateTaskListVo {
@@ -62,6 +63,22 @@ public class CoscoEvaluateTaskListVo {
      * 审批状态名称
      */
     private String approveStatusName;
+    /**
+     * 父类部门id
+     */
+    private String parentDeptId;
+    /**
+     * 是否编辑
+     */
+    private String isEditor;
+    /**
+     * 显示分工
+     */
+    private String division;
+
+    private List<String> taskIds;
+
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 }

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

@@ -0,0 +1,9 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo;
+
+import lombok.Data;
+
+@Data
+public class DivisionVo {
+    private String taskId;
+    private String division;
+}

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

@@ -0,0 +1,32 @@
+package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo;
+
+import lombok.Data;
+
+@Data
+public class TaskUserVo {
+    /**
+     *  人员ID
+     */
+    private String id;
+    /**
+     * 人员姓名
+     */
+    private String name;
+    /**
+     * 所属部门
+     */
+    private String userDept;
+    /**
+     * 所属部门ID
+     */
+    private String userDeptId;
+    /**
+     * 职位
+     */
+    private String position;
+    /**
+     *  是否被选中（用于UI显示）
+     */
+    private Boolean selected;
+
+}

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

@@ -49,6 +49,8 @@ public class SupplierPageVo {
      */
     private List<String> deptList;
 
+    private String socialCreditCode;
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 }

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml

@@ -624,6 +624,7 @@
         SELECT
         csb.id,
         MAX(csb.name) AS name,
+        csb.social_credit_code AS socialCreditCode,
         MAX(cas.dept_id) AS deptId,
         MAX(caw.id) AS accessWorkId,
         MAX(caw.update_time) AS admissionTime,
@@ -715,6 +716,7 @@
         SELECT
         csb.id AS supplierId,
         csb.name AS supplierName,
+        csb.social_credit_code as socialCreditCode,
         '准入部门' AS deptName,
         category_info.categoryName AS categoryName,
         work_time.createTime AS createTime,