修改数据

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

@@ -132,12 +132,16 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
                         uVo.setName(userVo.getUserName());
                         uVo.setUserDept(userVo.getUserDept());
                         uVo.setUserDeptId(userVo.getUserDeptId());
-
                     }
                     taskUserVos.add(uVo);
-
                 }
             }
+            if(blackSupplierVo.getCategoryIds()!=null && blackSupplierVo.getCategoryIds().length()>0){
+                String[] split = blackSupplierVo.getCategoryIds().split(",");
+                List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+                blackSupplierVo.setCategoryName(String.join(",", categoryNameListByIds));
+            }
+
             blackSupplierVo.setUserList(taskUserVos);
         });
         vo.setBlackSupplierVos(blackSupplierVos);
@@ -171,6 +175,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         String userId = currentUser.getUserId();
         taskVo.setUpdateBy(userId);
+        taskVo.setDeptId(currentUser.getDeptId());
         taskVo.setId(PropertyUtils.getSnowflakeId());
         taskVo.setCreateBy(userId);
         taskVo.setStatus(AnnualreviewTaskConstant.NOT_START);

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

@@ -28,10 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 供应商评价_年审任务供应商对应评审人Service业务层处理
@@ -90,7 +87,11 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
 
         vo.setStartTime(coscoAnnualreviewTask.getStartTime());
         vo.setEndTime(coscoAnnualreviewTask.getEndTime());
-        vo.setCategory(baseCategoryNameVo.getCategoryName());
+        if(baseCategoryNameVo.getCategoryIds()!=null && baseCategoryNameVo.getCategoryIds().length()>0){
+            String[] split = baseCategoryNameVo.getCategoryIds().split(",");
+            List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+            vo.setCategory(String.join(",", categoryNameListByIds));
+        }
         vo.setTaskIndicatorVo(coscoAnnualreviewScoringMapper.selectIndList(id));
         return vo;
     }

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

@@ -17,10 +17,8 @@ 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.*;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo;
-import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
@@ -31,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -52,6 +51,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
     private IOrgService orgService;
     @Autowired
     private IUserService userService;
+    @Autowired
+    private ICoscoCategoryService coscoCategoryService;
 
     /**
      * 查询供应商黑名单_供应商加入黑灰名单申请
@@ -74,7 +75,17 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
         coscoBlacklistSuppliers.forEach(blacklistSupplier -> {
             supperList.add(blacklistSupplier.getSupplierId());
         });
-        vo.setSupplierList(coscoSupplierBaseMapper.selectSupplierByIds(supperList));
+        List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supperList);
+        blackSupplierVos.forEach(blackSupplierVo -> {
+            if(blackSupplierVo.getCategoryIds()!=null && blackSupplierVo.getCategoryIds().length()>0){
+                String[] split = blackSupplierVo.getCategoryIds().split(",");
+                List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+                blackSupplierVo.setCategoryName(String.join(",", categoryNameListByIds));
+            }
+        });
+
+
+        vo.setSupplierList(blackSupplierVos);
         return vo;
     }
 

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

@@ -55,4 +55,6 @@ public class BlackSupplierVo implements Serializable {
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 
+    private String categoryIds;
+
 }

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

@@ -94,7 +94,7 @@ public class CoscoCategoryServiceImpl  implements ICoscoCategoryService {
         List<String> categoryNameList = new ArrayList<>();
         for (String id : categoryIds) {
             BaseResponse<CoscoCategoryMaintenance> info = categoryClient.getInfo(id);
-            if (info.isSuccess()) {
+            if (info!=null && info.isSuccess()) {
                 CoscoCategoryMaintenance data = info.getData();
                 categoryNameList.add(data.getCategoryName());
             }else{

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

@@ -157,6 +157,12 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
 
                     taskUserVos.add(vo);
                 });
+                if(blackSupplierVo.getCategoryIds()!=null && blackSupplierVo.getCategoryIds().length()>0){
+                    String[] split = blackSupplierVo.getCategoryIds().split(",");
+                    List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+                    blackSupplierVo.setCategoryName(String.join(",", categoryNameListByIds));
+                }
+
                 blackSupplierVo.setUserList(taskUserVos);
             });
             addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos);

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

@@ -191,7 +191,11 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
         //封装返回值信息
         TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
         taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
-        taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
+        if(baseCategoryNameVo.getCategoryIds()!=null && baseCategoryNameVo.getCategoryIds().length()>0){
+            String[] split = baseCategoryNameVo.getCategoryIds().split(",");
+            List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+            taskIndicatorBaseVo.setCategory(String.join(",", categoryNameListByIds));
+        }
         List<TaskIndicatorVo> taskIndicatorVo = new ArrayList<>();
         //根据供应商任务id获取评分数据
         CoscoEvaluateScoringResult result = new CoscoEvaluateScoringResult();

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -123,7 +124,12 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
         BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplierUser.getSupplierId());
         TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();
         taskIndicatorBaseVo.setName(baseCategoryNameVo.getName());
-        taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName());
+
+        if(baseCategoryNameVo.getCategoryIds()!=null && baseCategoryNameVo.getCategoryIds().length()>0){
+            String[] split = baseCategoryNameVo.getCategoryIds().split(",");
+            List<String> categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split)));
+            taskIndicatorBaseVo.setCategory(String.join(",", categoryNameListByIds));
+        }
         List<TaskIndicatorVo> taskIndicatorVo=new ArrayList<>();
         //根据用户id查询添加的项目评价指标
         List<TaskSubIndicatorVo> coscoEvaluateScorings = coscoEvaluateScoringMapper.selectTaskSubIndicatorVo(id);

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

@@ -16,4 +16,8 @@ public class BaseCategoryNameVo {
      * 供应商类别名称
      */
     private String categoryName;
