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-07-14 16:56:02 +08:00
parent 2a5bab6a89
commit f3d9897883
53 changed files with 309 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java
View File

@ -1,4 +1,4 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public class CoscoType {

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java
View File

@ -1,4 +1,4 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public class MessageType {

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

@ -2,7 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary;
@ -11,13 +11,10 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLi
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupplierCategoryVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
@ -140,7 +137,7 @@ public class SynchronousController {
}
coscoSupplierexit.setApproveStatus(vo.getApproveStatus());
return BaseResponse.success(coscoSupplierexitService.updateCoscoSupplierexit(coscoSupplierexit));
return BaseResponse.success(coscoSupplierexitService.supplierCategoryExitApprove(coscoSupplierexit));
}
/**

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ChangeText.java
View File

@ -1,14 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
public class ChangeText {
public static final String JBXX = "基本信息变更";
public static final String ZZXX = "资质信息变更";
public static final String KPXX = "开票信息变更";
public static final String YHZG = "银行账户变更";
}

13
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoIdUtil.java
View File

@ -1,13 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
import cn.hutool.core.util.IdUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
public class CoscoIdUtil {
public static String getId(){
return PropertyUtils.getSnowflakeId();
}
}

40
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CustomPaginationInterceptor.java
View File

@ -1,40 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
import java.lang.reflect.Field;
import java.sql.SQLException;
public class CustomPaginationInterceptor extends PaginationInnerInterceptor {
@Override
public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
System.out.println("Current SQL ID------------------------------------: " + ms.getId());
if (ms.getId().endsWith("_COUNT")) {
String originalSql = boundSql.getSql();
// 关键修改：增强正则以匹配多行和子查询中的 ORDER BY
String newSql = removeOrderBy(originalSql);
resetBoundSql(boundSql, newSql);
}
super.beforeQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql);
}
private String removeOrderBy(String sql) {
// 改进后的正则：跨行匹配，并处理子查询中的 ORDER BY
return sql.replaceAll("(?is)order\\s+by\\s+[^\\)]+", "");
}
private void resetBoundSql(BoundSql boundSql, String newSql) {
try {
Field field = BoundSql.class.getDeclaredField("sql");
field.setAccessible(true);
field.set(boundSql, newSql);
} catch (Exception e) {
throw new RuntimeException("Failed to modify BoundSql", e);
}
}
}

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

@ -4,7 +4,6 @@ import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.alibaba.excel.metadata.data.CellData;
import java.util.List;
import java.util.stream.Collectors;

74
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java
View File

@ -1,74 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.common;
/**
* 业务异常
*
* @author ruoyi
*/
public final class ServiceException extends RuntimeException
{
private static final long serialVersionUID = 1L;
/**
* 错误码
*/
private Integer code;
/**
* 错误提示
*/
private String message;
/**
* 错误明细，内部调试错误
*
* 和 {@link CommonResult#getDetailMessage()} 一致的设计
*/
private String detailMessage;
/**
* 空构造方法，避免反序列化问题
*/
public ServiceException()
{
}
public ServiceException(String message)
{
this.message = message;
}
public ServiceException(String message, Integer code)
{
this.message = message;
this.code = code;
}
public String getDetailMessage()
{
return detailMessage;
}
@Override
public String getMessage()
{
return message;
}
public Integer getCode()
{
return code;
}
public ServiceException setMessage(String message)
{
this.message = message;
return this;
}
public ServiceException setDetailMessage(String detailMessage)
{
this.detailMessage = detailMessage;
return this;
}
}

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java
View File

@ -1,17 +1,15 @@
package com.chinaunicom.zyhy.ebtp.supplier.common.aop;
import com.alibaba.nacos.common.utils.StringUtils;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
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.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.ApproveVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
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.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
@ -22,14 +20,10 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.stereotype.Component;
import java.util.*;
@ -381,7 +375,7 @@ public class MessageLogAspect {
public CoscoMessage coscoMessageData(String receiverId, String cont, String messageType) {
Date time = CoscoDateUtils.getNowDate();
CoscoMessage coscoMessage = new CoscoMessage();
coscoMessage.setId(CoscoIdUtil.getId());
coscoMessage.setId(PropertyUtils.getSnowflakeId());
coscoMessage.setReceiverId(receiverId);
coscoMessage.setContent(cont);
coscoMessage.setType(messageType);

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

@ -1,8 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper;

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

@ -7,9 +7,8 @@ import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
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.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist;

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

@ -10,7 +10,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
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.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;

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

@ -5,7 +5,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
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.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java
View File

@ -4,7 +4,7 @@ import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
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.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService;
import io.swagger.annotations.ApiOperation;

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java
View File

@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
@ -73,7 +74,7 @@ public class CoscoAccessWorkCategoryController extends BaseController {
*/
@ApiOperation("查询数据")
@GetMapping("/startApproveInfo/{id}")
public BaseResponse<CoscoAccessWorkCategoryVo> startApproveInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){
public BaseResponse startApproveInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){
return BaseResponse.success(coscoAccessWorkCategoryService.startApproveInfo(id));
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java
View File

@ -10,6 +10,8 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
@ -134,7 +136,7 @@ public class CoscoAccessWorkController extends BaseController {
*/
@ApiOperation("修改数据")
@GetMapping("/startApprove")
public BaseResponse<Boolean> startApprove(@ApiParam(value = "主键id", required = true) String id){
public BaseResponse startApprove(@ApiParam(value = "主键id", required = true) String id){
return BaseResponse.success(coscoAccessWorkService.startApprove(id));
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
View File

@ -5,7 +5,7 @@ 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.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService;
import io.swagger.annotations.ApiOperation;

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

@ -8,8 +8,8 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService;

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessItemAttachmentsMapper.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItemAttachments;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -35,6 +36,14 @@ public interface CoscoAccessItemAttachmentsMapper {
*/
public int insertCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments);
/**
* 批量新增
* @param coscoAccessItemAttachmentsList
* @return
*/
public int batchCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList);
/**
* 修改供应商准入_准入工作评审项附件
*
@ -43,12 +52,15 @@ public interface CoscoAccessItemAttachmentsMapper {
*/
public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments);
public int batchUpdateCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList);
/**
* 通过评审项关联评审人表id准入工作评审项附件
*
* @return 结果
*/
public int deleteCoscoAccessItemAttachmentsByAccessUserItemId(String accessUserItemId);
public int deleteCoscoAccessItemAttachmentsByAccessUserItemIds(@Param("accessUserItemIds")List<String> accessUserItemIds);
/**
* 批量删除供应商准入_准入工作评审项附件

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java
View File

@ -1,7 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory;
import org.springframework.data.repository.query.Param;

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java
View File

@ -1,15 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import lombok.Data;
@Data
public class CoscoAccessWorkCategoryVo {
//准入申请主表
private CoscoAccessWork coscoAccessWork;
}

28
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java
View File

@ -1,28 +0,0 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class CoscoSupplierChangeApplyVo implements Serializable {
//供应商id
private String supplierId;
//变更供应商信息
private CoscoSupplierChangeBase coscoSupplierChangeBase;
//资质信息
private List<CoscoSupplierChangeQualifications> coscoSupplierChangeQualificationsList;
//开票信息
private CoscoSupplierChangeInvoice coscoSupplierChangeInvoice;
//银行账户
private List<CoscoSupplierChangeBank> coscoSupplierChangeBankList;
}

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessItemAttachmentsService.java
View File

@ -35,6 +35,11 @@ public interface ICoscoAccessItemAttachmentsService {
*/
public int insertCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments);
/**
* 批量新增
*/
public int batchCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList);
/**
* 修改供应商准入_准入工作评审项附件
*
@ -43,6 +48,10 @@ public interface ICoscoAccessItemAttachmentsService {
*/
public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments);
public int batchUpdateCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList);
/**
* 批量删除供应商准入_准入工作评审项附件
*
@ -55,5 +64,5 @@ public interface ICoscoAccessItemAttachmentsService {
* 删除供应商准入_准入工作评审项附件信息
*
*/
public int deleteCoscoAccessItemAttachmentsByAccessUserItemId(String accessUserItemId);
public int deleteCoscoAccessItemAttachmentsByAccessUserItemIds(List<String> accessUserItemIds);
}

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java
View File

