liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.0.0.126:8500/liushimin/biz_supplier_manage into dev

Browse Source
This commit is contained in:
TL
2025-07-02 09:56:48 +08:00
parent c8e1a1463f 059ec704b3
commit 1be76886e0
55 changed files with 751 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/AnnualreviewTaskConstant.java
View File

@ -16,7 +16,7 @@ public interface AnnualreviewTaskConstant {
/**
* 进行中
*/
public static final Long IN_PROGRESS = 1L;
public static final String IN_PROGRESS = "1L";
/**
* 已完成
*/

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java
View File

@ -33,6 +33,10 @@ public interface CoscoCategoryConstant {
* 是否加入
*/
public static final Long ISTRUE = 1L;
/**
* 未加入
*/
public static final Long ISNOTTRUE = 0L;
/**
* 建库方式 online.线上
*/
@ -53,6 +57,10 @@ public interface CoscoCategoryConstant {
* 最高级 0
*/
public static final String LEVEL_TOP = "0";
/**
* 顶级0L
*/
public static final Long CATEGORY_LEVEL_TOP = 0L;
/**
* * 类型(0.分类、1.品类)

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

@ -23,7 +23,7 @@ public class UserController {
@GetMapping("/getUserList")
public BaseResponse getUserList(SelectUserVo vo) {
return BaseResponse.success(userService.getUser(vo.getUserIds()));
return BaseResponse.success(userService.getUser(vo));
}
@GetMapping("/getDeptList")

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

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import org.springframework.stereotype.Service;
@ -23,16 +24,15 @@ public class UserService {
}
public List<UserVo> getUser(List<String> userIds) {
public List<UserVo> getUser(SelectUserVo vo) {
List<UserVo> userList = new ArrayList<>();
Map<String,String> map = new HashMap<>();
if(userIds!=null){
for (String userId : userIds) {
if(vo.getUserIds()!=null){
for (String userId : vo.getUserIds()) {
map.put(userId,userId);
}
}
for (int i = 1; i <= 10; i++) {
for (int i = 1; i <= 32; i++) {
UserVo user = new UserVo();
user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010
user.setUserName("用户" + i);
@ -44,6 +44,14 @@ public class UserService {
}
userList.add(user);
}
if(vo.getPageNumber()!=null && vo.getPageSize()!=null){
int pageNum = vo.getPageNumber();
int pageSize = vo.getPageSize();
int start = (pageNum - 1) * pageSize;
int end = Math.min(start + pageSize, userList.size());
return userList.subList(start, end);
}
return userList;
}

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

@ -7,4 +7,7 @@ import java.util.List;
@Data
public class SelectUserVo {
private List<String> userIds;
private Integer pageNumber;
private Integer pageSize;
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java
View File

@ -91,4 +91,11 @@ public interface CoscoAnnualreviewTaskSupplierMapper {
* @return
*/
IPage<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatistics(IPage<SupplierAnnualReviewStatisticsVo> p, SupplierAnnualReviewStatisticsVo vo);
/**
* 导出年审列表
* @param vo
* @return
*/
List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo);
}

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
View File

@ -228,13 +228,10 @@
FROM cosco_annualreview_task cat
<where>
<if test="vo.annualreviewTheme != null and vo.annualreviewTheme != ''">
and cat.annualreview_theme = #{vo.annualreviewTheme}
and cat.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
</if>
<if test="vo.startTime != null ">
and cat.start_time = #{vo.startTime}
</if>
<if test="vo.endTime != null ">
and cat.end_time = #{vo.endTime}
<if test="vo.startTime != null and vo.endTime != null">
and cat.start_time between #{vo.startTime} and #{vo.endTime}
</if>
<if test="vo.status != null ">
and cat.status = #{vo.status}

45
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
View File

@ -51,7 +51,7 @@
cosco_annualreview_task_supplier cats
join cosco_annualreview_task cat on cats.annualreview_task_id = cat.id
JOIN cosco_supplier_base csb ON cats.supplier_id = csb.id
left join cosco_category cc on cc.id = csb.category_id
left join cosco_category cc on cc.id = cat.category_id
where cats.del_flag='normal'
<if test="vo.name!=null and vo.name!=''">
and csb.name like concat('%',#{vo.name},'%')
@ -62,6 +62,9 @@
<if test="vo.reviewResult!=null">
and cats.review_result=#{vo.reviewResult}
</if>
<if test="vo.startTime!=null and vo.endTime!=null">
and cats.last_update_time between #{vo.startTime} and #{vo.endTime}
</if>
</select>
<select id="selectCoscoAnnualreviewTaskSupplierList"
@ -181,7 +184,8 @@
set del_flag = 'deleted'
where annualreview_task_id = #{taskId}
</update>
<select id="getSupplierAnnualReviewStatistics" parameterType="map"
<select id="getSupplierAnnualReviewStatisticsList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo"
resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
select
@ -204,6 +208,43 @@
cosco_annualreview_task_supplier cats
join cosco_supplier_base csb on cats.supplier_id=csb.id
join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id
<where>
cats.del_flag = 'normal'
<if test="supplierName!=null and supplierName!=''">
and csb.name like concat('%',#{supplierName},'%')
</if>
<if test="annualreviewYear!=null and annualreviewYear!=''">
and cat.annualreview_year = #{annualreviewYear}
</if>
and review_result is not null
</where>
order by cats.create_time desc
</select>
<select id="getSupplierAnnualReviewStatistics" parameterType="map"
resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
select
csb.name supplierName,
case when csb.supplier_type = 'ovs' then '境外'
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
cats.id,
'准入单位' as accessUnit,
'准入部门' as accessDept,
case when cats.review_result = 1 then '合格'
else '不合格' end as annualStatisticsResult,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
cat.annualreview_year
from
cosco_annualreview_task_supplier cats
join cosco_supplier_base csb on cats.supplier_id=csb.id
join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id
<where>
cats.del_flag = 'normal'
<if test="vo.supplierName!=null and vo.supplierName!=''">

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierUserMapper.xml
View File

@ -75,14 +75,20 @@
<if test="vo.userId!=null and vo.userId!=''">
and catsu.user_id=#{vo.userId}
</if>
<if test="vo.name!=null and vo.name!=''">
and csb.name like concat('%',#{vo.name},'%')
</if>
<if test="vo.status!=null and vo.status!=''">
and cat.status=#{vo.status}
</if>
<if test="vo.supplierId!=null and vo.supplierId!=''">
and catsu.supplier_id=#{vo.supplierId}
</if>
<if test="vo.annualreviewTaskId!=null and vo.annualreviewTaskId!=''">
and catsu.annualreview_task_id=#{vo.annualreviewTaskId}
<if test="vo.startTime!=null and vo.endTime!=''">
and catsu.start_time between #{vo.startTime} and #{vo.endTime}
</if>
<if test="vo.annualreviewTheme!=null and vo.annualreviewTheme!=''">
and catsu.annualreview_theme like concat('%',#{vo.annualreviewTheme},'%')
</if>
</where>
</select>

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTemplate.java
View File

@ -47,6 +47,10 @@ public class CoscoAnnualreviewTemplate extends BaseEntity {
* 品类id(cosco_category表主键)
*/
private String categoryId;
/**
* 创建单位
*/
private String deptId;
/**
* 是否启用(0.草稿、1.启用、2.禁用)

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

@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
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.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*;
@ -62,6 +63,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme());
vo.setTemplateId(coscoAnnualreviewTask.getTemplateId());
vo.setStartTime(coscoAnnualreviewTask.getStartTime());
vo.setAnnualreviewYear(coscoAnnualreviewTask.getAnnualreviewYear());
vo.setEndTime(coscoAnnualreviewTask.getEndTime());
vo.setCategoryId(coscoAnnualreviewTask.getCategoryId());
vo.setCategoryLimitation(coscoAnnualreviewTask.getCategoryLimitation());
@ -76,7 +78,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
//获取供应商用户信息
List<CoscoAnnualreviewTaskSupplierUser> coscoAnnualreviewTaskSupplierUsers = coscoAnnualreviewTaskSupplierUserMapper.selectCoscoAnnualreviewTaskSupplierUserList(coscoAnnualreviewTaskSupplierUser);
//获取用户信息
List<UserVo> user1 = userService.getUser(new ArrayList<>());
List<UserVo> user1 = userService.getUser(new SelectUserVo());
//获取已使用的用户信息
Map<String, String> userIdMap = coscoAnnualreviewTaskSupplierUsers.stream()
.collect(Collectors.
@ -106,7 +108,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
blackSupplierVos.forEach(blackSupplierVo -> {
List<TaskUserVo> taskUserVos = new ArrayList<>();
List<String> strings = suppMap.get(blackSupplierVo.getSupplierId());
if(strings.size()>0){
if(!strings.isEmpty()){
for (String userId : strings) {
TaskUserVo uVo=new TaskUserVo();
UserVo userVo = userMap.get(userId);

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

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

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class AnnualreviewTaskSupplierListVo implements Serializable {
@ -42,6 +43,12 @@ public class AnnualreviewTaskSupplierListVo implements Serializable {
private String deptId;
/**
* 审查开始时间
*/
private Date startTime;
private Date endTime;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;

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

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

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistSupplierMapper.java
View File

@ -63,4 +63,11 @@ public interface CoscoBlacklistSupplierMapper {
* @return 结果
*/
public int deleteCoscoBlacklistSupplierByBlacklistIds(String[] blacklistIds);
/**
* 查询供应商加入黑名单数量
* @param supplierId
* @return
*/
int countBySupplierId(String supplierId);
}

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

@ -214,6 +214,7 @@
'发起单位' as unitName,
cb.create_time as createTime,
cb.approve_status as approveStatus,
cb.restore_approve_status as restoreApproveStatus,
case
when cb.approve_status is null then '未开始'
when cb.approve_status = 0 then '进行中'
@ -232,7 +233,7 @@
<select id="selectBecomeDue" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo">
select cb.dept_id deptId,
cb.create_by creater,
csb.name ,
csb.name,
csb.id
from cosco_blacklist cb

46
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistSupplierMapper.xml
View File

@ -4,9 +4,10 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistSupplierMapper">
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier" id="CoscoBlacklistSupplierResult">
<result property="blacklistId" column="blacklist_id"/>
<result property="supplierId" column="supplier_id"/>
<resultMap type="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier"
id="CoscoBlacklistSupplierResult">
<result property="blacklistId" column="blacklist_id"/>
<result property="supplierId" column="supplier_id"/>
</resultMap>
<sql id="selectCoscoBlacklistSupplierVo">
@ -14,7 +15,9 @@
from cosco_blacklist_supplier
</sql>
<select id="selectCoscoBlacklistSupplierList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier" resultMap="CoscoBlacklistSupplierResult">
<select id="selectCoscoBlacklistSupplierList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier"
resultMap="CoscoBlacklistSupplierResult">
<include refid="selectCoscoBlacklistSupplierVo"/>
<where>
blacklist_id = #{blacklistId}
@ -23,19 +26,20 @@
<select id="selectCoscoBlacklistSupplierByBlacklistId" parameterType="String"
resultMap="CoscoBlacklistSupplierResult">
<include refid="selectCoscoBlacklistSupplierVo"/>
where blacklist_id = #{blacklistId}
<include refid="selectCoscoBlacklistSupplierVo"/>
where blacklist_id = #{blacklistId}
</select>
<insert id="insertCoscoBlacklistSupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier">
<insert id="insertCoscoBlacklistSupplier"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier">
insert into cosco_blacklist_supplier
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="blacklistId != null">blacklist_id,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="blacklistId != null">blacklist_id,</if>
<if test="supplierId != null">supplier_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="blacklistId != null">#{blacklistId},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="blacklistId != null">#{blacklistId},</if>
<if test="supplierId != null">#{supplierId},</if>
</trim>
</insert>
<insert id="batchCoscoBlacklistSupplier" parameterType="java.util.List">
@ -46,18 +50,20 @@
( #{item.blacklistId}, #{item.supplierId})
</foreach>
</insert>
<update id="updateCoscoBlacklistSupplier" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier">
<update id="updateCoscoBlacklistSupplier"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier">
update cosco_blacklist_supplier
<trim prefix="SET" suffixOverrides=",">
<if test="supplierId != null">supplier_id =
#{supplierId},
</if>
<if test="supplierId != null">supplier_id =
#{supplierId},
</if>
</trim>
where blacklist_id = #{blacklistId}
</update>
<update id="deleteCoscoBlacklistSupplierByBlacklistId" parameterType="String">
update cosco_blacklist_supplier set del_flag = 2
update cosco_blacklist_supplier
set del_flag = 2
where blacklist_id = #{blacklistId}
</update>
@ -67,4 +73,12 @@
#{blacklistId}
</foreach>
</update>
<select id="countBySupplierId" parameterType="string" resultType="int">
select count(id)
from cosco_blacklist cb
join cosco_blacklist_supplier cbs on cb.id = cbs.blacklist_id
where cb.approve_status = 1
and (cb.restore_approve_status is null or cb.restore_approve_status = 0 or cb.restore_approve_status = 2)
and cbs.supplier_id = #{supplierId}
</select>
</mapper>

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistSupplierService.java
View File

@ -64,4 +64,11 @@ public interface ICoscoBlacklistSupplierService {
* @param listVo
*/
void batchInsert(AddBlackListVo listVo);
/**
* 根据供应商id查询
* @param supplierId
* @return
*/
int countBySupplierId(String supplierId);
}

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

@ -5,6 +5,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.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper;
@ -91,10 +92,10 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
@Transactional(rollbackFor = Exception.class)
public int insertCoscoBlacklist(AddBlackListVo listVo) {
listVo.setCreateTime(new Date());
listVo.setCreateBy("admin");
listVo.setCreateBy(SupplierUserConstant.USER_NAME);
listVo.setLastUpdateTime(LocalDateTime.now());
listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
listVo.setDeptId("1");
listVo.setDeptId(SupplierUserConstant.DEPT_ID);
listVo.setId(PropertyUtils.getSnowflakeId());
coscoBlacklistMapper.insertCoscoBlacklist(listVo);
//添加供应商
@ -229,27 +230,23 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) {
CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier();
coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId());
List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
List<CoscoBlacklistSupplier> coscoBlacklistSuppliers =
coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
//获取添加时限
DictProject dictProject = new DictProject();
dictProject.setParentCode(EvaluateTaskConstant.INDICATOR_TYPE_ND);
coscoBlacklistSuppliers.forEach(cosupplier -> {
//判断黑名单
if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
int count =coscoBlacklistSupplierService.countBySupplierId(cosupplier.getSupplierId());
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
coscoSupplierBase.setId(cosupplier.getSupplierId());
coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
}
//判断灰名单
if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
coscoSupplierBase.setId(cosupplier.getSupplierId());
coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
if(count==0){
coscoSupplierBase.setId(cosupplier.getSupplierId());
coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISNOTTRUE);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);
}
}
});
}
coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java
View File

@ -99,4 +99,9 @@ public class CoscoBlacklistSupplierServiceImpl implements ICoscoBlacklistSupplie
});
coscoBlacklistSupplierMapper.batchCoscoBlacklistSupplier(list);
}
@Override
public int countBySupplierId(String supplierId) {
return coscoBlacklistSupplierMapper.countBySupplierId(supplierId);
}
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java
View File

