From f3d9897883aa90f79e98a4a1ae47fadcfb2e6cdf Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Mon, 14 Jul 2025 16:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{common => base/constant}/CoscoType.java | 2 +- .../constant}/MessageType.java | 2 +- .../controller/SynchronousController.java | 7 +- .../zyhy/ebtp/supplier/common/ChangeText.java | 14 --- .../ebtp/supplier/common/CoscoIdUtil.java | 13 -- .../common/CustomPaginationInterceptor.java | 40 ------- .../common/ListToStringConverter.java | 1 - .../supplier/common/ServiceException.java | 74 ------------ .../supplier/common/aop/MessageLogAspect.java | 14 +-- .../impl/AnnualScheduledTasksServiceImpl.java | 3 +- .../impl/CoscoBlacklistServiceImpl.java | 3 +- .../impl/CoscoEvaluateTaskServiceImpl.java | 2 +- .../impl/ScheduledTasksServiceImpl.java | 2 +- .../CoscoAccessSupplierController.java | 2 +- .../CoscoAccessWorkCategoryController.java | 3 +- .../controller/CoscoAccessWorkController.java | 4 +- .../controller/CoscoMessageController.java | 2 +- .../CoscoSupplierBaseController.java | 4 +- .../CoscoAccessItemAttachmentsMapper.java | 14 ++- .../CoscoAccessSupplierCategoryMapper.java | 2 +- .../entity/CoscoAccessWorkCategoryVo.java | 15 --- .../entity/CoscoSupplierChangeApplyVo.java | 28 ----- .../ICoscoAccessItemAttachmentsService.java | 11 +- .../ICoscoAccessSupplierCategoryService.java | 9 ++ .../ICoscoAccessWorkCategoryService.java | 6 +- .../service/ICoscoAccessWorkService.java | 6 +- .../service/ICoscoSupplierBaseService.java | 1 + .../service/ICoscoSupplierexitService.java | 6 +- ...CoscoAccessItemAttachmentsServiceImpl.java | 26 +++- .../impl/CoscoAccessItemServiceImpl.java | 8 +- ...oscoAccessSupplierCategoryServiceImpl.java | 9 +- .../impl/CoscoAccessSupplierServiceImpl.java | 4 +- .../impl/CoscoAccessUserItemServiceImpl.java | 12 +- .../impl/CoscoAccessUserServiceImpl.java | 12 +- ...CoscoAccessWorkAttachmentsServiceImpl.java | 8 +- .../CoscoAccessWorkCategoryServiceImpl.java | 41 +++---- .../impl/CoscoAccessWorkServiceImpl.java | 113 +++++++++--------- .../service/impl/CoscoMessageServiceImpl.java | 6 +- .../impl/CoscoSupplierBankServiceImpl.java | 16 ++- .../impl/CoscoSupplierBaseServiceImpl.java | 24 ++-- .../impl/CoscoSupplierInvoiceServiceImpl.java | 16 ++- ...oscoSupplierQualificationsServiceImpl.java | 16 ++- ...oSupplierSurveyAttachmentsServiceImpl.java | 16 ++- ...upplierSurveyQuestionReplyServiceImpl.java | 12 +- .../impl/CoscoSupplierSurveyServiceImpl.java | 12 +- .../impl/CoscoSupplierexitServiceImpl.java | 8 +- .../coscosupplier/task/SupplierSyncTask.java | 2 +- .../{entity => vo}/AdmissionDetailsVo.java | 2 +- .../{entity => vo}/CoscoAccessItemVo.java | 2 +- .../{entity => vo}/CoscoAccessUserItemVo.java | 3 +- .../{entity => vo}/CoscoAccessWorkVo.java | 3 +- .../CoscoAccessItemAttachmentsMapper.xml | 31 ++++- .../CoscoAccessSupplierCategoryMapper.xml | 2 +- 53 files changed, 309 insertions(+), 385 deletions(-) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/{common => base/constant}/CoscoType.java (97%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/{common => base/constant}/MessageType.java (98%) delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ChangeText.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoIdUtil.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CustomPaginationInterceptor.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/{entity => vo}/AdmissionDetailsVo.java (92%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/{entity => vo}/CoscoAccessItemVo.java (74%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/{entity => vo}/CoscoAccessUserItemVo.java (75%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/{entity => vo}/CoscoAccessWorkVo.java (90%) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java similarity index 97% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java index d67c514..60d48ff 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java @@ -1,4 +1,4 @@ -package com.chinaunicom.zyhy.ebtp.supplier.common; +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; public class CoscoType { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java similarity index 98% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java index df2194f..3db94e9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java @@ -1,4 +1,4 @@ -package com.chinaunicom.zyhy.ebtp.supplier.common; +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; public class MessageType { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java index 5f43244..c67b28b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java @@ -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)); } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ChangeText.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ChangeText.java deleted file mode 100644 index 05824e9..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ChangeText.java +++ /dev/null @@ -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 = "银行账户变更"; - - - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoIdUtil.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoIdUtil.java deleted file mode 100644 index c2457c0..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoIdUtil.java +++ /dev/null @@ -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(); - } - - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CustomPaginationInterceptor.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CustomPaginationInterceptor.java deleted file mode 100644 index 215a2d9..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CustomPaginationInterceptor.java +++ /dev/null @@ -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); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ListToStringConverter.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ListToStringConverter.java index ae74e32..71f41f9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ListToStringConverter.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ListToStringConverter.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java deleted file mode 100644 index 948932c..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java index 8199aed..f871af5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java index 33e693c..e068361 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index 8eb3e12..eed410e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 330691b..c7e7e03 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -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.*; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 564ef8c..81f38cd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java index f3a4956..aa246bb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java index a6a1b84..ef7b98d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java @@ -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 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)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java index c4c8a4a..536a207 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java @@ -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 startApprove(@ApiParam(value = "主键id", required = true) String id){ + public BaseResponse startApprove(@ApiParam(value = "主键id", required = true) String id){ return BaseResponse.success(coscoAccessWorkService.startApprove(id)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java index 6479270..51ecb9c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java index 900ef9a..a9a0210 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessItemAttachmentsMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessItemAttachmentsMapper.java index 269c48d..4d919d5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessItemAttachmentsMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessItemAttachmentsMapper.java @@ -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 coscoAccessItemAttachmentsList); + + /** * 修改供应商准入_准入工作评审项附件 * @@ -43,12 +52,15 @@ public interface CoscoAccessItemAttachmentsMapper { */ public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments); + public int batchUpdateCoscoAccessItemAttachments(List coscoAccessItemAttachmentsList); + + /** * 通过评审项关联评审人表id准入工作评审项附件 * * @return 结果 */ - public int deleteCoscoAccessItemAttachmentsByAccessUserItemId(String accessUserItemId); + public int deleteCoscoAccessItemAttachmentsByAccessUserItemIds(@Param("accessUserItemIds")List accessUserItemIds); /** * 批量删除供应商准入_准入工作评审项附件 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java index a17c683..5a883fd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierCategoryMapper.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java deleted file mode 100644 index 3a86990..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkCategoryVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; - -import lombok.Data; - -@Data -public class CoscoAccessWorkCategoryVo { - - //准入申请主表 - private CoscoAccessWork coscoAccessWork; - - - - - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java deleted file mode 100644 index 5f655b6..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApplyVo.java +++ /dev/null @@ -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 coscoSupplierChangeQualificationsList; - - //开票信息 - private CoscoSupplierChangeInvoice coscoSupplierChangeInvoice; - - //银行账户 - private List coscoSupplierChangeBankList; - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessItemAttachmentsService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessItemAttachmentsService.java index bcd20fb..f339d32 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessItemAttachmentsService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessItemAttachmentsService.java @@ -35,6 +35,11 @@ public interface ICoscoAccessItemAttachmentsService { */ public int insertCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments); + /** + * 批量新增 + */ + public int batchCoscoAccessItemAttachments(List coscoAccessItemAttachmentsList); + /** * 修改供应商准入_准入工作评审项附件 * @@ -43,6 +48,10 @@ public interface ICoscoAccessItemAttachmentsService { */ public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments); + public int batchUpdateCoscoAccessItemAttachments(List coscoAccessItemAttachmentsList); + + + /** * 批量删除供应商准入_准入工作评审项附件 * @@ -55,5 +64,5 @@ public interface ICoscoAccessItemAttachmentsService { * 删除供应商准入_准入工作评审项附件信息 * */ - public int deleteCoscoAccessItemAttachmentsByAccessUserItemId(String accessUserItemId); + public int deleteCoscoAccessItemAttachmentsByAccessUserItemIds(List accessUserItemIds); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java index 14826be..57f8ea2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierCategoryService.java @@ -38,6 +38,12 @@ public interface ICoscoAccessSupplierCategoryService { */ public int insertCoscoAccessSupplierCategory(CoscoAccessSupplierCategory coscoAccessSupplierCategory); + /** + * 批量新增 + * @return + */ + public int batchCoscoAccessSupplierCategory(List coscoAccessSupplierCategoryList); + /** * 修改供应商准入_供应商已准入品类 * @@ -64,4 +70,7 @@ public interface ICoscoAccessSupplierCategoryService { */ public CoscoSupplierAccessWorkVo sporadicHandling(CoscoAccessWork coscoAccessWorkData, List supplierList, List categoryIdList); + + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java index 1d8ddc6..6da5c36 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkCategoryService.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java index cbf1102..82a3415 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java @@ -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); /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java index bb69f0f..f1d5548 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java index bca6014..67aecbd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java @@ -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); /** * 批量删除供应商退出_供应商退出任务 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java index f2c4e3f..7d2fda2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemAttachmentsServiceImpl.java @@ -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 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 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 accessUserItemIds) { + return coscoAccessItemAttachmentsMapper.deleteCoscoAccessItemAttachmentsByAccessUserItemIds(accessUserItemIds); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java index 56313a2..1b706f9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessItemServiceImpl.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java index ddf5a0d..ce3f29d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierCategoryServiceImpl.java @@ -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 coscoAccessSupplierCategoryList) { + return coscoAccessSupplierCategoryMapper.batchCoscoAccessSupplierCategory(coscoAccessSupplierCategoryList); + } + /** * 修改供应商准入_供应商已准入品类 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java index bff6aba..ee8e692 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java @@ -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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java index d5a7ff5..51044c3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserItemServiceImpl.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java index b2f1014..da3c220 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessUserServiceImpl.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java index e25537d..d8a9662 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkAttachmentsServiceImpl.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 2edfebb..8a84a5e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -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 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); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index 674eaf7..9f922a1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -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 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 batchList = new ArrayList<>(); + List deleteList = new ArrayList<>(); + List 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(); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java index e5fd69f..388e419 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java @@ -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); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java index 1480df6..1c2e81d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBankServiceImpl.java @@ -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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 354c7a0..918f94f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -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 coscoSupplierQualificationsList = new ArrayList<>(); @@ -219,7 +217,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl insert into cosco_access_item_attachments - ( id, access_work_id, access_user_item_id, file_name, file_type, file_size, file_path, file_url, del_flag, create_by, create_time, update_by, update_time, last_update_time) + ( id, access_work_id, access_user_item_id, file_name, file_type, file_size, file_path, file_url, create_by, create_time, update_by, update_time, last_update_time) values - ( #{item.id}, #{item.accessWorkId}, #{item.accessUserItemId}, #{item.fileName}, #{item.fileType}, #{item.fileSize}, #{item.filePath}, #{item.fileUrl}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) + ( #{item.id}, #{item.accessWorkId}, #{item.accessUserItemId}, #{item.fileName}, #{item.fileType}, #{item.fileSize}, #{item.filePath}, #{item.fileUrl}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) @@ -151,9 +151,32 @@ where id = #{id} - + + + + update cosco_access_item_attachments + + access_work_id = #{item.accessWorkId}, + access_user_item_id = #{item.accessUserItemId}, + file_name = #{item.fileName}, + file_type = #{item.fileType}, + file_size = #{item.fileSize}, + file_path = #{item.filePath}, + file_url = #{item.fileUrl}, + update_by = #{item.updateBy}, + update_time = #{item.updateTime}, + last_update_time = #{item.lastUpdateTime}, + + where id = #{item.id} + + + + update cosco_access_item_attachments set del_flag = 'deleted' - where access_user_item_id = #{accessUserItemId} + where access_user_item_id in + + #{id} + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml index fbe053c..394b9be 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml @@ -39,7 +39,7 @@ left join cosco_category ca on c.category_id = ca.id and ca.del_flag = 'normal' - SELECT caw.update_time as updateTime, cas.dept_id as deptId,