@ -38,6 +38,12 @@ public interface ICoscoAccessSupplierCategoryService {
*/
public int insertCoscoAccessSupplierCategory(CoscoAccessSupplierCategory coscoAccessSupplierCategory);
/**
* 批量新增
* @return
*/
public int batchCoscoAccessSupplierCategory(List<CoscoAccessSupplierCategory> coscoAccessSupplierCategoryList);
/**
* 修改供应商准入_供应商已准入品类
*
@ -64,4 +70,7 @@ public interface ICoscoAccessSupplierCategoryService {
*/
public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData, List<CoscoAccessSupplier> supplierList, List<String> categoryIdList);
}

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java
View File

@ -1,10 +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.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkCategoryVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
/**
@ -24,7 +22,7 @@ public interface ICoscoAccessWorkCategoryService {
public CoscoAccessWorkCategoryVo startApproveInfo(String id);
public CoscoAccessWork startApproveInfo(String id);
public Integer startApprove(String id);

6
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java
View File

@ -2,9 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import java.util.List;
@ -90,7 +90,7 @@ public interface ICoscoAccessWorkService {
* 发起审批
* @return
*/
public Boolean startApprove(String id);
public int startApprove(String id);
/**

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

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
import java.util.List;

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

@ -57,12 +57,10 @@ public interface ICoscoSupplierexitService {
public Integer insertCoscoSupplierexit(CoscoSupplierexitVo vo);
/**
* 修改供应商退出_供应商退出任务
* 供应商品类退出审批回调接口
*
* @param coscoSupplierexit 供应商退出_供应商退出任务
* @return 结果
*/
public CoscoSupplierExitSupplierCategoryVo updateCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit);
public CoscoSupplierExitSupplierCategoryVo supplierCategoryExitApprove(CoscoSupplierexit coscoSupplierexit);
/**
* 批量删除供应商退出_供应商退出任务

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessItemAttachmentsMapper;
@ -52,16 +54,23 @@ public class CoscoAccessItemAttachmentsServiceImpl implements ICoscoAccessItemAt
*/
@Override
public int insertCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessItemAttachments.setId(PropertyUtils.getSnowflakeId());
coscoAccessItemAttachments.setCreateBy("1");
coscoAccessItemAttachments.setCreateBy(userId);
coscoAccessItemAttachments.setCreateTime(date);
coscoAccessItemAttachments.setUpdateBy("1");
coscoAccessItemAttachments.setUpdateBy(userId);
coscoAccessItemAttachments.setUpdateTime(date);
coscoAccessItemAttachments.setLastUpdateTime(date);
return coscoAccessItemAttachmentsMapper.insertCoscoAccessItemAttachments(coscoAccessItemAttachments);
}
@Override
public int batchCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList) {
return coscoAccessItemAttachmentsMapper.batchCoscoAccessItemAttachments(coscoAccessItemAttachmentsList);
}
/**
* 修改供应商准入_准入工作评审项附件
*
@ -70,13 +79,20 @@ public class CoscoAccessItemAttachmentsServiceImpl implements ICoscoAccessItemAt
*/
@Override
public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessItemAttachments.setUpdateBy("1");
coscoAccessItemAttachments.setUpdateBy(userId);
coscoAccessItemAttachments.setUpdateTime(date);
coscoAccessItemAttachments.setLastUpdateTime(date);
return coscoAccessItemAttachmentsMapper.updateCoscoAccessItemAttachments(coscoAccessItemAttachments);
}
@Override
public int batchUpdateCoscoAccessItemAttachments(List<CoscoAccessItemAttachments> coscoAccessItemAttachmentsList) {
return coscoAccessItemAttachmentsMapper.batchUpdateCoscoAccessItemAttachments(coscoAccessItemAttachmentsList);
}
/**
* 批量删除供应商准入_准入工作评审项附件
*
@ -94,7 +110,7 @@ public class CoscoAccessItemAttachmentsServiceImpl implements ICoscoAccessItemAt
* @return 结果
*/
@Override
public int deleteCoscoAccessItemAttachmentsByAccessUserItemId(String accessUserItemId) {
return coscoAccessItemAttachmentsMapper.deleteCoscoAccessItemAttachmentsByAccessUserItemId(accessUserItemId);
public int deleteCoscoAccessItemAttachmentsByAccessUserItemIds(List<String> accessUserItemIds) {
return coscoAccessItemAttachmentsMapper.deleteCoscoAccessItemAttachmentsByAccessUserItemIds(accessUserItemIds);
}
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessItemMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
@ -59,11 +61,13 @@ public class CoscoAccessItemServiceImpl implements ICoscoAccessItemService {
*/
@Override
public int insertCoscoAccessItem(CoscoAccessItem coscoAccessItem) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessItem.setId(coscoAccessItem.getId());
coscoAccessItem.setCreateBy("1");
coscoAccessItem.setCreateBy(userId);
coscoAccessItem.setCreateTime(date);
coscoAccessItem.setUpdateBy("1");
coscoAccessItem.setUpdateBy(userId);
coscoAccessItem.setUpdateTime(date);
coscoAccessItem.setLastUpdateTime(date);
return coscoAccessItemMapper.insertCoscoAccessItem(coscoAccessItem);

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java
View File

@ -2,8 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
@ -74,6 +74,11 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl
return coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory);
}
@Override
public int batchCoscoAccessSupplierCategory(List<CoscoAccessSupplierCategory> coscoAccessSupplierCategoryList) {
return coscoAccessSupplierCategoryMapper.batchCoscoAccessSupplierCategory(coscoAccessSupplierCategoryList);
}
/**
* 修改供应商准入_供应商已准入品类
*

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
View File

@ -2,8 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserItemMapper;

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserItemMapper;
@ -52,11 +54,13 @@ public class CoscoAccessUserItemServiceImpl implements ICoscoAccessUserItemServi
*/
@Override
public int insertCoscoAccessUserItem(CoscoAccessUserItem coscoAccessUserItem) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessUserItem.setId(PropertyUtils.getSnowflakeId());
coscoAccessUserItem.setCreateBy("1");
coscoAccessUserItem.setCreateBy(userId);
coscoAccessUserItem.setCreateTime(date);
coscoAccessUserItem.setUpdateBy("1");
coscoAccessUserItem.setUpdateBy(userId);
coscoAccessUserItem.setUpdateTime(date);
coscoAccessUserItem.setLastUpdateTime(date);
return coscoAccessUserItemMapper.insertCoscoAccessUserItem(coscoAccessUserItem);
@ -70,8 +74,10 @@ public class CoscoAccessUserItemServiceImpl implements ICoscoAccessUserItemServi
*/
@Override
public int updateCoscoAccessUserItem(CoscoAccessUserItem coscoAccessUserItem) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessUserItem.setUpdateBy("1");
coscoAccessUserItem.setUpdateBy(userId);
coscoAccessUserItem.setUpdateTime(date);
coscoAccessUserItem.setLastUpdateTime(date);
return coscoAccessUserItemMapper.updateCoscoAccessUserItem(coscoAccessUserItem);

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java
View File