+    /**
+     * 供应商品类id集合
+     */
+    private String categoryIds;
 }

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

@@ -238,8 +238,8 @@
         as themeName
         FROM cosco_blacklist cb
         where cb.del_flag = 'normal'
-        <if test="orgId!=null">
+        <if test="vo.orgId!=null">
-            and cb.org_id = #{orgId}
+            and cb.org_id = #{vo.orgId}
         </if>
         order by cb.create_time desc
     </select>

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

@@ -956,10 +956,9 @@
     </update>
     <select id="selectNameAndCategoryName" parameterType="string"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo">
-        select csb.id, csb.name, GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName
+        select csb.id, csb.name, GROUP_CONCAT(DISTINCT casc.category_id SEPARATOR ', ') AS categoryIds
         from cosco_supplier_base csb
-                 left join cosco_access_supplier_category casc on csb.id = casc.supplier_id and casc.del_flag = 'normal'
+        left join cosco_access_supplier_category casc on csb.id = casc.supplier_id and casc.del_flag = 'normal'
-                 left join cosco_category cc on cc.id = casc.category_id
         where csb.id = #{id}
         group by csb.id
     </select>
@@ -981,14 +980,12 @@
         END AS unifiedCode,
         GROUP_CONCAT(caw.dept_id) as dept_id,
         max(caw.update_time) AS admissionTime,
-        GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName,
+        GROUP_CONCAT(DISTINCT casc.category_id SEPARATOR ', ') AS categoryIds
-        GROUP_CONCAT(DISTINCT cc.id SEPARATOR ', ') AS categoryIds
         from
         cosco_access_supplier_category as casc
         join cosco_supplier_base as csb on casc.supplier_id = csb.id -- 供应商已准入品类
         left join cosco_access_supplier as cas on cas.supplier_id = csb.id
         left join cosco_access_work as caw on caw.id = cas.access_work_id and caw.apply_type=1 and caw.approve_status=1
-        left join cosco_category as cc on casc.category_id = cc.id
         -- 黑名单排除
         WHERE NOT EXISTS (
         SELECT 1
@@ -1017,7 +1014,7 @@
             and cas.org_id = #{vo.orgId}
         </if>
         <if test="vo.categoryId!=null and vo.categoryId!=''">
-            and cc.categoryId like concat('%',#{vo.categoryId},'%')
+            and casc.categoryId like concat('%',#{vo.categoryId},'%')
         </if>
 
         <if test="vo.librarySupplierIdList!=null and vo.librarySupplierIdList.size>0">
@@ -1051,16 +1048,15 @@
         ELSE NULL
         END AS unifiedCode,
         '准入部门' AS deptName,
-        category_info.categoryName AS categoryName,
+        category_info.categoryIds AS categoryIds,
         work_time.createTime AS createTime,
         latest_review.review_result AS themeName,
         latest_review.update_time AS evaluateTime
         FROM
         cosco_supplier_base csb
         LEFT JOIN (
-        SELECT casc.supplier_id, GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName
+        SELECT casc.supplier_id, GROUP_CONCAT(casc.category_id SEPARATOR ', ') AS categoryIds
         FROM cosco_access_supplier_category casc
-        JOIN cosco_category cc ON cc.id = casc.category_id
         GROUP BY casc.supplier_id
         ) AS category_info ON category_info.supplier_id = csb.id
         LEFT JOIN (