@ -40,6 +40,11 @@ public class BlackListVo implements Serializable {
*/
private String approveStatusName;
/**
* 恢复状态
*/
private Integer restoreApproveStatus;
/**
* 主题信息（包含供应商名称和名单类型）
*/

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryLibraryContainMapper.java
View File

@ -82,4 +82,11 @@ public interface CoscoCategoryLibraryContainMapper extends IBaseMapper<CoscoCate
* @param co
*/
void updateLockType(CoscoCategoryLibraryContain co);
/**
* 获取品类id
* @param libraryId
* @return
*/
List<String> selectCoscoCateGoryIdByLibraryId(String libraryId);
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java
View File

@ -65,5 +65,10 @@ public interface CoscoCategoryMapper extends IBaseMapper<CoscoCategory> {
IPage<CoscoCategoryVO> selectMyPage(IPage<CoscoCategoryVO> p,@Param("coscoCategory") CoscoCategoryVO coscoCategory);
/**
* 根据品类id获取全部名称
* @param id
* @return
*/
String selectCategoryNameById(String id);
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
View File

@ -108,4 +108,11 @@
and category_id = #{categoryId}
</update>
<select id="selectCoscoCateGoryIdByLibraryId" parameterType="string" resultType="string">
select cclc.category_id
from cosco_category_library_contain cclc
join cosco_category cc on cc.id= cclc.category_id
where cclc.category_library_id = #{libraryId} and cc.type=1
</select>
</mapper>

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
View File

@ -50,6 +50,7 @@
select cclsa.id,
ccl.name,
ccl.area,
ccl.id as libraryId,
'张三' as applyUser ,
ccl.create_time as applyTime,
cclsa.approve_status as approveStatus
@ -206,6 +207,12 @@
<if test="vo.name!=null and vo.name!=''">
and ccl.name like concat('%',#{vo.name},'%')
</if>
<if test="vo.area!=null and vo.area!=''">
and ccl.area = #{vo.area}
</if>
<if test="vo.approveStatus!=null and vo.approveStatus!=''">
and cclsa.approveStatus = #{vo.approveStatus}
</if>
GROUP BY
cclsa.id
</select>

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
View File

@ -101,16 +101,11 @@
</select>
<select id="selectCategoryNameById" parameterType="string" resultType="string">
SELECT
GROUP_CONCAT(c2.category_name ORDER BY FIND_IN_SET(c2.id, CONCAT(c1.ancestors, ',', c1.id)) SEPARATOR '>') AS full_path
FROM
cosco_category c1
JOIN
cosco_category c2
ON
FIND_IN_SET(c2.id, CONCAT(c1.ancestors, ',', c1.id))
WHERE
c1.id = #{id};
SELECT COALESCE((SELECT GROUP_CONCAT(category_name ORDER BY FIND_IN_SET(id, c.ancestors) SEPARATOR '-')
FROM cosco_category
WHERE FIND_IN_SET(id, c.ancestors)), '') AS ancestor_names
FROM cosco_category c
WHERE id = #{id}
</select>
<insert id="insertCoscoCategory"

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibraryContainService.java
View File

@ -96,4 +96,11 @@ public interface ICoscoCategoryLibraryContainService extends IBaseService<Cosco
* @return
*/
int updateList(List<CoscoCategoryLibraryContain> coscoCategoryLibraryContain);
/**
* 获取品类名称
* @param libraryId
* @return
*/
List<String> selectCoscoCateGoryIdByLibraryId(String libraryId);
}

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
View File

@ -154,6 +154,16 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
return 0;
}
/**
* 获取品类id
* @param libraryId
* @return
*/
@Override
public List<String> selectCoscoCateGoryIdByLibraryId(String libraryId) {
return coscoCategoryLibraryContainMapper.selectCoscoCateGoryIdByLibraryId(libraryId);
}
/**
* 递归构建树形结构
*

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

@ -8,6 +8,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
@ -41,6 +42,8 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
private ICoscoCategoryLibrarySupplierApplyService coscoCategoryLibrarySupplierApplyService;
@Autowired
private CoscoCategoryLibrarAttachmentsMapper coscoCategoryLibrarAttachmentsMapper;
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
/**
* 查询品类库_品类库
@ -170,12 +173,22 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
CoscoCategoryLibraryDetailVo vo = new CoscoCategoryLibraryDetailVo();
try {
BeanUtils.copyProperties(vo, coscoCategoryLibrary);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
} catch (Exception e) {
throw new RuntimeException(e);
}
//获取添加的供应商
List<String> strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(id);
StringBuilder sb = new StringBuilder();
for (String s : strings) {
String categoryName = coscoCategoryMapper.selectCategoryNameById(s);
if (sb.length() > 0) {
sb.append(",");
}
if(categoryName!=null){
sb.append(categoryName);
}
}
vo.setCategoryName(sb.toString());
coscoCategoryLibrarAttachmentsMapper.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id);
//获取添加品类
vo.setCategoryIds(coscoCategoryLibraryContainService.selectByLibraryId(id));

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java
View File

@ -6,7 +6,10 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo;
@ -31,6 +34,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
private CoscoCategoryLibrarySupplierApplyMapper coscoCategoryLibrarySupplierApplyMapper;
@Autowired
private ICoscoCategoryLibrarySupplierService coscoCategoryLibrarySupplierService;
@Autowired
private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService;
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
/**
* 查询品类库_品类库入库供应商申请单
@ -42,7 +49,15 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
public ListCoscoCategoryLibrarySupplierApplyVo selectCoscoCategoryLibrarySupplierApplyById(String id) {
ListCoscoCategoryLibrarySupplierApplyVo vo = coscoCategoryLibrarySupplierApplyMapper.selectCoscoCategoryLibrarySupplierApplyById(id);
//获取添加的供应商
List<String> strings = coscoCategoryLibraryContainService.selectCoscoCateGoryIdByLibraryId(vo.getLibraryId());
StringBuilder sb = new StringBuilder();
for (String s : strings) {
if (sb.length() > 0) {
sb.append(",");
}
sb.append(coscoCategoryMapper.selectCategoryNameById(s));
}
vo.setCategoryName(sb.toString());
vo.setCoscoCategoryLibrarySupplierVos(coscoCategoryLibrarySupplierService.selectSupplierByApplyId(id));
return vo;

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java
View File

@ -13,6 +13,10 @@ import java.util.List;
public class CoscoCategoryLibraryDetailVo extends CoscoCategoryLibrary {
private String deptName;
private String createByName="测试人员";
private String categoryName;
/**
* 品类id
*/

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java
View File

@ -17,6 +17,18 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable {
* 品类库
*/
private String name;
/**
* 部门名称
*/
private String deptName="部门";
/**
* 品类名称
*/
private String categoryName;
/**
* 品类id
*/
private String libraryId;
/**
* 地域
*/

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java
View File

@ -106,4 +106,6 @@ public interface CoscoEvaluateTaskSupplierMapper {
* @return
*/
List<CoscoEvaluateTaskSupplier> exportList(CoscoEvaluateTaskSupplier taskListVo);
List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo);
}

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

@ -122,14 +122,14 @@
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
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 (
cet.id in (
<foreach item="item" collection="taskIds" separator=",">
#{item}
</foreach>
@ -353,10 +353,10 @@
cet.dept_id as deptId,
cet.approve_status as approveStatus,
case
when cet.approve_status = 0 then '审批中'
when cet.approve_status = 1 then '通过'
when cet.approve_status = 2 then '驳回'
else '未审批' end as approveName,
when cet.approve_status = 0 then '审批中'
when cet.approve_status = 1 then '通过'
when cet.approve_status = 2 then '驳回'
else '未审批' end as approveName,
case
when cet.status = 0 then '待评价'
when cet.status = 1 then '评价中'
@ -376,6 +376,9 @@
<if test="vo.status!=null">
and cet.status=#{vo.status}
</if>
<if test="vo.startTime!=null and vo.endTime!=null">
and cet.start_time between #{vo.startTime} and #{vo.endTime}
</if>
</where>
group by id
</select>
@ -407,6 +410,10 @@
<if test="vo.status!=null">
and cet.status=#{vo.status}
</if>
<if test="vo.startTime!=null and vo.endTime!=null">
and (cet.start_time >= #{vo.startTime} and cet.end_time &lt;= #{vo.endTime})
</if>
</where>
order by cet.create_time desc
</select>

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

@ -79,6 +79,7 @@
<if test="lastUpdateTime != null ">
and cets.last_update_time = #{lastUpdateTime}
</if>
</where>
</select>
@ -122,6 +123,12 @@
<if test="vo.lastUpdateTime != null ">
and cets.last_update_time = #{vo.lastUpdateTime}
</if>
<if test="vo.supplierName!=null and vo.supplierName!=''">
and csb.name like concat('%',#{vo.supplierName},'%')
</if>
<if test="vo.levelName!=null and vo.levelName!=''">
and cets.level_name = #{vo.levelName}
</if>
</where>
</select>
@ -289,6 +296,15 @@
LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal'
<where>
and cetsu.del_flag = 'normal'
<if test="vo.name !=null and vo.name !=''">
and (csb.name like concat('%',#{vo.name},'%') or cet.evaluate_theme like concat('%',#{vo.name},'%'))
</if>
<if test="vo.startTime != null and vo.endTime!=null">
and cets.start_time between #{vo.startTime} and #{vo.endTime}
</if>
<if test="vo.status !=null ">
and cets.status = #{vo.status}
</if>
<if test="vo.userId != null and vo.userId != ''">and cetsu.user_id= #{vo.userId}</if>
<if test="vo.taskId!=null and vo.taskId!=null">and cet.id= #{vo.taskId}</if>
<if test="vo.supplierId!=null and vo.supplierId!=null">and cets.supplier_id= #{vo.supplierId}</if>
@ -302,6 +318,44 @@
where evaluate_task_id = #{taskId}
</update>
<select id="getSupplierEvaluateStatisticsList"
resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
parameterType="map">
select
csb.name supplierName,
case when csb.supplier_type = 'ovs' then '境外'
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
cets.id,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
'准入单位' as accessUnit,
'准入部门' as accessDept,
cets.review_result evaluateResult,
cet.evaluate_year evaluateYear
from
cosco_evaluate_task_supplier cets
join cosco_supplier_base csb on cets.supplier_id=csb.id
join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
<where>
cets.del_flag = 'normal'
and cets.review_result is not null
<if test="supplierName!=null and supplierName!=''">
and csb.name like concat('%',#{supplierName},'%')
</if>
<if test="evaluateYear!=null and evaluateYear!=''">
and cet.evaluate_year = #{evaluateYear}
</if>
<if test="evaluateResult!=null and evaluateResult!=''">
and cets.review_result = #{evaluateResult}
</if>
</where>
order by cets.create_time desc
</select>
<select id="getSupplierEvaluateStatistics"
resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
parameterType="map">

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

@ -10,10 +10,12 @@ 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.AnnualreviewTaskConstant;
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.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
@ -124,19 +126,19 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
List<UserNdTypeVo> userNdTypeVos1 = map.get(userId);
vo.setType(userNdTypeVos1.get(0).getType());
if (EvaluateTaskConstant.INDICATOR_TYPE_ND_1.equals(vo.getType())) {
List<String> indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList());
vo.setIndicatorIds(indicatorIds);
} else {
vo.setIndicatorIds(new ArrayList<>());
}
List<String> indicatorIds = userNdTypeVos1.stream().map(UserNdTypeVo::getNeId).collect(Collectors.toList());
vo.setIndicatorIds(indicatorIds);
// if (EvaluateTaskConstant.INDICATOR_TYPE_ND_1.equals(vo.getType())) {
//
// } 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,(existing, replacement) -> existing));
Map<String, UserVo> userMap = userService.getUser(new ArrayList<>()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
Map<String, UserVo> userMap = userService.getUser(new SelectUserVo()).stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
List<BlackSupplierVo> blackSupplierVos = coscoSupplierBaseMapper.selectSupplierByIds(supplierIds);
blackSupplierVos.forEach(blackSupplierVo -> {
List<String> strings = suppMap.get(blackSupplierVo.getSupplierId());
@ -147,7 +149,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
vo.setName(userMap.get(userId).getUserName());
vo.setUserDept(userMap.get(userId).getUserDept());
vo.setUserDeptId(userMap.get(userId).getUserDeptId());
vo.setSelected( true);
vo.setIsSelected( true);
taskUserVos.add(vo);
});
blackSupplierVo.setUserList(taskUserVos);
@ -155,13 +157,14 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
addCoscoEvaluateTaskVo.setBlackSupplierVos(blackSupplierVos);
addCoscoEvaluateTaskVo.setIndicatorList(vos);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return addCoscoEvaluateTaskVo;
}
private List<UserVo> getUserList(List<CoscoEvaluateTaskSupplierUser> coscoEvaluateTaskSupplierUsers) {
List<UserVo> user = userService.getUser(new ArrayList<>());
List<UserVo> user = userService.getUser(new SelectUserVo());
Map<String, UserVo> map = user.stream().collect(Collectors.toMap(UserVo::getUserId, userVo -> userVo));
Map<String, CoscoEvaluateTaskSupplierUser> suUser = coscoEvaluateTaskSupplierUsers.stream()
.collect(Collectors.toMap(
@ -481,25 +484,25 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
* @param vo
* @param coscoEvaluateTemplateIndicatorNds
*/
public void adduserMap(Map<String, List<String>> userMap, AdduserIndicatorVo vo, List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds) {
public void adduserMap(Map<String, List<String>> userMap, AdduserIndicatorVo vo,
List<CoscoEvaluateTemplateIndicatorNd> coscoEvaluateTemplateIndicatorNds) {
Map<String, String> map = new HashMap<>();
coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
map.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
});
Long type = vo.getType();
//一级项信息
Map<String, String> stIdMap = new HashMap<>();
//Map<String, String> stIdMap = new HashMap<>();
//二级项信息
Map<String, String> ndIdMap = new HashMap<>();
if (type.equals(0L)) {
if (CoscoCategoryConstant.CATEGORY_LEVEL_TOP.equals(vo.getType())) {
coscoEvaluateTemplateIndicatorNds.forEach(coscoEvaluateTemplateIndicatorNd -> {
stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
//stIdMap.put(coscoEvaluateTemplateIndicatorNd.getIndicatorStId(), coscoEvaluateTemplateIndicatorNd.getIndicatorStId());
ndIdMap.put(coscoEvaluateTemplateIndicatorNd.getId(), coscoEvaluateTemplateIndicatorNd.getId());
});
} else {
List<String> indicatorIds = vo.getIndicatorIds();
indicatorIds.forEach(indicatorId -> {
stIdMap.put(map.get(indicatorId), map.get(indicatorId));
//stIdMap.put(map.get(indicatorId), map.get(indicatorId));
ndIdMap.put(indicatorId, indicatorId);
});
}

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

@ -4,6 +4,7 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageConstant;
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 com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
@ -83,7 +84,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
//查询当前任务的人员信息及人员评价情况
List<CalculateAndObtainScoresVo> calculateAndObtainScoresVos = coscoEvaluateScoringMapper.selectCalculateAndObtainScores(coscoEvaluateTask.getId());
//获取人员信息
List<UserVo> user = userService.getUser(new ArrayList<>());
List<UserVo> user = userService.getUser(new SelectUserVo());
//给人员添加部门信息
Map<String, String> userMap = user.stream().collect(Collectors.toMap(UserVo::getUserId, UserVo::getUserDeptId));
calculateAndObtainScoresVos.forEach(vos -> {

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java
View File

@ -21,7 +21,7 @@ public class CoscoEvaluateTemplateVo implements Serializable {
/**
* 品类id
*/
private Long categoryId;
private String categoryId;
/**
* 创建单位
*/

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

@ -29,6 +29,6 @@ public class TaskUserVo implements Serializable {
/**
* 是否被选中（用于UI显示）
*/
private Boolean selected=true;
private Boolean isSelected=true;
}

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
View File

@ -72,4 +72,10 @@ public interface CoscoSupplierQualificationsMapper {
* @return
*/
IPage<SupplierQualificationExpireVo> getSupplierExitStatistics(IPage<SupplierQualificationExpireVo> p,@Param("vo") SupplierQualificationExpireVo vo);
/**
* 资质过期提醒
* @param vo
* @return
*/
List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo);
}

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java
View File

@ -73,4 +73,11 @@ public interface CoscoSupplierexitMapper {
* @return
*/
IPage<SupplierExitStatisticsVo> getSupplierExitStatistics(IPage<SupplierExitStatisticsVo> p, @Param("vo") SupplierExitStatisticsVo vo);
/**
* 查询退出数据
* @param vo
* @return
*/
List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo);
}

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

@ -43,6 +43,10 @@ public class SupplierPageVo {
/** 最新评价时间 */
private String supplierType;
/**
* 品类id
*/
private String categoryId;
/**
* 黑名单部门list

118
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java
View File

@ -1,7 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.controller;
import com.alibaba.excel.EasyExcelFactory;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.service.DataStatisticeService;
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo;
@ -9,10 +11,14 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStat
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo;
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 数据统计查询
@ -32,6 +38,31 @@ public class DataStatisticeController {
return BaseResponse.success(dataStatisticeService.getSupplierEvaluateStatistics(vo));
}
/**
* 导出供应商评价情况统计
*
* @param
* @return
*/
@GetMapping("/exportSupplierEvaluateStatistics")
public void export(HttpServletResponse response, SupplierEvaluateStatisticsVo vo) {
try {
List<SupplierEvaluateStatisticsVo> list = dataStatisticeService.getSupplierEvaluateStatisticsList(vo);
String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8");
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
response.setCharacterEncoding("utf-8");
EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
.sheet("供应评价")
.doWrite(list);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 供应商年审情况统计
*/
@ -40,6 +71,34 @@ public class DataStatisticeController {
return BaseResponse.success(dataStatisticeService.getSupplierAnnualReviewStatistics(vo));
}
/**
* 导出供应商年审列表
*
* @param
* @return
*/
@GetMapping("/exportSupplierAnnualReviewStatistics")
public void exportSupplierAnnualReviewStatistics(HttpServletResponse response, SupplierAnnualReviewStatisticsVo vo) {
try {
List<SupplierAnnualReviewStatisticsVo> list = dataStatisticeService.getSupplierAnnualReviewStatisticsList(vo);
String fileName = URLEncoder.encode("供应年审.xlsx", "UTF-8");
// 动态设置导出字段（忽略未标注字段）
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
response.setCharacterEncoding("utf-8");
EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
.sheet("供应年审")
.doWrite(list);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 退出情况统计
*/
@ -48,6 +107,32 @@ public class DataStatisticeController {
return BaseResponse.success(dataStatisticeService.getSupplierExitStatistics(vo));
}
/**
* 导出供应商退出列表
*
* @param
* @return
*/
@GetMapping("/exportSupplierExitStatistics")
public void exportSupplierExitStatistics(HttpServletResponse response, SupplierExitStatisticsVo vo) {
try {
List<SupplierExitStatisticsVo> list = dataStatisticeService.getSupplierExitStatisticsList(vo);
String fileName = URLEncoder.encode("供应商退出信息.xlsx", "UTF-8");
// 动态设置导出字段（忽略未标注字段）
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
response.setCharacterEncoding("utf-8");
EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
.sheet("供应商退出信息")
.doWrite(list);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 资质过期提醒
*/
@ -57,4 +142,29 @@ public class DataStatisticeController {
return BaseResponse.success(dataStatisticeService.getSupplierQualificationExpire(vo));
}
/**
* 导出供应商资质列表
*
* @param
* @return
*/
@GetMapping("/exportSupplierQualificationExpire")
public void exportSupplierQualificationExpire(HttpServletResponse response, SupplierQualificationExpireVo vo) {
try {
List<SupplierQualificationExpireVo> list = dataStatisticeService.getSupplierQualificationExpireList(vo);
String fileName = URLEncoder.encode("供应商资质.xlsx", "UTF-8");
// 动态设置导出字段（忽略未标注字段）
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
response.setCharacterEncoding("utf-8");
EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
.sheet("供应商资质")
.doWrite(list);
} catch (Exception e) {
e.printStackTrace();
}
}
}

29
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/DataStatisticeService.java
View File

@ -6,6 +6,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStat
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo;
import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo;
import java.util.List;
public interface DataStatisticeService {
/**
* 供应商评价统计
@ -34,4 +36,31 @@ public interface DataStatisticeService {
* @return
*/
IPage<SupplierQualificationExpireVo> getSupplierQualificationExpire(SupplierQualificationExpireVo vo);
/**
* 查询导出评价数据
* @param vo
* @return
*/
List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo);
/**
* 查询导出年审数据
* @param vo
* @return
*/
List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo);
/**
* 供应商退出统计查询
* @param vo
* @return
*/
List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo);
/**
* 供应商资质
* @param vo
* @return
*/
List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo);
}

35
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java
View File

@ -15,6 +15,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificatio
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class DataStatisticeServiceImpl implements DataStatisticeService {
@ -42,6 +44,16 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatistics(p, vo);
}
/**
* 查询导出年审数据
* @param vo
* @return
*/
@Override
public List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo){
return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatisticsList(vo);
}
@Override
public IPage<SupplierExitStatisticsVo> getSupplierExitStatistics(SupplierExitStatisticsVo vo) {
IPage<SupplierExitStatisticsVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
@ -49,10 +61,33 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
return coscoSupplierexitMapper.getSupplierExitStatistics(p, vo);
}
/**
* 供应商退出统计查询
* @param vo
* @return
*/
public List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo){
return coscoSupplierexitMapper.getSupplierExitStatisticsList(vo);
}
@Override
public IPage<SupplierQualificationExpireVo> getSupplierQualificationExpire(SupplierQualificationExpireVo vo) {
IPage<SupplierQualificationExpireVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
vo.getBasePageRequest().getPageSize());
return coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo);
}
/**
* 供应商资质
* @param vo
* @return
*/
public List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo){
return coscoSupplierQualificationsMapper.getSupplierQualificationExpireList( vo);
}
@Override
public List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo) {
return coscoEvaluateTaskMapper.getSupplierEvaluateStatisticsList(vo);
}
}

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -14,33 +15,41 @@ public class SupplierAnnualReviewStatisticsVo {
* id
*/
private String id;
/**
* 供应商名称
*/
@ExcelProperty("供应商名称")
private String supplierName;
/**
* 境内/境外
*/
@ExcelProperty("境内/境外")
private String area;
/**
* 品类
*/
@ExcelProperty("品类")
private String categoryName;
/**
* 供应商名称
*/
private String supplierName;
/**
* 准入单位
*/
@ExcelProperty("准入单位")
private String accessUnit;
/**
* 准入部门
*/
@ExcelProperty("准入部门")
private String accessDept;
/**
* 评价年度
*/
@ExcelProperty("评价年度")
private String annualreviewYear;
/**
* 评价结果
*/
@ExcelProperty("评价结果")
private String annualStatisticsResult;
@ApiModelProperty(value = "分页对象信息")

17
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -10,33 +11,41 @@ public class SupplierEvaluateStatisticsVo {
* id
*/
private String id;
/**
* 供应商名称
*/
@ExcelProperty("供应商名称")
private String supplierName;
/**
* 境内/境外
*/
@ExcelProperty("境内/境外")
private String area;
/**
* 品类
*/
@ExcelProperty("品类")
private String categoryName;
/**
* 供应商名称
*/
private String supplierName;
/**
* 准入单位
*/
@ExcelProperty("准入单位")
private String accessUnit;
/**
* 准入部门
*/
@ExcelProperty("准入部门")
private String accessDept;
/**
* 评价年度
*/
@ExcelProperty("评价年度")
private String evaluateYear;
/**
* 评价结果
*/
@ExcelProperty("评价结果")
private String evaluateResult;
@ApiModelProperty(value = "分页对象信息")

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -9,30 +10,37 @@ public class SupplierExitStatisticsVo {
/**
* 境内/境外
*/
@ExcelProperty("境内/境外")
private String area;
/**
* 退出品类
*/
@ExcelProperty("退出品类")
private String categoryName;
/**
* 供应商名称
*/
@ExcelProperty("供应商名称")
private String supplierName;
/**
* 退出单位
*/
@ExcelProperty("退出单位")
private String accessUnit;
/**
* 退出部门
*/
@ExcelProperty("退出部门")
private String accessDept;
/**
* 退出申请人
*/
@ExcelProperty("退出申请人")
private String applyUser;
/**
* 退出时间
*/
@ExcelProperty("退出时间")
private String applyTime;
@ApiModelProperty(value = "分页对象信息")

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -13,21 +14,25 @@ public class SupplierQualificationExpireVo {
/**
* 发证机构
*/
@ExcelProperty("发证机构")
private String authority;
/**
* 有效期截止日
*/
@ExcelProperty("有效期截止日")
private Date termOfValidity;
/**
* 供应商名称
*/
@ExcelProperty("供应商名称")
private String supplierName;
/**
* 地区（境内/境外）
*/
@ExcelProperty("地区（境内/境外）")
private String area;
/**
@ -38,16 +43,19 @@ public class SupplierQualificationExpireVo {
/**
* 准入单位（固定值）
*/
@ExcelProperty("准入单位")
private String accessUnit;
/**
* 准入部门（固定值）
*/
@ExcelProperty("准入部门")
private String accessDept;
/**
* 分类名称（多个分类逗号分隔）
*/
@ExcelProperty("分类名称")
private String categoryName;
@ApiModelProperty(value = "分页对象信息")