@ -1,7 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUserMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessUserService;
@ -52,11 +54,13 @@ public class CoscoAccessUserServiceImpl implements ICoscoAccessUserService {
*/
@Override
public int insertCoscoAccessUser(CoscoAccessUser coscoAccessUser) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessUser.setId(CoscoIdUtil.getId());
coscoAccessUser.setCreateBy("1");
coscoAccessUser.setId(PropertyUtils.getSnowflakeId());
coscoAccessUser.setCreateBy(userId);
coscoAccessUser.setCreateTime(date);
coscoAccessUser.setUpdateBy("1");
coscoAccessUser.setUpdateBy(userId);
coscoAccessUser.setUpdateTime(date);
coscoAccessUser.setLastUpdateTime(date);
return coscoAccessUserMapper.insertCoscoAccessUser(coscoAccessUser);

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkAttachmentsMapper;
@ -52,11 +54,13 @@ public class CoscoAccessWorkAttachmentsServiceImpl implements ICoscoAccessWorkAt
*/
@Override
public int insertCoscoAccessWorkAttachments(CoscoAccessWorkAttachments coscoAccessWorkAttachments) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessWorkAttachments.setId(PropertyUtils.getSnowflakeId());
coscoAccessWorkAttachments.setCreateBy("1");
coscoAccessWorkAttachments.setCreateBy(userId);
coscoAccessWorkAttachments.setCreateTime(date);
coscoAccessWorkAttachments.setUpdateBy("1");
coscoAccessWorkAttachments.setUpdateBy(userId);
coscoAccessWorkAttachments.setUpdateTime(date);
coscoAccessWorkAttachments.setLastUpdateTime(date);
return coscoAccessWorkAttachmentsMapper.insertCoscoAccessWorkAttachments(coscoAccessWorkAttachments);

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

@ -6,9 +6,8 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
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.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessCategoryMapper;
@ -16,21 +15,17 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSu
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
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;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 供应商准入_准入申请工作主Service业务层处理
@ -44,10 +39,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
@Autowired
private CoscoAccessWorkMapper coscoAccessWorkMapper;
@Autowired
private ICoscoAccessWorkService coscoAccessWorkService;
@Autowired
private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
@ -87,7 +78,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
public Integer insertCoscoAccessWork(CoscoAccessWorkVo vo) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();//当前登录人
String workId = CoscoIdUtil.getId();//工作主体id
String workId = PropertyUtils.getSnowflakeId();//工作主体id
Date date = CoscoDateUtils.getNowDate();
//任务主体新增/品类准入
CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork();
@ -114,7 +105,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
List<CoscoAccessSupplier> coscoAccessSupplierList = new ArrayList<>();
for(String sId : vo.getSupplierIds()){
CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
coscoAccessSupplier.setId(CoscoIdUtil.getId());
coscoAccessSupplier.setId(PropertyUtils.getSnowflakeId());
coscoAccessSupplier.setAccessWorkId(workId);
coscoAccessSupplier.setSupplierId(sId);
coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId());
@ -157,12 +148,8 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
@Override
public CoscoAccessWorkCategoryVo startApproveInfo(String id) {
CoscoAccessWorkCategoryVo vo = new CoscoAccessWorkCategoryVo();
//准入基础信息
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
vo.setCoscoAccessWork(coscoAccessWork);
return vo;
public CoscoAccessWork startApproveInfo(String id) {
return coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
}
@Override
@ -174,7 +161,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//*************调用三方审批接口***********
return coscoAccessWorkService.updateWork(coscoAccessWork);
return updateWork(coscoAccessWork);
}
@ -197,7 +184,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setId(coscoAccessWorkData.getId());
coscoAccessWork.setApproveStatus(coscoAccessWorkData.getApproveStatus());
coscoAccessWorkService.updateWork(coscoAccessWork);
updateWork(coscoAccessWork);
//处理审批逻辑
approveYandN(coscoAccessWorkData, supplierAndCateGoryList);
@ -247,5 +234,15 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
}
}
/**
* 修改主任务方法
* @param coscoAccessWork
*/
public Integer updateWork(CoscoAccessWork coscoAccessWork) {
Date date = CoscoDateUtils.getNowDate();
coscoAccessWork.setUpdateTime(date);
coscoAccessWork.setLastUpdateTime(date);
return coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork);
}
}

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

