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

功能修改

Browse Source
This commit is contained in:
TL
2025-06-27 09:18:26 +08:00
parent d2766d2eff
commit b09efb3ec7
25 changed files with 583 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;

52
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java Normal file
View File

@ -0,0 +1,52 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
* 供应商业务处理消息推送Controller
*
* @author ruoyi
* @date 2025-06-23
*/
@RestController
@RequestMapping("/supplierMessage")
public class CoscoMessageController extends BaseController {
@Autowired
private ICoscoMessageService coscoMessageService;
/**
* 查询供应商业务处理消息推送列表
*/
@ApiOperation("查询分页数据")
@PostMapping("/page")
public BaseResponse<IPage<CoscoMessage>> page(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoMessage coscoMessage) {
return BaseResponse.success(coscoMessageService.getPage(coscoMessage));
}
@ApiOperation("修改数据")
@PostMapping("/update")
public BaseResponse<Integer> update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoMessage coscoMessage){
return BaseResponse.success(coscoMessageService.updateCoscoMessage(coscoMessage));
}
}

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

@ -2,17 +2,19 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.net.URLEncoder;
import java.util.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
@ -105,7 +107,7 @@ public class CoscoSupplierBaseController extends BaseController {
@PostMapping("/getPageMy")
public BaseResponse<IPage<CoscoSupplierBase>> getPageMy(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) {
coscoSupplierBase.setCreateBy("1");
return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase));
return BaseResponse.success(coscoSupplierBaseService.getMySupplierBasePage(coscoSupplierBase));
}
@ -119,10 +121,74 @@ public class CoscoSupplierBaseController extends BaseController {
public BaseResponse<IPage<CoscoSupplierBase>> getPageQualified(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) {
coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W);
coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W);
//coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W);//灰名单字段暂时不用
return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase));
}
/**
* 导出合格供应商列表查询分页数据
* @return
*/
@GetMapping("/getPageMyExport")
public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception {
coscoSupplierBase.setCreateBy("1");
List<CoscoSupplierBase> list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase);
// 动态设置导出字段（忽略未标注字段）
Set<String> includeFields = new HashSet<>(Arrays.asList(
"name","supplierTypeCn", "enterpriseType","categoryName","updateTime" // 指定要导出的字段名
));
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");
EasyExcel.write(response.getOutputStream())
.includeColumnFieldNames(includeFields)
.head(CoscoSupplierBase.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
.sheet("我的供应商")
.doWrite(list);
}
/**
* 导出合格供应商列表查询分页数据
* @return
*/
@GetMapping("/getPageQualifiedExport")
public void getPageQualifiedExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception {
coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR);
coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W);
List<CoscoSupplierBase> list = coscoSupplierBaseService.selectCoscoSupplierBaseList(coscoSupplierBase);
// 动态设置导出字段（忽略未标注字段）
Set<String> includeFields = new HashSet<>(Arrays.asList(
"name", "socialCreditCode","supplierTypeCn", "enterpriseType","createTime" // 指定要导出的字段名
));
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");
EasyExcel.write(response.getOutputStream())
.includeColumnFieldNames(includeFields)
.head(CoscoSupplierBase.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽
.sheet("合格供应商")
.doWrite(list);
}
@ApiOperation("查询数据")
@GetMapping("/{id}")
public BaseResponse<CoscoSupplierVo> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java
View File

@ -59,7 +59,7 @@ public class CoscoSupplierexitController extends BaseController {
/**
* 供应商退出任务详情查询
* 供应商退出任务详情查询(只查询退出品类分页)
* @return 返回结果
*/
@ApiOperation("查询分页数据")
@ -69,4 +69,16 @@ public class CoscoSupplierexitController extends BaseController {
}
/**
* 供应商退出任务详情查询，以及品类信息
* @return 返回结果
*/
@ApiOperation("查询分页数据")
@GetMapping("/{id}")
public BaseResponse<CoscoSupplierexitVo> getExitInfoPage(@PathVariable("id") String id) {
return BaseResponse.success(coscoSupplierexitService.selectCoscoSupplierexitById(id));
}
}