@ -6,15 +6,17 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
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.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessUserItemVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -38,61 +40,26 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
@Autowired
private ICoscoCategoryService coscoCategoryService;
@Autowired
private ICoscoAccessSupplierCategoryService coscoAccessSupplierCategoryService;
@Autowired
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
@Autowired
private CoscoAccessWorkMapper coscoAccessWorkMapper;
@Autowired
private CoscoAccessWorkAttachmentsMapper coscoAccessWorkAttachmentsMapper;
@Autowired
private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper;
@Autowired
private CoscoAccessCategoryMapper coscoAccessCategoryMapper;
@Autowired
private CoscoAccessSupplierMapper coscoAccessSupplierMapper;
@Autowired
private CoscoAccessUserMapper coscoAccessUserMapper;
@Autowired
private CoscoAccessItemMapper coscoAccessItemMapper;
@Autowired
private CoscoAccessUserItemMapper coscoAccessUserItemMapper;
@Autowired
private ICoscoAccessUserItemService coscoAccessUserItemService;
@Autowired
private ICoscoAccessItemAttachmentsService coscoAccessItemAttachmentsService;
@Autowired
private ICoscoMessageService coscoMessageService;
@ -224,7 +191,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
public Integer insertCoscoAccessWork(CoscoAccessWorkVo vo) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();//当前登录人id
String workId = CoscoIdUtil.getId();//工作主体id
String workId = PropertyUtils.getSnowflakeId();//工作主体id
Date date = CoscoDateUtils.getNowDate();
//供应商准入_准入申请工作主表新增
CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork();
@ -374,10 +341,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
* @return
*/
private CoscoAccessItem getCoscoAccessItem(CoscoAccessItem coscoAccessItem,Date date){
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoAccessItem.setId(coscoAccessItem.getId());
coscoAccessItem.setCreateBy("1");
coscoAccessItem.setCreateBy(userId);
coscoAccessItem.setCreateTime(date);
coscoAccessItem.setUpdateBy("1");
coscoAccessItem.setUpdateBy(userId);
coscoAccessItem.setUpdateTime(date);
coscoAccessItem.setLastUpdateTime(date);
return coscoAccessItem;
@ -389,10 +358,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
* @return
*/
private CoscoAccessUserItem getCoscoAccessUserItem(CoscoAccessUserItem coscoAccessUserItem,Date date){
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoAccessUserItem.setId(PropertyUtils.getSnowflakeId());
coscoAccessUserItem.setCreateBy("1");
coscoAccessUserItem.setCreateBy(userId);
coscoAccessUserItem.setCreateTime(date);
coscoAccessUserItem.setUpdateBy("1");
coscoAccessUserItem.setUpdateBy(userId);
coscoAccessUserItem.setUpdateTime(date);
coscoAccessUserItem.setLastUpdateTime(date);
return coscoAccessUserItem;
@ -409,7 +380,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
}
coscoAccessUser.setAccessWorkId(workId);
coscoAccessUser.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D);
coscoAccessUser.setId(CoscoIdUtil.getId());
coscoAccessUser.setId(PropertyUtils.getSnowflakeId());
coscoAccessUser.setCreateBy(userId);
coscoAccessUser.setCreateTime(date);
coscoAccessUser.setUpdateBy(userId);
@ -433,7 +404,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
List<CoscoAccessSupplier> coscoAccessSupplierList = new ArrayList<>();
for(String supplierId : vo.getSupplierIds()){
CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier();
coscoAccessSupplier.setId(CoscoIdUtil.getId());
coscoAccessSupplier.setId(PropertyUtils.getSnowflakeId());
coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId());
//如果是零星采购/应急采购准入直接改为已准入，否则线上准入和线下准入为未准入，未准入需要走审批流程
if(CoscoType.ACCESS_TYPE_SCATTERED.equals(coscoAccessWork.getAccessType())){
@ -469,7 +440,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
@Transactional
public int updateCoscoAccessWork(CoscoAccessUserItemVo vo) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
String userId = "USER002";
Date date = CoscoDateUtils.getNowDate();
//修改评审项关联评审人员表
@ -526,28 +497,56 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
/**
* 修改评审项关联评审人员表，并新增修改或者删除附件
* @param vo
* @param v
*/
private void addCoscoAccessUserItemAndUp(CoscoAccessUserItemVo vo) {
//如果附件有值可能是新增，也可能是修改
if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) {
List<CoscoAccessItemAttachments> batchList = new ArrayList<>();
List<String> deleteList = new ArrayList<>();
List<CoscoAccessItemAttachments> updateList = new ArrayList<>();
for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){
//修改评审项关联评审人员表
coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem);
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoAccessUserItem.setUpdateBy(userId);
coscoAccessUserItem.setUpdateTime(date);
coscoAccessUserItem.setLastUpdateTime(date);
coscoAccessUserItemMapper.updateCoscoAccessUserItem(coscoAccessUserItem);
if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) {
//插入附件表
CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments();
coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId());
coscoAccessTtemAttachments.setAccessUserItemId(coscoAccessUserItem.getId());
if(coscoAccessTtemAttachments.getId() != null){
coscoAccessItemAttachmentsService.updateCoscoAccessItemAttachments(coscoAccessTtemAttachments);
coscoAccessTtemAttachments.setUpdateBy(userId);
coscoAccessTtemAttachments.setUpdateTime(date);
coscoAccessTtemAttachments.setLastUpdateTime(date);
updateList.add(coscoAccessTtemAttachments);
}else{
coscoAccessItemAttachmentsService.insertCoscoAccessItemAttachments(coscoAccessTtemAttachments);
coscoAccessTtemAttachments.setId(PropertyUtils.getSnowflakeId());
coscoAccessTtemAttachments.setCreateBy(userId);
coscoAccessTtemAttachments.setCreateTime(date);
coscoAccessTtemAttachments.setUpdateBy(userId);
coscoAccessTtemAttachments.setUpdateTime(date);
coscoAccessTtemAttachments.setLastUpdateTime(date);
batchList.add(coscoAccessTtemAttachments);
}
}else{
coscoAccessItemAttachmentsService.deleteCoscoAccessItemAttachmentsByAccessUserItemId(coscoAccessUserItem.getId());
deleteList.add(coscoAccessUserItem.getId());
}
}
if(!CollectionUtils.isEmpty(batchList)){
coscoAccessItemAttachmentsService.batchCoscoAccessItemAttachments(batchList);
}
if(!CollectionUtils.isEmpty(deleteList)){
coscoAccessItemAttachmentsService.deleteCoscoAccessItemAttachmentsByAccessUserItemIds(deleteList);
}
if(!CollectionUtils.isEmpty(updateList)){
coscoAccessItemAttachmentsService.batchUpdateCoscoAccessItemAttachments(updateList);
}
}
}
@ -600,18 +599,18 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
* @return
*/
@Override
public Boolean startApprove(String id) {
public int startApprove(String id) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
//修改任务主表审批状态--审批中
CoscoAccessWork coscoAccessWork = new CoscoAccessWork();
coscoAccessWork.setId(id);
coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ);
coscoAccessWork.setUpdateBy("1");
updateWork(coscoAccessWork);
coscoAccessWork.setUpdateBy(userId);
//*********************************调用三方接口******************************
return true;
return updateWork(coscoAccessWork);
}
/**
@ -683,7 +682,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
supplierMessageList.add(accessSupplier);
}
//批量新增已准入品类
coscoAccessSupplierCategoryMapper.batchCoscoAccessSupplierCategory(coscoAccessSupplierCategoryInsertList);
coscoAccessSupplierCategoryService.batchCoscoAccessSupplierCategory(coscoAccessSupplierCategoryInsertList);
//批量修改供应商基础信息状态
CoscoSupplierBase batchUpCoscoSupplierBase = new CoscoSupplierBase();

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

@ -2,9 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
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.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.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;
@ -72,7 +72,7 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
*/
@Override
public int insertCoscoMessage(CoscoMessage coscoMessage) {
coscoMessage.setId(CoscoIdUtil.getId());
coscoMessage.setId(PropertyUtils.getSnowflakeId());
coscoMessage.setCreateTime(CoscoDateUtils.getNowDate());
return coscoMessageMapper.insertCoscoMessage(coscoMessage);
}

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java
View File

@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBankMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBankService;
@ -64,11 +66,13 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService {
*/
@Override
public int insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoSupplierBank.setId(CoscoIdUtil.getId());
coscoSupplierBank.setCreateBy("1");
coscoSupplierBank.setId(PropertyUtils.getSnowflakeId());
coscoSupplierBank.setCreateBy(userId);
coscoSupplierBank.setCreateTime(date);
coscoSupplierBank.setUpdateBy("1");
coscoSupplierBank.setUpdateBy(userId);
coscoSupplierBank.setUpdateTime(date);
coscoSupplierBank.setLastUpdateTime(date);
return coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank);
@ -88,7 +92,9 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService {
*/
@Override
public Integer updateCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) {
coscoSupplierBank.setUpdateBy("1");
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoSupplierBank.setUpdateBy(userId);
coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate());
return coscoSupplierBankMapper.updateCoscoSupplierBank(coscoSupplierBank);

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

@ -3,18 +3,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
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.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
@ -22,6 +19,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrary
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.AdmissionDetailsVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -204,7 +202,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
@Override
@Transactional
public Integer insertCoscoSupplierBase(CoscoSupplierVo vo,String userId) {
String supplierId = CoscoIdUtil.getId();//供应商id
String supplierId = PropertyUtils.getSnowflakeId();//供应商id
Date date = new Date();
//资质信息集合
List<CoscoSupplierQualifications> coscoSupplierQualificationsList = new ArrayList<>();
@ -219,7 +217,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierQualifications())) {
for(CoscoSupplierQualifications coscoSupplierQualifications : vo.getCoscoSupplierQualifications()){
coscoSupplierQualifications.setSupplierId(supplierId);
coscoSupplierQualifications.setId(CoscoIdUtil.getId());
coscoSupplierQualifications.setId(PropertyUtils.getSnowflakeId());
coscoSupplierQualifications.setCreateBy(userId);
coscoSupplierQualifications.setCreateTime(date);
coscoSupplierQualifications.setUpdateBy(userId);
@ -234,7 +232,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
if (!ObjectUtils.isEmpty(vo.getCoscoSupplierInvoice())) {
CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice();
coscoSupplierInvoice.setSupplierId(supplierId);
coscoSupplierInvoice.setId(CoscoIdUtil.getId());
coscoSupplierInvoice.setId(PropertyUtils.getSnowflakeId());
coscoSupplierInvoice.setCreateBy(userId);
coscoSupplierInvoice.setCreateTime(date);
coscoSupplierInvoice.setUpdateBy(userId);
@ -246,7 +244,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierBank())) {
for(CoscoSupplierBank coscoSupplierBank : vo.getCoscoSupplierBank()){
coscoSupplierBank.setSupplierId(supplierId);
coscoSupplierBank.setId(CoscoIdUtil.getId());
coscoSupplierBank.setId(PropertyUtils.getSnowflakeId());
coscoSupplierBank.setCreateBy(userId);
coscoSupplierBank.setCreateTime(date);
coscoSupplierBank.setUpdateBy(userId);
@ -261,7 +259,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
//填写人信息
CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey();
coscoSupplierSurvey.setSupplierId(supplierId);
coscoSupplierSurvey.setId(CoscoIdUtil.getId());
coscoSupplierSurvey.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurvey.setCreateBy(userId);
coscoSupplierSurvey.setCreateTime(date);
coscoSupplierSurvey.setUpdateBy(userId);
@ -274,7 +272,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) {
for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){
coscoSupplierSurveyQuestionReply.setSupplierId(supplierId);
coscoSupplierSurveyQuestionReply.setId(CoscoIdUtil.getId());
coscoSupplierSurveyQuestionReply.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurveyQuestionReply.setCreateBy(userId);
coscoSupplierSurveyQuestionReply.setCreateTime(date);
coscoSupplierSurveyQuestionReply.setUpdateBy(userId);
@ -289,7 +287,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) {
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setSupplierId(supplierId);
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurveyAttachments.setCreateBy(userId);
coscoSupplierSurveyAttachments.setCreateTime(date);
coscoSupplierSurveyAttachments.setUpdateBy(userId);
@ -499,7 +497,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
//变更证明附件--只会有一个
if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) {
for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId());
coscoSupplierSurveyAttachments.setCreateBy(userId);
coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate());

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java
View File

@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierInvoiceMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierInvoiceService;
@ -61,11 +63,13 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer
*/
@Override
public Integer insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoSupplierInvoice.setId(CoscoIdUtil.getId());
coscoSupplierInvoice.setCreateBy("1");
coscoSupplierInvoice.setId(PropertyUtils.getSnowflakeId());
coscoSupplierInvoice.setCreateBy(userId);
coscoSupplierInvoice.setCreateTime(date);
coscoSupplierInvoice.setUpdateBy("1");
coscoSupplierInvoice.setUpdateBy(userId);
coscoSupplierInvoice.setUpdateTime(date);
coscoSupplierInvoice.setLastUpdateTime(date);
@ -80,7 +84,9 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer
*/
@Override
public Integer updateCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) {
coscoSupplierInvoice.setUpdateBy("1");
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoSupplierInvoice.setUpdateBy(userId);
coscoSupplierInvoice.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate());
return coscoSupplierInvoiceMapper.updateCoscoSupplierInvoice(coscoSupplierInvoice);

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java
View File