76
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import org.springframework.data.repository.query.Param;
import java.util.List;
@ -22,10 +25,10 @@ public interface CoscoMessageMapper {
/**
* 查询供应商业务处理消息推送列表
*
* @param coscoMessage 供应商业务处理消息推送
* @return 供应商业务处理消息推送集合
*/
public List<CoscoMessage> selectCoscoMessageList(CoscoMessage coscoMessage);
IPage<CoscoMessage> selectCoscoMessageList(IPage<CoscoMessage> page, @Param("vo") CoscoMessage vo);
/**
* 新增供应商业务处理消息推送

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

@ -35,6 +35,11 @@ public interface CoscoSupplierBaseMapper {
IPage<CoscoSupplierBase> selectPageList(IPage<CoscoSupplierBase> page, @Param("vo") CoscoSupplierBase vo);
//我准入的供应商
IPage<CoscoSupplierBase> getMySupplierBasePage(IPage<CoscoSupplierBase> page, @Param("vo") CoscoSupplierBase vo);
List<CoscoSupplierBase> getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase);
/**
* 新增中远海运_供应商_基本信息

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java
View File

@ -15,9 +15,13 @@ public class CoscoAccessWorkVo {
private CoscoAccessWork coscoAccessWork;
//准入申请关联品类id集合
@NotNull(message = "准入品类不能为空")
@Valid
private List<String> categoryIds;
//准入申请供应商id集合
@NotNull(message = "准入供应商不能为空")
@Valid
private List<String> supplierIds;
//评审人员

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java
View File

@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 供应商业务处理消息推送对象 cosco_message
*
@ -18,6 +20,7 @@ public class CoscoMessage extends CoscoBaseEntity {
/** 接收人ID */
//@Excel(name = "接收人ID")
@NotBlank(message = "接收人id不能为空")
private String receiverId;
/** 内容 */

50
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java
View File

@ -2,9 +2,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -16,7 +19,7 @@ import javax.validation.constraints.NotBlank;
* @date 2025-06-16
*/
@Data
public class CoscoSupplierBase extends CoscoBaseEntity {
public class CoscoSupplierBase {
private static final long serialVersionUID = 1L;
/** 主键ID */
@ -43,11 +46,13 @@ public class CoscoSupplierBase extends CoscoBaseEntity {
/** 企业类型(数据字典code) */
@TableField("企业类型")
@ExcelProperty("企业类型")
private String enterpriseType;
/** 企业名称 */
@NotBlank(message = "企业名称不能为空")
@TableField("企业名称")
@ExcelProperty("供应商名称")
private String name;
/** 企业英文名称 */
@ -56,6 +61,7 @@ public class CoscoSupplierBase extends CoscoBaseEntity {
/** 统一社会信用代码 */
@TableField("统一社会信用代码")
@ExcelProperty("统一社会信用代码")
private String socialCreditCode;
/** 经营范围 */
@ -172,8 +178,50 @@ public class CoscoSupplierBase extends CoscoBaseEntity {
private Date lastUpdateTime;
@TableField("供应商身份类型中文")
@ExcelProperty("境内/境外")
private String supplierTypeCn;
@TableField("准入状态中文")
private String accessStatusCn;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
@ExcelProperty("注册时间")
private Date createTime;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
@ExcelProperty("准入时间")
private Date updateTime;
@ApiModelProperty("当前页")
private Integer pageNo;
@ApiModelProperty("每页显示条数")
private Integer pageSize;
/** 搜索值 */
@JsonIgnore
@ApiModelProperty(value = "搜索值")
private String searchValue;
/** 创建者 */
@ApiModelProperty(value = "创建人")
private String createBy;
/** 更新者 */
@ApiModelProperty(value = "修改人")
private String updateBy;
//搜索条件品类
private String categoryId;
@ExcelProperty("品类名称")
private String categoryName;
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java
View File

@ -16,9 +16,13 @@ public class CoscoSupplierexitVo {
public CoscoSupplierexit coscoSupplierexit;
//供应商id集合
@NotNull(message = "供应商id集合不能为空")
@Valid // 关键注解：启用嵌套验证
public List<String> supplierIdList;
//退出任务供应商关联品类表
@NotNull(message = "供应商关联品类集合不能空")
@Valid // 关键注解：启用嵌套验证
public List<CoscoSupplierexitSupplierCategory> coscoSupplierexitSupplierCategoryList;
}

13
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java
View File

@ -1,6 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
@ -13,6 +15,10 @@ import java.util.List;
* @date 2025-06-23
*/
public interface ICoscoMessageService {
IPage<CoscoMessage> getPage(CoscoMessage data);
/**
* 查询供应商业务处理消息推送
*
@ -21,13 +27,6 @@ public interface ICoscoMessageService {
*/
public CoscoMessage selectCoscoMessageById(String id);
/**
* 查询供应商业务处理消息推送列表
*
* @param coscoMessage 供应商业务处理消息推送
* @return 供应商业务处理消息推送集合
*/
public List<CoscoMessage> selectCoscoMessageList(CoscoMessage coscoMessage);
public int insertCoscoMessage(CoscoMessage coscoMessage);

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

@ -17,8 +17,12 @@ public interface ICoscoSupplierBaseService {
IPage<CoscoSupplierBase> getPage(CoscoSupplierBase coscoSupplierBase);
IPage<CoscoSupplierBase> getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase);
IPage<CoscoAccessSupplierCategory> getZrCategoryPage(CoscoAccessSupplierCategory coscoSupplierBase);
public List<CoscoSupplierBase> getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase);
/**
@ -29,6 +33,15 @@ public interface ICoscoSupplierBaseService {
*/
public CoscoSupplierVo selectCoscoSupplierBaseById(String id);
/**
* 查询中远海运_供应商_基本信息
*
* @param id 中远海运_供应商_基本信息主键
* @return 中远海运_供应商_基本信息
*/
public CoscoSupplierBase selectSocialCreditCodeById(String id);
/**
* 查询中远海运_供应商_基本信息列表
*

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java
View File

@ -28,7 +28,7 @@ public interface ICoscoSupplierexitService {
* @param id 供应商退出_供应商退出任务主键
* @return 供应商退出_供应商退出任务
*/
public CoscoSupplierexit selectCoscoSupplierexitById(String id);
public CoscoSupplierexitVo selectCoscoSupplierexitById(String id);
/**
* 查询供应商退出_供应商退出任务列表

23
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWo
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date;
@ -177,7 +178,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//先验证一下主任务表数据状态
CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
if(coscoAccessWorkData == null){
if (!ObjectUtils.isEmpty(coscoAccessWorkData)) {
throw new IllegalArgumentException("任务信息不能为空");
}
@ -212,7 +213,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(vo.getId());
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
List<CoscoAccessCategory> coscoAccessCategoryListAop = new ArrayList<>();
for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
//验证该品类是否已经准入过了
CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory();
@ -226,14 +226,13 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
coscoAccessSupplierCategory.setAccessWorkId(vo.getId());
coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId());
coscoAccessSupplierCategory.setCreateBy("1");
coscoAccessSupplierCategory.setUpdateBy("1");
coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy());
coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy());
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
}
coscoAccessCategoryListAop.add(coscoAccessCategory1);
}
coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop);
coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList);
supplierIdList.add(coscoAccessSupplier1);
}
@ -243,17 +242,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory();
coscoAccessCategory.setAccessWorkId(vo.getId());
List<CoscoAccessCategory> coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory);
List<CoscoAccessCategory> coscoAccessCategoryListAop = new ArrayList<>();
for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){
//验证该品类是否已经准入过了
CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory();
coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId());
coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId());
coscoAccessSupplierCategory2.setDeptId(coscoAccessWorkData.getDeptId());
Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2);
coscoAccessCategoryListAop.add(coscoAccessCategory1);
}
coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop);
coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList);
supplierIdList.add(coscoAccessSupplier1);
}
}

20
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -18,6 +18,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
/**
* 供应商准入_准入申请工作主Service业务层处理
@ -309,10 +311,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
if(CoscoType.ACCESS_TYPE_ONLINE.equals(coscoAccessWork.getAccessType())){
String zuZhangId = "";//组长id
//评审人员集合
List<CoscoAccessUser> coscoAccessUserls = vo.getCoscoAccessUserls();
if(coscoAccessUserls.size() > 0){
List<CoscoAccessUser> coscoAccessUserls = vo.getCoscoAccessUserls();
if (!CollectionUtils.isEmpty(coscoAccessUserls)) {
for(CoscoAccessUser user: coscoAccessUserls){
//判断是否是组长
if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){
zuZhangId = user.getUserId();
@ -324,7 +325,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
}
//评审项集合
if(vo.getCoscoAccessItems().size() > 0){
if (!CollectionUtils.isEmpty(vo.getCoscoAccessItems())) {
//首先循环所有供应商
for(String sId : vo.getSupplierIds()){
@ -394,12 +395,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//String userId = "USER001";
Date date = CoscoDateUtils.getNowDate();
String userId =vo.getUserId();
if(vo.getCoscoAccessUserItemList() != null){
if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) {
for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){
//修改评审项关联评审人员表
coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem);
if(coscoAccessUserItem.getCoscoAccessTtemAttachments() != null){
if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) {
//插入附件表
CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments();
coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId());
@ -537,7 +537,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//先验证一下主任务表数据状态
CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId());
if(coscoAccessWorkData == null){
if (!ObjectUtils.isEmpty(coscoAccessWorkData)) {
throw new IllegalArgumentException("任务信息不能为空");
}
@ -580,8 +580,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId());
coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId());
coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId());
coscoAccessSupplierCategory.setCreateBy("1");
coscoAccessSupplierCategory.setUpdateBy("1");
coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy());
coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy());
coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
}

21
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java
View File

@ -2,12 +2,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
@ -25,6 +29,12 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
@Autowired
private CoscoMessageMapper coscoMessageMapper;
@Override
public IPage<CoscoMessage> getPage(CoscoMessage data) {
IPage<CoscoMessage> page = new Page<>(data.getPageNo(), data.getPageSize());
return coscoMessageMapper.selectCoscoMessageList(page, data);
}
/**
* 查询供应商业务处理消息推送
*
@ -36,16 +46,6 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
return coscoMessageMapper.selectCoscoMessageById(id);
}
/**
* 查询供应商业务处理消息推送列表
*
* @param coscoMessage 供应商业务处理消息推送
* @return 供应商业务处理消息推送
*/
@Override
public List<CoscoMessage> selectCoscoMessageList(CoscoMessage coscoMessage) {
return coscoMessageMapper.selectCoscoMessageList(coscoMessage);
}
/**
* 消息保存接口
@ -78,6 +78,7 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
@Override
public int updateCoscoMessage(CoscoMessage coscoMessage) {
coscoMessage.setUpdateTime(CoscoDateUtils.getNowDate());
coscoMessage.setRead(1l);//已读
return coscoMessageMapper.updateCoscoMessage(coscoMessage);
}

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

@ -8,7 +8,6 @@ import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -26,6 +25,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
/**
* 中远海运_供应商_基本信息Service业务层处理
@ -58,17 +59,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
private ICoscoSupplierBankService coscoSupplierBankService;
@Autowired
private CoscoSupplierSurveyMapper coscoSupplierSurveyMapper;
@Autowired
private ICoscoSupplierSurveyService coscoSupplierSurveyService;
@Autowired
private CoscoSupplierSurveyQuestionReplyMapper coscoSupplierSurveyQuestionReplyMapper;
@Autowired
private ICoscoSupplierSurveyQuestionReplyService coscoSupplierSurveyQuestionReplyService;
@ -88,15 +83,6 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
@Autowired
private CoscoSupplierChangeBaseMapper coscoSupplierChangeBaseMapper;
@Autowired
private CoscoSupplierChangeQualificationsMapper coscoSupplierChangeQualificationsMapper;
@Autowired
private CoscoSupplierChangeInvoiceMapper coscoSupplierChangeInvoiceMapper;
@Autowired
private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper;
//变更
@Autowired
private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper;
@ -111,6 +97,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
return coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase);
}
@Override
public IPage<CoscoSupplierBase> getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) {
// 创建分页对象（当前页，每页大小）
IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
return coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase);
}
@Override
public IPage<CoscoAccessSupplierCategory> getZrCategoryPage(CoscoAccessSupplierCategory coscoAccessSupplierCategory) {
// 创建分页对象（当前页，每页大小）
@ -118,6 +111,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
return coscoAccessSupplierCategoryMapper.selectPageList(page, coscoAccessSupplierCategory);
}
@Override
public List<CoscoSupplierBase> getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase) {
return coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase);
}
/**
* 查询中远海运_供应商_基本信息
*
@ -153,6 +151,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
return vo;
}
@Override
public CoscoSupplierBase selectSocialCreditCodeById(String id) {
return coscoSupplierBaseMapper.selectCoscoSupplierBaseById(id);
}
/**
* 查询中远海运_供应商_基本信息列表
*
@ -175,8 +178,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
String supplierId = CoscoIdUtil.getId();//企业id
Date date = new Date();
//基本信息新增
CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase();
if(coscoSupplierBase != null){
if (!ObjectUtils.isEmpty(vo.getCoscoSupplierBase())) {
CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase();
coscoSupplierBase.setId(supplierId);
coscoSupplierBase.setCreateBy("1");
coscoSupplierBase.setCreateTime(date);
@ -194,8 +197,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
}
}
//发票信息
CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice();
if(coscoSupplierInvoice != null){
if (!ObjectUtils.isEmpty(vo.getCoscoSupplierInvoice())) {
CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice();
coscoSupplierInvoice.setSupplierId(supplierId);
coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice);
}
@ -206,12 +209,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank);
}
}
//填写人信息
CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey();
if(coscoSupplierSurvey != null){
if (!ObjectUtils.isEmpty(vo.getCoscoSupplierSurvey())) {
//填写人信息
CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey();
coscoSupplierSurvey.setSupplierId(supplierId);
coscoSupplierSurveyService.insertCoscoSupplierSurvey(coscoSupplierSurvey);
}
//问题回复
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) {
for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){
@ -241,7 +245,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
String appid = vo.getId();//任务主体id
CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid);
if(coscoSupplierChangeApply == null){
if (!ObjectUtils.isEmpty(coscoSupplierChangeApply)) {
throw new IllegalArgumentException("任务信息不能为空");
}
//先验证一下主任务表数据状态
@ -249,13 +253,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){
throw new IllegalArgumentException("任务已处理完成");
}
Date date = CoscoDateUtils.getNowDate();
//修改主体审批状态，封装实体
CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply();
//审批通过
if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){
Date date = CoscoDateUtils.getNowDate();
//新基本信息
CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid);
@ -276,8 +280,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
coscoSupplierChangeApply1.setId(coscoSupplierChangeApply.getId());
coscoSupplierChangeApply1.setApproveStatus(vo.getApproveStatus());
coscoSupplierChangeApply1.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierChangeApply1.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierChangeApply1.setUpdateTime(date);
coscoSupplierChangeApply1.setLastUpdateTime(date);
coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(coscoSupplierChangeApply1);
@ -401,18 +405,16 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService {
//变更证明附件
if(vo.getCoscoSupplierSurveyAttachments() != null){
if(vo.getCoscoSupplierSurveyAttachments().size() > 0){
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId());
coscoSupplierSurveyAttachments.setCreateBy("1");
coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setUpdateBy("1");
coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
}
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) {
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId());
coscoSupplierSurveyAttachments.setCreateBy("1");
coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setUpdateBy("1");
coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
}
}
//**************调用审批接口**********************

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupp
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
/**
* 供应商退出_供应商退出任务Service业务层处理
@ -74,8 +75,15 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
* @return 供应商退出_供应商退出任务
*/
@Override
public CoscoSupplierexit selectCoscoSupplierexitById(String id) {
return coscoSupplierexitMapper.selectCoscoSupplierexitById(id);
public CoscoSupplierexitVo selectCoscoSupplierexitById(String id) {
CoscoSupplierexitVo vo = new CoscoSupplierexitVo();
CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(id);
CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory();
category.setSupplierexitId(id);
List<CoscoSupplierexitSupplierCategory> categoryList = coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(category);
vo.setCoscoSupplierexit(coscoSupplierexit);
vo.setCoscoSupplierexitSupplierCategoryList(categoryList);
return vo;
}
/**
@ -143,7 +151,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
//先验证一下主任务表数据状态
CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId());
if(coscoSupplierexit == null){
if (!ObjectUtils.isEmpty(coscoSupplierexit)) {
throw new IllegalArgumentException("任务信息不能为空");
}
if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) ||
@ -198,7 +206,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId());
coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR);
coscoSupplierBase.setUpdateBy("1");
coscoSupplierBase.setUpdateTime(date);
coscoSupplierBase.setLastUpdateTime(date);
coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase);

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java
View File

@ -52,6 +52,7 @@ public class SupplierSyncTask {
@Transactional
public void reportCurrentTimeYyzz(){
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
coscoSupplierBase.setSupplierType(CoscoType.SUPPLIER_TYPE_DVS);
List<CoscoSupplierBase> suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase);

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

@ -40,6 +40,10 @@ public class SupplierPageVo {
/** 最新评价时间 */
private Date evaluationTime;
/** 最新评价时间 */
private String supplierType;
/**
* 黑名单部门list
*/