@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierQualificationsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierQualificationsService;
@ -61,11 +63,13 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua
*/
@Override
public Integer insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoSupplierQualifications.setId(CoscoIdUtil.getId());
coscoSupplierQualifications.setCreateBy("1");
coscoSupplierQualifications.setId(PropertyUtils.getSnowflakeId());
coscoSupplierQualifications.setCreateBy(userId);
coscoSupplierQualifications.setCreateTime(date);
coscoSupplierQualifications.setUpdateBy("1");
coscoSupplierQualifications.setUpdateBy(userId);
coscoSupplierQualifications.setUpdateTime(date);
coscoSupplierQualifications.setLastUpdateTime(date);
return coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications);
@ -91,7 +95,9 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua
*/
@Override
public Integer updateCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) {
coscoSupplierQualifications.setUpdateBy("1");
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoSupplierQualifications.setUpdateBy(userId);
coscoSupplierQualifications.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate());
return coscoSupplierQualificationsMapper.updateCoscoSupplierQualifications(coscoSupplierQualifications);

16
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyAttachmentsServiceImpl.java
View File

@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyAttachmentsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyAttachmentsService;
@ -61,11 +63,13 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier
*/
@Override
public int insertCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = new Date();
coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId());
coscoSupplierSurveyAttachments.setCreateBy("1");
coscoSupplierSurveyAttachments.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurveyAttachments.setCreateBy(userId);
coscoSupplierSurveyAttachments.setCreateTime(date);
coscoSupplierSurveyAttachments.setUpdateBy("1");
coscoSupplierSurveyAttachments.setUpdateBy(userId);
coscoSupplierSurveyAttachments.setUpdateTime(date);
coscoSupplierSurveyAttachments.setLastUpdateTime(date);
return coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);
@ -89,7 +93,9 @@ public class CoscoSupplierSurveyAttachmentsServiceImpl implements ICoscoSupplier
*/
@Override
public Integer updateCoscoSupplierSurveyAttachments(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) {
coscoSupplierSurveyAttachments.setUpdateBy("1");
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
coscoSupplierSurveyAttachments.setUpdateBy(userId);
coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate());
coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate());
return coscoSupplierSurveyAttachmentsMapper.updateCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments);

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java
View File

@ -1,7 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyQuestionReplyMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyQuestionReply;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyQuestionReplyService;
@ -52,11 +54,13 @@ public class CoscoSupplierSurveyQuestionReplyServiceImpl implements ICoscoSuppli
*/
@Override
public int insertCoscoSupplierSurveyQuestionReply(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoSupplierSurveyQuestionReply.setId(CoscoIdUtil.getId());
coscoSupplierSurveyQuestionReply.setCreateBy("1");
coscoSupplierSurveyQuestionReply.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurveyQuestionReply.setCreateBy(userId);
coscoSupplierSurveyQuestionReply.setCreateTime(date);
coscoSupplierSurveyQuestionReply.setUpdateBy("1");
coscoSupplierSurveyQuestionReply.setUpdateBy(userId);
coscoSupplierSurveyQuestionReply.setUpdateTime(date);
coscoSupplierSurveyQuestionReply.setLastUpdateTime(date);
return coscoSupplierSurveyQuestionReplyMapper.insertCoscoSupplierSurveyQuestionReply(coscoSupplierSurveyQuestionReply);

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java
View File

@ -1,7 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurvey;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyService;
@ -52,11 +54,13 @@ public class CoscoSupplierSurveyServiceImpl implements ICoscoSupplierSurveyServi
*/
@Override
public int insertCoscoSupplierSurvey(CoscoSupplierSurvey coscoSupplierSurvey) {
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
String userId = currentUser.getUserId();
Date date = CoscoDateUtils.getNowDate();
coscoSupplierSurvey.setId(CoscoIdUtil.getId());
coscoSupplierSurvey.setCreateBy("1");
coscoSupplierSurvey.setId(PropertyUtils.getSnowflakeId());
coscoSupplierSurvey.setCreateBy(userId);
coscoSupplierSurvey.setCreateTime(date);
coscoSupplierSurvey.setUpdateBy("1");
coscoSupplierSurvey.setUpdateBy(userId);
coscoSupplierSurvey.setUpdateTime(date);
coscoSupplierSurvey.setLastUpdateTime(date);
return coscoSupplierSurveyMapper.insertCoscoSupplierSurvey(coscoSupplierSurvey);

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

@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
@ -161,12 +161,12 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
}
/**
* 供应商退出审批回调
* 供应商品类退出审批回调接口
*/
@Override
@Transactional
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSPLTC)
public CoscoSupplierExitSupplierCategoryVo updateCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit) {
public CoscoSupplierExitSupplierCategoryVo supplierCategoryExitApprove(CoscoSupplierexit coscoSupplierexit) {
CoscoSupplierExitSupplierCategoryVo coscoSupplierExitSupplierCategoryVo = new CoscoSupplierExitSupplierCategoryVo();

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

@ -1,7 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.task;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/AdmissionDetailsVo.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/AdmissionDetailsVo.java
View File

@ -1,4 +1,4 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity;
import lombok.Data;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessItemVo.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessItemVo.java
View File

@ -1,4 +1,4 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
import lombok.Data;

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessUserItemVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItem;
import lombok.Data;
import javax.validation.Valid;

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java → src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoAccessWorkVo.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity;
package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import lombok.Data;
import javax.validation.Valid;