From 22a6eb74cbfefedb211d08dfea8f93c3ac886674 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Wed, 25 Jun 2025 11:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=881?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SynchronousController.java | 5 +- .../ebtp/supplier/common/CoscoBaseEntity.java | 4 +- .../ebtp/supplier/common/MessageType.java | 12 + .../supplier/common/aop/MessageLogAspect.java | 148 +++++++++- .../CoscoAccessWorkCategoryController.java | 3 +- .../controller/CoscoAccessWorkController.java | 5 +- .../CoscoSupplierBaseController.java | 7 +- .../CoscoSupplierChangeApplyController.java | 2 +- .../CoscoSupplierexitController.java | 3 +- .../entity/CoscoAccessUserItemVo.java | 6 + .../entity/CoscoAccessWorkVo.java | 4 + .../entity/CoscoSupplierBase.java | 3 + .../coscosupplier/entity/CoscoSupplierVo.java | 5 + .../entity/CoscoSupplierexitVo.java | 4 + .../service/ICoscoAccessSupplierService.java | 9 + .../service/ICoscoAccessWorkService.java | 1 + .../service/ICoscoMessageService.java | 5 + .../service/ICoscoSupplierBaseService.java | 6 +- .../service/ICoscoSupplierexitService.java | 3 +- ...CoscoAccessItemAttachmentsServiceImpl.java | 15 +- .../impl/CoscoAccessItemServiceImpl.java | 10 +- ...oscoAccessSupplierCategoryServiceImpl.java | 9 +- .../impl/CoscoAccessSupplierServiceImpl.java | 42 +++ .../impl/CoscoAccessUserItemServiceImpl.java | 15 +- .../impl/CoscoAccessUserServiceImpl.java | 11 +- ...CoscoAccessWorkAttachmentsServiceImpl.java | 10 +- .../CoscoAccessWorkCategoryServiceImpl.java | 74 ++--- .../impl/CoscoAccessWorkServiceImpl.java | 189 ++++++------ .../service/impl/CoscoMessageServiceImpl.java | 14 + .../impl/CoscoSupplierBankServiceImpl.java | 7 +- .../impl/CoscoSupplierBaseServiceImpl.java | 268 ++++++------------ .../impl/CoscoSupplierInvoiceServiceImpl.java | 8 +- ...oscoSupplierQualificationsServiceImpl.java | 8 +- ...upplierSurveyQuestionReplyServiceImpl.java | 10 +- .../impl/CoscoSupplierSurveyServiceImpl.java | 10 +- .../impl/CoscoSupplierexitServiceImpl.java | 102 ++++--- .../coscosupplier/task/SupplierSyncTask.java | 61 ++-- .../coscosupplier/vo/CoscoSupplierBaseVo.java | 34 +++ .../CoscoSupplierExitSupplierCategoryVo.java | 22 ++ .../coscosupplier/vo/UserItmeMessageVo.java | 17 ++ .../dao/mapper/CoscoAccessSupplierMapper.xml | 21 +- 41 files changed, 764 insertions(+), 428 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java 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 99a9dae..1c5aca5 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 @@ -17,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWork import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; 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.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -92,7 +93,7 @@ public class SynchronousController { * 供应商品类退出审批回调接口 */ @PostMapping("/supplierCategoryTcApprove") - public BaseResponse supplierCategoryTcApprove(@RequestBody CoscoSupplierexit vo) { + public BaseResponse supplierCategoryTcApprove(@RequestBody CoscoSupplierexit vo) { return BaseResponse.success(coscoSupplierexitService.updateCoscoSupplierexit(vo)); } @@ -117,7 +118,7 @@ public class SynchronousController { * 供应商变更审批回调接口 */ @PostMapping("/supplierChangeApprove") - public BaseResponse supplierChangeApprove(@RequestBody CoscoSupplierChangeApply vo) { + public BaseResponse supplierChangeApprove(@RequestBody CoscoSupplierChangeApply vo) { return BaseResponse.success(coscoSupplierBaseService.updateCoscoSupplierBase(vo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java index ba731ce..2f94df9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java @@ -24,9 +24,9 @@ public class CoscoBaseEntity implements Serializable private static final long serialVersionUID = 1L; @ApiModelProperty("当前页") - private @NotNull @Min(0L) Integer pageNo; + private Integer pageNo; @ApiModelProperty("每页显示条数") - private @NotNull @Min(0L) Integer pageSize; + private Integer pageSize; /** 搜索值 */ @JsonIgnore diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java index c252636..818ba5b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java @@ -24,8 +24,20 @@ public class MessageType { //供应商品类准入审批处理完成 public static final String MESSAGETYPE_GYSPLZR = "MESSAGETYPE_GYSPLZR"; + //供应商品类退出审批处理完成 + public static final String MESSAGETYPE_GYSPLTC = "MESSAGETYPE_GYSPLTC"; + + //供应商基础信息变更处理完成 + public static final String MESSAGETYPE_GYSJCXX = "MESSAGETYPE_GYSJCXX"; + //营业执照 + public static final String MESSAGETYPE_GYSYYZZ = "MESSAGETYPE_GYSYYZZ"; + //资质信息 + public static final String MESSAGETYPE_GYSZZXX = "MESSAGETYPE_GYSZZXX"; + + //评审人员消息 + public static final String MESSAGETYPE_PSRY = "MESSAGETYPE_PSRY"; } 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 d9e83fb..734a4a2 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 @@ -13,8 +13,12 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCatego 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; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupplierCategoryVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -42,8 +46,7 @@ public class MessageLogAspect { // 修改点1：切点定义中添加参数绑定 @Pointcut("@annotation(messageLog)") - public void messageLogPointCut(MessageLog messageLog) { - } + public void messageLogPointCut(MessageLog messageLog) {} // 成功执行后切入 @Around("messageLogPointCut(messageLog)") @@ -77,6 +80,21 @@ public class MessageLogAspect { pustMessageBlackEnd(result, messageType); } + if(MessageType.MESSAGETYPE_GYSPLTC.equals(messageType)){//供应商品类退出审批处理 + pustMessageSupplierCategoryTc(result,messageType); + } + if(MessageType.MESSAGETYPE_GYSJCXX.equals(messageType)){//供应商基础信息审批处理 + pustMessageSupplierCategoryJcxx(result,messageType); + } + if(MessageType.MESSAGETYPE_GYSYYZZ.equals(messageType)){//供应商营业执照处理 + pustMessageSupplierCategoryYyzz(result,messageType); + } + if(MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)){//供应商资质信息处理 + pustMessageSupplierCategoryZzxx(result,messageType); + } + if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商资质信息处理 + pustMessageSupplierCategoryPsry(result,messageType); + } } catch (Exception e) { e.printStackTrace(); } @@ -232,10 +250,132 @@ public class MessageLogAspect { } } + /** + * 供应商品类退出审批处里 + */ + public void pustMessageSupplierCategoryTc(Object result,String messageType){ + if (result instanceof CoscoSupplierExitSupplierCategoryVo) { + CoscoSupplierExitSupplierCategoryVo vo = (CoscoSupplierExitSupplierCategoryVo) result; + List coscoMessageList = new ArrayList<>(); + // 使用转换后的对象 + for(CoscoSupplierexitSupplierCategory coscoSupplierexitSupplierCategory : vo.getCoscoSupplierexitSupplierCategoryList()){ + String approveStr = ""; + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + approveStr = "已通过"; + }else{ + approveStr = "已驳回"; + } + String cont = coscoSupplierexitSupplierCategory.getSupplierName()+"，"+ + coscoSupplierexitSupplierCategory.getDeptId()+"部门的"+ + coscoSupplierexitSupplierCategory.getCategoryName()+"品类退出，"+approveStr; + coscoMessageList.add(coscoMessageData(coscoSupplierexitSupplierCategory.getSupplierId(),cont,messageType)); + } + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + + /** + * 供应商基础信息审批处里 + */ + public void pustMessageSupplierCategoryJcxx(Object result,String messageType){ + if (result instanceof CoscoSupplierChangeApply) { + CoscoSupplierChangeApply vo = (CoscoSupplierChangeApply) result; + List coscoMessageList = new ArrayList<>(); + // 使用转换后的对象 + String approveStr = ""; + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + approveStr = "已通过"; + }else{ + approveStr = "已驳回"; + } + String cont = vo.getSupplierName()+"，基础信息变更审批"+approveStr; + coscoMessageList.add(coscoMessageData(vo.getSupplierId(),cont,messageType)); + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + + /** + * 供应商营业执照处理 + */ + public void pustMessageSupplierCategoryYyzz(Object result,String messageType){ + if (result instanceof CoscoSupplierBaseVo) { + CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result; + List coscoMessageList = new ArrayList<>(); + String supplierCont = "您的企业营业执照将于"+vo.getEndTime()+"日到期，请及时更新"; + if(vo.getDaysRemaining() == 0){//已经过期 + supplierCont = "您的企业营业执照已经到期，您的准入单位和准入品类全撤销移除"; + } + + coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType)); + + for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){ + String deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照将于"+vo.getEndTime()+"日到期"; + if(vo.getDaysRemaining() == 0){//已经过期 + deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照已经到期,该供应商准入单位和准入品类全撤销移除"; + } + coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType)); + } + + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + + /** + * 供应商纸质信息处理 + */ + public void pustMessageSupplierCategoryZzxx(Object result,String messageType){ + if (result instanceof CoscoSupplierBaseVo) { + CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result; + List coscoMessageList = new ArrayList<>(); + String supplierCont = "您的企业"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期，请及时更新"; + if(vo.getDaysRemaining() == 0){//已经过期 + supplierCont = "您的企业"+vo.getQualificationsName()+"资质已经到期，请及时更新"; + } + coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType)); + + for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){ + String deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期"; + if(vo.getDaysRemaining() == 0){//已经过期 + deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质已经到期"; + } + coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType)); + } + + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + + + /** + * 评审人员信息处理 + */ + public void pustMessageSupplierCategoryPsry(Object result,String messageType){ + if (result instanceof UserItmeMessageVo) { + UserItmeMessageVo vo = (UserItmeMessageVo) result; + List coscoMessageList = new ArrayList<>(); + + for(CoscoAccessUser coscoAccessUser : vo.getCoscoAccessUserList()){ + String cont = "您有新的供应商需要评审"; + coscoMessageList.add(coscoMessageData(coscoAccessUser.getUserId(),cont,messageType)); + } + + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + /** * 封装实体 - * * @param receiverId * @param cont * @param messageType @@ -261,4 +401,4 @@ public class MessageLogAspect { } -} +} \ No newline at end of file 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 55f27cd..ebb11d9 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 @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; @@ -46,7 +47,7 @@ public class CoscoAccessWorkCategoryController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/add") - public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWorkVo vo){ + public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessWorkVo vo){ return BaseResponse.success(coscoAccessWorkCategoryService.insertCoscoAccessWork(vo)); } 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 27174f4..ff01d15 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; @@ -72,7 +73,7 @@ public class CoscoAccessWorkController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/add") - public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWorkVo vo){ + public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessWorkVo vo){ return BaseResponse.success(coscoAccessWorkService.insertCoscoAccessWork(vo)); } @@ -105,7 +106,7 @@ public class CoscoAccessWorkController extends BaseController { */ @ApiOperation("修改数据") @PostMapping("/update") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessUserItemVo vo){ + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessUserItemVo vo){ return BaseResponse.success(coscoAccessWorkService.updateCoscoAccessWork(vo)); } 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 274d168..9e63414 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; @@ -65,7 +66,7 @@ public class CoscoSupplierBaseController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/add") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierVo vo){ + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierVo vo){ return BaseResponse.success(coscoSupplierBaseService.insertCoscoSupplierBase(vo)); } @@ -76,7 +77,7 @@ public class CoscoSupplierBaseController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/addAgent") - public BaseResponse addAgent(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierVo vo){ + public BaseResponse addAgent(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierVo vo){ CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); coscoSupplierBase.setFillinStatus(CoscoType.FILLIN_STATUS_S);//代录入标识 coscoSupplierBase.setFillinBy("1");//代理人 @@ -160,7 +161,7 @@ public class CoscoSupplierBaseController extends BaseController { * @return */ @PostMapping("/updateSupplierBase") - public BaseResponse updateSupplierBase(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierVo vo){ + public BaseResponse updateSupplierBase(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierVo vo){ return BaseResponse.success(coscoSupplierBaseService.update(vo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java index 62f5d84..de3a6cd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java @@ -41,7 +41,7 @@ public class CoscoSupplierChangeApplyController extends BaseController { /** - * 供应商信息变更申请 + * 供应商信息变更申请------------原来比对逻辑（作废） * @param vo * @return */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java index c30eeac..3de7d08 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; /** @@ -41,7 +42,7 @@ public class CoscoSupplierexitController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/add") - public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexitVo vo){ + public BaseResponse add(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierexitVo vo){ return BaseResponse.success(coscoSupplierexitService.insertCoscoSupplierexit(vo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java index 4f954f6..3d40dc5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java @@ -2,14 +2,20 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import lombok.Data; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; @Data public class CoscoAccessUserItemVo { //准入申请主表Id + @NotNull(message = "准入主体任务id不能为空") + @Valid private String accessWorkId; + @NotNull(message = "评审人员id不能为空") + @Valid //暂时写死额的userId private String userId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java index ff82dd3..d9dc9c6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java @@ -2,12 +2,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import lombok.Data; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; @Data public class CoscoAccessWorkVo { //准入申请主表 + @NotNull(message = "准入主体任务信息不能为空") + @Valid // 关键注解：启用嵌套验证 private CoscoAccessWork coscoAccessWork; //准入申请关联品类id集合 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java index b38b6fb..4c44e9b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java @@ -7,6 +7,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 中远海运_供应商_基本信息对象 cosco_supplier_base * @@ -44,6 +46,7 @@ public class CoscoSupplierBase extends CoscoBaseEntity { private String enterpriseType; /** 企业名称 */ + @NotBlank(message = "企业名称不能为空") @TableField("企业名称") private String name; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java index 4a39025..4d5af7d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierVo.java @@ -2,11 +2,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import lombok.Data; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; @Data public class CoscoSupplierVo { //基本信息 + @NotNull(message = "供应商基本信息不能为空") + @Valid // 关键注解：启用嵌套验证 private CoscoSupplierBase coscoSupplierBase; //资质 private List coscoSupplierQualifications; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java index df149ba..93bb5c8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import lombok.Data; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -9,6 +11,8 @@ import java.util.List; public class CoscoSupplierexitVo { //退出任务主体 + @NotNull(message = "退出任务基本信息不能为空") + @Valid // 关键注解：启用嵌套验证 public CoscoSupplierexit coscoSupplierexit; //供应商id集合 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierService.java index 6cf17ca..73211ea 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessSupplierService.java @@ -1,6 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo; import java.util.List; @@ -58,4 +61,10 @@ public interface ICoscoAccessSupplierService { * @return 结果 */ public int deleteCoscoAccessSupplierByAccessWorkId(String accessWorkId); + + + CoscoSupplierBaseVo sendNotificationYyzz(CoscoSupplierBase supplier, String endTime, Long daysRemaining); + CoscoSupplierBaseVo sendNotificationZzxx(CoscoSupplierBase supplier, CoscoSupplierQualifications qualifications , String endTime, long daysRemaining); + + } 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 562b3fb..b62a1bc 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 @@ -90,5 +90,6 @@ public interface ICoscoAccessWorkService { */ public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo); + public void updateWork(CoscoAccessWork coscoAccessWork); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java index aa2a390..d6ed0b0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java @@ -1,6 +1,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; import java.util.List; @@ -59,4 +61,7 @@ public interface ICoscoMessageService { * @return 结果 */ public int deleteCoscoMessageById(String id); + + UserItmeMessageVo userMessage(List coscoAccessUserls); + } 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 504301c..655b06f 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 @@ -48,7 +48,11 @@ public interface ICoscoSupplierBaseService { * * @return 结果 */ - public Boolean updateCoscoSupplierBase(CoscoSupplierChangeApply vo); + public CoscoSupplierChangeApply updateCoscoSupplierBase(CoscoSupplierChangeApply vo); + + + + public void updateSupplierBase(CoscoSupplierBase coscoSupplierBase); /** * 批量删除中远海运_供应商_基本信息 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 5fa2c53..2af70c1 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 @@ -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.CoscoSupplierExitSupplierCategoryVo; import java.util.List; @@ -50,7 +51,7 @@ public interface ICoscoSupplierexitService { * @param coscoSupplierexit 供应商退出_供应商退出任务 * @return 结果 */ - public Boolean updateCoscoSupplierexit(CoscoSupplierexit coscoSupplierexit); + public CoscoSupplierExitSupplierCategoryVo updateCoscoSupplierexit(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 bb1bbd2..d1bd826 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,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; +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; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItemAttachments; @@ -50,7 +52,13 @@ public class CoscoAccessItemAttachmentsServiceImpl implements ICoscoAccessItemAt */ @Override public int insertCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments) { - coscoAccessItemAttachments.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessItemAttachments.setId(PropertyUtils.getSnowflakeId()); + coscoAccessItemAttachments.setCreateBy("1"); + coscoAccessItemAttachments.setCreateTime(date); + coscoAccessItemAttachments.setUpdateBy("1"); + coscoAccessItemAttachments.setUpdateTime(date); + coscoAccessItemAttachments.setLastUpdateTime(date); return coscoAccessItemAttachmentsMapper.insertCoscoAccessItemAttachments(coscoAccessItemAttachments); } @@ -62,7 +70,10 @@ public class CoscoAccessItemAttachmentsServiceImpl implements ICoscoAccessItemAt */ @Override public int updateCoscoAccessItemAttachments(CoscoAccessItemAttachments coscoAccessItemAttachments) { - coscoAccessItemAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessItemAttachments.setUpdateBy("1"); + coscoAccessItemAttachments.setUpdateTime(date); + coscoAccessItemAttachments.setLastUpdateTime(date); return coscoAccessItemAttachmentsMapper.updateCoscoAccessItemAttachments(coscoAccessItemAttachments); } 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 6ba7550..aacaf03 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,8 +1,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessItemMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItem; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessItemService; @@ -50,7 +52,13 @@ public class CoscoAccessItemServiceImpl implements ICoscoAccessItemService { */ @Override public int insertCoscoAccessItem(CoscoAccessItem coscoAccessItem) { - coscoAccessItem.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessItem.setId(coscoAccessItem.getId()); + coscoAccessItem.setCreateBy("1"); + coscoAccessItem.setCreateTime(date); + coscoAccessItem.setUpdateBy("1"); + 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 00e6025..b6202e1 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 @@ -1,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; +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.CoscoAccessSupplierCategoryMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; @@ -50,7 +52,12 @@ public class CoscoAccessSupplierCategoryServiceImpl implements ICoscoAccessSuppl */ @Override public int insertCoscoAccessSupplierCategory(CoscoAccessSupplierCategory coscoAccessSupplierCategory) { - coscoAccessSupplierCategory.setCreateTime(CoscoDateUtils.getNowDate()); + //准入审批通过也调用了----审批回调可能没有创建人信息 + Date date = CoscoDateUtils.getNowDate(); + coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId()); + coscoAccessSupplierCategory.setCreateTime(date); + coscoAccessSupplierCategory.setUpdateTime(date); + coscoAccessSupplierCategory.setLastUpdateTime(date); return coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } 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 d512de1..c231088 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,9 +2,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; import java.util.List; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +69,42 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi return coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier); } + //营业执照 + @Override + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSYYZZ) + public CoscoSupplierBaseVo sendNotificationYyzz(CoscoSupplierBase supplier, String endTime, Long daysRemaining) { + CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); + coscoAccessSupplier.setSupplierId(supplier.getId()); + coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + List coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + CoscoSupplierBaseVo coscoSupplierBaseVo = new CoscoSupplierBaseVo(); + coscoSupplierBaseVo.setSupplierId(supplier.getId());//供应商id + coscoSupplierBaseVo.setSupplierName(supplier.getName());//供应商名 + coscoSupplierBaseVo.setCoscoAccessSupplierList(coscoAccessSupplierList);//供应商已准入的所有部门 + coscoSupplierBaseVo.setEndTime(endTime);//到期时间 + coscoSupplierBaseVo.setDaysRemaining(daysRemaining);//剩余天数 + return coscoSupplierBaseVo; + } + + + //资质信息 + @Override + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSZZXX) + public CoscoSupplierBaseVo sendNotificationZzxx(CoscoSupplierBase supplier, CoscoSupplierQualifications qualifications , String endTime, long daysRemaining) { + CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); + coscoAccessSupplier.setSupplierId(supplier.getId()); + coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + List coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + CoscoSupplierBaseVo coscoSupplierBaseVo = new CoscoSupplierBaseVo(); + coscoSupplierBaseVo.setSupplierId(supplier.getId());//供应商id + coscoSupplierBaseVo.setSupplierName(supplier.getName());//供应商名 + coscoSupplierBaseVo.setCoscoAccessSupplierList(coscoAccessSupplierList);//供应商已准入的所有部门 + coscoSupplierBaseVo.setEndTime(endTime);//到期时间 + coscoSupplierBaseVo.setDaysRemaining(daysRemaining);//剩余天数 + coscoSupplierBaseVo.setQualificationsName(qualifications.getName());//资质信息名 + return coscoSupplierBaseVo; + } + /** * 批量删除供应商准入_关联供应商 * 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 3946a33..fc6ca9c 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,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; +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; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItem; @@ -50,7 +52,13 @@ public class CoscoAccessUserItemServiceImpl implements ICoscoAccessUserItemServi */ @Override public int insertCoscoAccessUserItem(CoscoAccessUserItem coscoAccessUserItem) { - coscoAccessUserItem.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessUserItem.setId(PropertyUtils.getSnowflakeId()); + coscoAccessUserItem.setCreateBy("1"); + coscoAccessUserItem.setCreateTime(date); + coscoAccessUserItem.setUpdateBy("1"); + coscoAccessUserItem.setUpdateTime(date); + coscoAccessUserItem.setLastUpdateTime(date); return coscoAccessUserItemMapper.insertCoscoAccessUserItem(coscoAccessUserItem); } @@ -62,7 +70,10 @@ public class CoscoAccessUserItemServiceImpl implements ICoscoAccessUserItemServi */ @Override public int updateCoscoAccessUserItem(CoscoAccessUserItem coscoAccessUserItem) { - coscoAccessUserItem.setUpdateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessUserItem.setUpdateBy("1"); + 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 2c258f5..fe829a7 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,8 +1,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; 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.coscosupplier.dao.mapper.CoscoAccessUserMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessUserService; @@ -50,7 +53,13 @@ public class CoscoAccessUserServiceImpl implements ICoscoAccessUserService { */ @Override public int insertCoscoAccessUser(CoscoAccessUser coscoAccessUser) { - coscoAccessUser.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessUser.setId(CoscoIdUtil.getId()); + coscoAccessUser.setCreateBy("1"); + coscoAccessUser.setCreateTime(date); + coscoAccessUser.setUpdateBy("1"); + 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 64e094f..8b5f213 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,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; +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; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWorkAttachments; @@ -50,7 +52,13 @@ public class CoscoAccessWorkAttachmentsServiceImpl implements ICoscoAccessWorkAt */ @Override public int insertCoscoAccessWorkAttachments(CoscoAccessWorkAttachments coscoAccessWorkAttachments) { - coscoAccessWorkAttachments.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoAccessWorkAttachments.setId(PropertyUtils.getSnowflakeId()); + coscoAccessWorkAttachments.setCreateBy("1"); + coscoAccessWorkAttachments.setCreateTime(date); + coscoAccessWorkAttachments.setUpdateBy("1"); + 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 2476caa..5f95545 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 @@ -10,6 +10,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*; 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.CoscoSupplierAccessWorkVo; @@ -34,11 +35,16 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg private CoscoAccessWorkMapper coscoAccessWorkMapper; @Autowired - private CoscoAccessWorkAttachmentsMapper coscoAccessWorkAttachmentsMapper; + private ICoscoAccessWorkService coscoAccessWorkService; + + @Autowired private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper; + @Autowired + private ICoscoAccessSupplierCategoryService coscoAccessSupplierCategoryService; + @Autowired private CoscoAccessCategoryMapper coscoAccessCategoryMapper; @@ -47,17 +53,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg @Autowired private CoscoAccessSupplierMapper coscoAccessSupplierMapper; - @Autowired - private CoscoAccessUserMapper coscoAccessUserMapper; - - @Autowired - private CoscoAccessItemMapper coscoAccessItemMapper; - - @Autowired - private CoscoAccessUserItemMapper coscoAccessUserItemMapper; - - @Autowired - private CoscoAccessItemAttachmentsMapper coscoAccessItemAttachmentsMapper; @@ -161,11 +156,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(id); coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ); - coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); - + coscoAccessWorkService.updateWork(coscoAccessWork); //*************调用三方审批接口*********** @@ -182,9 +173,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg @MessageLog(messageType = MessageType.MESSAGETYPE_GYSPLZR) public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo) { - CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo(); - List supplierIdList = new ArrayList<>(); - //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); @@ -197,24 +185,27 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){ throw new IllegalArgumentException("任务已处理完成"); } + //推送消息用的 + CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo(); + List supplierIdList = new ArrayList<>(); //修改任务主表审批状态--通过或者驳回 CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getId()); coscoAccessWork.setWorkFlowId(vo.getWorkFlowId()); coscoAccessWork.setApproveStatus(vo.getApproveStatus()); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + coscoAccessWorkService.updateWork(coscoAccessWork); + + //供应商信息 + CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); + coscoAccessSupplier.setAccessWorkId(vo.getId()); + List supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + //审批通过 - if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){ + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ //把准入的品类添加到已准入品类表 - //供应商信息 - CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); - coscoAccessSupplier.setAccessWorkId(vo.getId()); - List supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){ //根据id查询全部需要准入的品类 @@ -232,24 +223,39 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //如果是0 说明没准入过 if(num == 0){ CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId()); coscoAccessSupplierCategory.setAccessWorkId(vo.getId()); coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setCreateTime(CoscoDateUtils.getNowDate()); coscoAccessSupplierCategory.setUpdateBy("1"); - coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); - coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); - coscoAccessCategoryListAop.add(coscoAccessCategory1); + coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } + coscoAccessCategoryListAop.add(coscoAccessCategory1); } coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); supplierIdList.add(coscoAccessSupplier1); } + }else{ //审批未通过 + for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){ + //根据id查询全部需要准入的品类 + CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); + coscoAccessCategory.setAccessWorkId(vo.getId()); + List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); + List coscoAccessCategoryListAop = new ArrayList<>(); + for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ + //验证该品类是否已经准入过了 + CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId()); + coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId()); + coscoAccessSupplierCategory2.setDeptId(coscoAccessWorkData.getDeptId()); + Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2); + coscoAccessCategoryListAop.add(coscoAccessCategory1); + } + coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); + supplierIdList.add(coscoAccessSupplier1); + } } //封装消息内容实体 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 089d728..ffc1170 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 @@ -12,8 +12,9 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.*; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; 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.ICoscoAccessWorkService; +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.UserItmeMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,16 +28,23 @@ import org.springframework.transaction.annotation.Transactional; @Service public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { + @Autowired - private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + private ICoscoSupplierBaseService coscoSupplierBaseService; + + + @Autowired private CoscoAccessWorkMapper coscoAccessWorkMapper; @Autowired - private CoscoAccessWorkAttachmentsMapper coscoAccessWorkAttachmentsMapper; + private ICoscoAccessWorkAttachmentsService coscoAccessWorkAttachmentsService; + + + @Autowired - private CoscoAccessSupplierCategoryMapper coscoAccessSupplierCategoryMapper; + private ICoscoAccessSupplierCategoryService coscoAccessSupplierCategoryService; @Autowired @@ -49,15 +57,46 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Autowired private CoscoAccessUserMapper coscoAccessUserMapper; + @Autowired + private ICoscoAccessUserService coscoAccessUserService; + + + @Autowired private CoscoAccessItemMapper coscoAccessItemMapper; + @Autowired + private ICoscoAccessItemService coscoAccessItemService; + + + + @Autowired private CoscoAccessUserItemMapper coscoAccessUserItemMapper; + @Autowired + private ICoscoAccessUserItemService coscoAccessUserItemService; + + + @Autowired private CoscoAccessItemAttachmentsMapper coscoAccessItemAttachmentsMapper; + @Autowired + private ICoscoAccessItemAttachmentsService coscoAccessItemAttachmentsService; + + + + @Autowired + private ICoscoMessageService coscoMessageService; + + @Autowired + private ICoscoAccessCategoryService coscoAccessCategoryService; + + @Autowired + private ICoscoAccessSupplierService coscoAccessSupplierService; + + @Override public IPage getPage(CoscoAccessWork data) { @@ -228,6 +267,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Transactional public Boolean insertCoscoAccessWork(CoscoAccessWorkVo vo) { String workId = CoscoIdUtil.getId();//工作主体id + Date date = CoscoDateUtils.getNowDate(); //任务主体新增/供应商准入 CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork(); coscoAccessWork.setId(workId); @@ -241,10 +281,10 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); } coscoAccessWork.setCreateBy("1"); - coscoAccessWork.setCreateTime(CoscoDateUtils.getNowDate()); + coscoAccessWork.setCreateTime(date); coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoAccessWork.setUpdateTime(date); + coscoAccessWork.setLastUpdateTime(date); coscoAccessWorkMapper.insertCoscoAccessWork(coscoAccessWork); //品类集合 @@ -252,7 +292,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(workId); coscoAccessCategory.setCategoryId(cId); - coscoAccessCategoryMapper.insertCoscoAccessCategory(coscoAccessCategory); + coscoAccessCategoryService.insertCoscoAccessCategory(coscoAccessCategory); } //供应商集合 @@ -263,28 +303,23 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); coscoAccessSupplier.setAccessWorkId(workId); coscoAccessSupplier.setSupplierId(sId); - coscoAccessSupplierMapper.insertCoscoAccessSupplier(coscoAccessSupplier); + coscoAccessSupplierService.insertCoscoAccessSupplier(coscoAccessSupplier); } //如果是线上准入、有人员和评审项 if(CoscoType.ACCESS_TYPE_ONLINE.equals(coscoAccessWork.getAccessType())){ String zuZhangId = "";//组长id //评审人员集合 - if(vo.getCoscoAccessUserls().size() > 0){ - for(CoscoAccessUser user: vo.getCoscoAccessUserls()){ + List coscoAccessUserls = vo.getCoscoAccessUserls(); + if(coscoAccessUserls.size() > 0){ + for(CoscoAccessUser user: coscoAccessUserls){ //判断是否是组长 if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){ zuZhangId = user.getUserId(); } - user.setId(CoscoIdUtil.getId()); user.setAccessWorkId(workId); user.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D); - user.setCreateBy("1"); - user.setCreateTime(CoscoDateUtils.getNowDate()); - user.setUpdateBy("1"); - user.setUpdateTime(CoscoDateUtils.getNowDate()); - user.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserMapper.insertCoscoAccessUser(user); + coscoAccessUserService.insertCoscoAccessUser(user); } } @@ -302,27 +337,16 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessItem.setSupplierId(sId); coscoAccessItem.setItemType(CoscoType.ITEMTYPE_ITEM); coscoAccessItem.setItemName(item.getItemName());//评审项名称 - coscoAccessItem.setCreateBy("1"); - coscoAccessItem.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessItem.setUpdateBy("1"); - coscoAccessItem.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItem.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItemMapper.insertCoscoAccessItem(coscoAccessItem); + coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem); List userList = item.getReviewBy();//评审项人员 for(String userId : userList){ CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem(); - coscoAccessUserItem.setId(PropertyUtils.getSnowflakeId()); coscoAccessUserItem.setAccessWorkId(workId); coscoAccessUserItem.setSupplierId(sId); coscoAccessUserItem.setItemId(itemId); coscoAccessUserItem.setReviewBy(userId); - coscoAccessUserItem.setCreateBy("1"); - coscoAccessUserItem.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItem.setUpdateBy("1"); - coscoAccessUserItem.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItem.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItemMapper.insertCoscoAccessUserItem(coscoAccessUserItem); + coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem); } } @@ -335,41 +359,27 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessItem.setSupplierId(sId); coscoAccessItem.setItemType(CoscoType.ITEMTYPE_SUMMARY); coscoAccessItem.setItemName("结果汇总");//评审项名称 - coscoAccessItem.setCreateBy("1"); - coscoAccessItem.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessItem.setUpdateBy("1"); - coscoAccessItem.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItem.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItemMapper.insertCoscoAccessItem(coscoAccessItem); + coscoAccessItemService.insertCoscoAccessItem(coscoAccessItem); CoscoAccessUserItem coscoAccessUserItem = new CoscoAccessUserItem(); - coscoAccessUserItem.setId(PropertyUtils.getSnowflakeId()); coscoAccessUserItem.setAccessWorkId(workId); coscoAccessUserItem.setSupplierId(sId); coscoAccessUserItem.setItemId(itemId); coscoAccessUserItem.setReviewBy(zuZhangId); - coscoAccessUserItem.setCreateBy("1"); - coscoAccessUserItem.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItem.setUpdateBy("1"); - coscoAccessUserItem.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItem.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItemMapper.insertCoscoAccessUserItem(coscoAccessUserItem); + coscoAccessUserItemService.insertCoscoAccessUserItem(coscoAccessUserItem); } } + + //给各个评审人员发送消息 + coscoMessageService.userMessage(coscoAccessUserls); } //如果是线下准入 if(CoscoType.ACCESS_TYPE_OFFLINE.equals(coscoAccessWork.getAccessType())){ CoscoAccessWorkAttachments coscoAccessWorkAttachments = vo.getCoscoAccessWorkAttachments(); - coscoAccessWorkAttachments.setId(PropertyUtils.getSnowflakeId()); coscoAccessWorkAttachments.setAccessWorkId(workId); coscoAccessWorkAttachments.setAttachmentsType(CoscoType.ACCESS_TYPE_OFFLINE); - coscoAccessWorkAttachments.setCreateBy("1"); - coscoAccessWorkAttachments.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkAttachments.setUpdateBy("1"); - coscoAccessWorkAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkAttachmentsMapper.insertCoscoAccessWorkAttachments(coscoAccessWorkAttachments); + coscoAccessWorkAttachmentsService.insertCoscoAccessWorkAttachments(coscoAccessWorkAttachments); } return true; } @@ -382,14 +392,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Transactional public Boolean updateCoscoAccessWork(CoscoAccessUserItemVo vo) { //String userId = "USER001"; + Date date = CoscoDateUtils.getNowDate(); String userId =vo.getUserId(); if(vo.getCoscoAccessUserItemList() != null){ for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){ //修改评审项关联评审人员表 - coscoAccessUserItem.setUpdateBy("1"); - coscoAccessUserItem.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItem.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUserItemMapper.updateCoscoAccessUserItem(coscoAccessUserItem); + coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem); if(coscoAccessUserItem.getCoscoAccessTtemAttachments() != null){ //插入附件表 @@ -397,18 +405,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId()); coscoAccessTtemAttachments.setAccessUserItemId(coscoAccessUserItem.getId()); if(coscoAccessTtemAttachments.getId() != null){ - coscoAccessTtemAttachments.setUpdateBy("1"); - coscoAccessTtemAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessTtemAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItemAttachmentsMapper.updateCoscoAccessItemAttachments(coscoAccessTtemAttachments); + coscoAccessItemAttachmentsService.updateCoscoAccessItemAttachments(coscoAccessTtemAttachments); }else{ - coscoAccessTtemAttachments.setId(PropertyUtils.getSnowflakeId()); - coscoAccessTtemAttachments.setCreateBy("1"); - coscoAccessTtemAttachments.setCreateTime(CoscoDateUtils.getNowDate()); - coscoAccessTtemAttachments.setUpdateBy("1"); - coscoAccessTtemAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessTtemAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessItemAttachmentsMapper.insertCoscoAccessItemAttachments(coscoAccessTtemAttachments); + coscoAccessItemAttachmentsService.insertCoscoAccessItemAttachments(coscoAccessTtemAttachments); } } } @@ -417,11 +416,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { CoscoAccessUser coscoAccessUser = new CoscoAccessUser(); coscoAccessUser.setAccessWorkId(vo.getAccessWorkId()); coscoAccessUser.setUserId(userId); - coscoAccessUser.setReviewTime(CoscoDateUtils.getNowDate()); + coscoAccessUser.setReviewTime(date); coscoAccessUser.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_Y); coscoAccessUser.setUpdateBy("1"); - coscoAccessUser.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessUser.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoAccessUser.setUpdateTime(date); + coscoAccessUser.setLastUpdateTime(date); coscoAccessUserMapper.updateCoscoAccessUserByUserId(coscoAccessUser); //查询组员待评审的还剩下几条 @@ -445,9 +444,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + updateWork(coscoAccessWork); }else{ //组员-结果汇总中 //修改任务主表评审状态 @@ -455,9 +452,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_JGHZZ); coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + updateWork(coscoAccessWork); } }else{ @@ -466,13 +461,24 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_JXZ); coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + updateWork(coscoAccessWork); } return true; } + /** + * 修改主任务方法 + * @param coscoAccessWork + */ + public void updateWork(CoscoAccessWork coscoAccessWork) { + Date date = CoscoDateUtils.getNowDate(); + coscoAccessWork.setUpdateTime(date); + coscoAccessWork.setLastUpdateTime(date); + coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + + } + + /** * 批量删除供应商准入_准入申请工作主 * @@ -506,9 +512,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setId(id); coscoAccessWork.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ); coscoAccessWork.setUpdateBy("1"); - coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + updateWork(coscoAccessWork); //*********************************调用三方接口****************************** @@ -525,7 +529,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @MessageLog(messageType = MessageType.MESSAGETYPE_GYSZR) public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo) { - //aop返回对象 + //aop返回对象,消息推送用 CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo(); List supplierIdList = new ArrayList<>(); @@ -550,18 +554,18 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setWorkFlowId(vo.getWorkFlowId()); coscoAccessWork.setUpdateTime(date); coscoAccessWork.setLastUpdateTime(date); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + updateWork(coscoAccessWork);//可能审批回调没有登录人信息 //供应商信息 CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); coscoAccessSupplier.setAccessWorkId(vo.getId()); - List supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + List supplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); //审批通过 - if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){ + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ for(CoscoAccessSupplier coscoAccessSupplier1 :supplierList ){ @@ -572,28 +576,21 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId()); coscoAccessSupplierCategory.setAccessWorkId(vo.getId()); coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); - coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setCreateTime(date); - coscoAccessSupplierCategory.setUpdateBy("1"); - coscoAccessSupplierCategory.setUpdateTime(date); - coscoAccessSupplierCategory.setLastUpdateTime(date); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); - coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); + coscoAccessSupplierCategory.setCreateBy("1"); + coscoAccessSupplierCategory.setUpdateBy("1"); + coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } //修改注册信息表状态 CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(coscoAccessSupplier1.getSupplierId()); coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); - coscoSupplierBase.setUpdateBy("1"); - coscoSupplierBase.setUpdateTime(date); - coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBase.setDeptId(coscoAccessWorkData.getDeptId()); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + coscoSupplierBaseService.updateSupplierBase(coscoSupplierBase); //修改准入供应商表状态 CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); 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 cbc40c2..f286f16 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 @@ -4,9 +4,13 @@ import java.util.List; 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.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -98,4 +102,14 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { public int deleteCoscoMessageById(String id) { return coscoMessageMapper.deleteCoscoMessageById(id); } + + + //封装消息人员 + @Override + @MessageLog(messageType = MessageType.MESSAGETYPE_PSRY) + public UserItmeMessageVo userMessage(List coscoAccessUserls) { + UserItmeMessageVo vo = new UserItmeMessageVo(); + vo.setCoscoAccessUserList(coscoAccessUserls); + return vo; + } } 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 ce851a0..57c5a75 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 @@ -65,12 +65,13 @@ public class CoscoSupplierBankServiceImpl implements ICoscoSupplierBankService { */ @Override public Boolean insertCoscoSupplierBank(CoscoSupplierBank coscoSupplierBank) { + Date date = CoscoDateUtils.getNowDate(); coscoSupplierBank.setId(CoscoIdUtil.getId()); coscoSupplierBank.setCreateBy("1"); - coscoSupplierBank.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBank.setCreateTime(date); coscoSupplierBank.setUpdateBy("1"); - coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBank.setUpdateTime(date); + coscoSupplierBank.setLastUpdateTime(date); coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); return true; } 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 d730b5f..d2fe237 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 @@ -15,10 +15,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; 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.ICoscoSupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.beans.factory.annotation.Autowired; @@ -37,17 +39,48 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { private CoscoSupplierBaseMapper coscoSupplierBaseMapper; @Autowired private CoscoSupplierQualificationsMapper coscoSupplierQualificationsMapper; + + @Autowired + private ICoscoSupplierQualificationsService coscoSupplierQualificationsService; + + @Autowired private CoscoSupplierInvoiceMapper coscoSupplierInvoiceMapper; + + @Autowired + private ICoscoSupplierInvoiceService coscoSupplierInvoiceService; + + @Autowired private CoscoSupplierBankMapper coscoSupplierBankMapper; + + @Autowired + private ICoscoSupplierBankService coscoSupplierBankService; + + @Autowired private CoscoSupplierSurveyMapper coscoSupplierSurveyMapper; + + @Autowired + private ICoscoSupplierSurveyService coscoSupplierSurveyService; + + + @Autowired private CoscoSupplierSurveyQuestionReplyMapper coscoSupplierSurveyQuestionReplyMapper; + + @Autowired + private ICoscoSupplierSurveyQuestionReplyService coscoSupplierSurveyQuestionReplyService; + + + @Autowired private CoscoSupplierSurveyAttachmentsMapper coscoSupplierSurveyAttachmentsMapper; + @Autowired + private ICoscoSupplierSurveyAttachmentsService coscoSupplierSurveyAttachmentsService; + + @Autowired private CoscoSupplierChangeHistoryMapper coscoSupplierChangeHistoryMapper; @@ -140,8 +173,6 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { @Transactional public Boolean insertCoscoSupplierBase(CoscoSupplierVo vo) { String supplierId = CoscoIdUtil.getId();//企业id - //作废 - //String changeSupplierId = PropertyUtils.getSnowflakeId(); Date date = new Date(); //基本信息新增 CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); @@ -154,122 +185,45 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBaseMapper.insertCoscoSupplierBase(coscoSupplierBase); - - //变更表基本信息插入---作废 - /* CoscoSupplierChangeBase coscoSupplierChangeBase = new CoscoSupplierChangeBase(); - BeanUtil.copyProperties(coscoSupplierBase,coscoSupplierChangeBase); - coscoSupplierChangeBase.setId(changeSupplierId); - coscoSupplierChangeBase.setSupplierId(supplierId); - coscoSupplierChangeBaseMapper.insertCoscoSupplierChangeBase(coscoSupplierChangeBase);*/ } //资质信息新增 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierQualifications())) { for(CoscoSupplierQualifications coscoSupplierQualifications : vo.getCoscoSupplierQualifications()){ - String supplierQualificationsId = CoscoIdUtil.getId(); - coscoSupplierQualifications.setId(supplierQualificationsId); coscoSupplierQualifications.setSupplierId(supplierId); - coscoSupplierQualifications.setCreateBy("1"); - coscoSupplierQualifications.setCreateTime(date); - coscoSupplierQualifications.setUpdateBy("1"); - coscoSupplierQualifications.setUpdateTime(date); - coscoSupplierQualifications.setLastUpdateTime(date); - coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications); - - //变更表资质插入--作废 - /* CoscoSupplierChangeQualifications coscoSupplierChangeQualifications = new CoscoSupplierChangeQualifications(); - BeanUtil.copyProperties(coscoSupplierQualifications,coscoSupplierChangeQualifications); - coscoSupplierChangeQualifications.setId(CoscoIdUtil.getId()); - coscoSupplierChangeQualifications.setSupplierQualificationsId(supplierQualificationsId); - coscoSupplierChangeQualifications.setSupplierId(changeSupplierId); - coscoSupplierChangeQualificationsMapper.insertCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications);*/ - + coscoSupplierQualificationsService.insertCoscoSupplierQualifications(coscoSupplierQualifications); } } - - //发票信息 CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice(); if(coscoSupplierInvoice != null){ - String supplierInvoiceId = CoscoIdUtil.getId(); - coscoSupplierInvoice.setId(supplierInvoiceId); coscoSupplierInvoice.setSupplierId(supplierId); - coscoSupplierInvoice.setCreateBy("1"); - coscoSupplierInvoice.setCreateTime(date); - coscoSupplierInvoice.setUpdateBy("1"); - coscoSupplierInvoice.setUpdateTime(date); - coscoSupplierInvoice.setLastUpdateTime(date); - coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice); - - //变更表发票插入--作废 - /* CoscoSupplierChangeInvoice coscoSupplierChangeInvoice = new CoscoSupplierChangeInvoice(); - BeanUtil.copyProperties(coscoSupplierInvoice,coscoSupplierChangeInvoice); - coscoSupplierChangeInvoice.setId(CoscoIdUtil.getId()); - coscoSupplierChangeInvoice.setSupplierInvoiceId(supplierInvoiceId); - coscoSupplierChangeInvoice.setSupplierId(changeSupplierId); - coscoSupplierChangeInvoiceMapper.insertCoscoSupplierChangeInvoice(coscoSupplierChangeInvoice);*/ + coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice); } - - //银行 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierBank())) { for(CoscoSupplierBank coscoSupplierBank : vo.getCoscoSupplierBank()){ - String supplierBankId = CoscoIdUtil.getId(); - coscoSupplierBank.setId(supplierBankId); coscoSupplierBank.setSupplierId(supplierId); - coscoSupplierBank.setCreateBy("1"); - coscoSupplierBank.setCreateTime(date); - coscoSupplierBank.setUpdateBy("1"); - coscoSupplierBank.setUpdateTime(date); - coscoSupplierBank.setLastUpdateTime(date); - coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); - - //变更表银行插入---作废 - /*CoscoSupplierChangeBank coscoSupplierChangeBank = new CoscoSupplierChangeBank(); - BeanUtil.copyProperties(coscoSupplierBank,coscoSupplierChangeBank); - coscoSupplierChangeBank.setId(CoscoIdUtil.getId()); - coscoSupplierChangeBank.setSupplierBankId(supplierBankId); - coscoSupplierChangeBank.setSupplierId(changeSupplierId); - coscoSupplierChangeBankMapper.insertCoscoSupplierChangeBank(coscoSupplierChangeBank);*/ + coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank); } } //填写人信息 CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey(); if(coscoSupplierSurvey != null){ - coscoSupplierSurvey.setId(CoscoIdUtil.getId()); coscoSupplierSurvey.setSupplierId(supplierId); - coscoSupplierSurvey.setCreateBy("1"); - coscoSupplierSurvey.setCreateTime(date); - coscoSupplierSurvey.setUpdateBy("1"); - coscoSupplierSurvey.setUpdateTime(date); - coscoSupplierSurvey.setLastUpdateTime(date); - coscoSupplierSurveyMapper.insertCoscoSupplierSurvey(coscoSupplierSurvey); + coscoSupplierSurveyService.insertCoscoSupplierSurvey(coscoSupplierSurvey); } - - //问题回复 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) { for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){ - coscoSupplierSurveyQuestionReply.setId(CoscoIdUtil.getId()); coscoSupplierSurveyQuestionReply.setSupplierId(supplierId); - coscoSupplierSurveyQuestionReply.setCreateBy("1"); - coscoSupplierSurveyQuestionReply.setCreateTime(date); - coscoSupplierSurveyQuestionReply.setUpdateBy("1"); - coscoSupplierSurveyQuestionReply.setUpdateTime(date); - coscoSupplierSurveyQuestionReply.setLastUpdateTime(date); - coscoSupplierSurveyQuestionReplyMapper.insertCoscoSupplierSurveyQuestionReply(coscoSupplierSurveyQuestionReply); + coscoSupplierSurveyQuestionReplyService.insertCoscoSupplierSurveyQuestionReply(coscoSupplierSurveyQuestionReply); } } //承诺书/其他附件 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) { for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){ - coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId()); coscoSupplierSurveyAttachments.setSupplierId(supplierId); - coscoSupplierSurveyAttachments.setCreateBy("1"); - coscoSupplierSurveyAttachments.setCreateTime(date); - coscoSupplierSurveyAttachments.setUpdateBy("1"); - coscoSupplierSurveyAttachments.setUpdateTime(date); - coscoSupplierSurveyAttachments.setLastUpdateTime(date); - coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); + coscoSupplierSurveyAttachmentsService.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); } } return true; @@ -282,112 +236,60 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { */ @Override @Transactional - public Boolean updateCoscoSupplierBase(CoscoSupplierChangeApply vo) { + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJCXX) + public CoscoSupplierChangeApply updateCoscoSupplierBase(CoscoSupplierChangeApply vo) { + String appid = vo.getId();//任务主体id CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid); if(coscoSupplierChangeApply == null){ - return true; + throw new IllegalArgumentException("任务信息不能为空"); } //先验证一下主任务表数据状态 if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) || CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){ - return true; - } - //新基本信息 - CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid); - - //老基本信息 - CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierChangeApply.getSupplierId()); - String supplierId = coscoSupplierBase.getId(); - String createBy = coscoSupplierBase.getCreateBy(); - String updateBy = coscoSupplierBase.getUpdateBy(); - BeanUtil.copyProperties(newCoscoSupplierBase,coscoSupplierBase); - coscoSupplierBase.setId(supplierId); - coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); - - //***********下面代码作废*************** - /*//删除在新增新资质 - coscoSupplierQualificationsMapper.deleteCoscoSupplierQualificationsById(supplierId); - - CoscoSupplierChangeQualifications coscoSupplierChangeQualifications2 = new CoscoSupplierChangeQualifications(); - coscoSupplierChangeQualifications2.setSupplierId(newCoscoSupplierBase.getId()); - List newCoscoSupplierChangeQualificationsList = - coscoSupplierChangeQualificationsMapper.selectCoscoSupplierChangeQualificationsList(coscoSupplierChangeQualifications2); - for(CoscoSupplierChangeQualifications newQualifications : newCoscoSupplierChangeQualificationsList){ - CoscoSupplierQualifications oldQualifications = new CoscoSupplierQualifications(); - BeanUtil.copyProperties(newQualifications,oldQualifications); - String yId = CoscoIdUtil.getId(); - oldQualifications.setId(yId); - oldQualifications.setSupplierId(supplierId); - oldQualifications.setCreateBy(createBy); - oldQualifications.setCreateTime(CoscoDateUtils.getNowDate()); - oldQualifications.setUpdateBy(updateBy); - oldQualifications.setUpdateTime(CoscoDateUtils.getNowDate()); - oldQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(oldQualifications); - - //把新id，添加到变更表 - CoscoSupplierChangeQualifications coscoSupplierChangeQualifications = new CoscoSupplierChangeQualifications(); - coscoSupplierChangeQualifications.setSupplierQualificationsId(yId); - coscoSupplierChangeQualifications.setId(newQualifications.getId()); - coscoSupplierChangeQualificationsMapper.updateCoscoSupplierChangeQualifications(coscoSupplierChangeQualifications); + throw new IllegalArgumentException("任务已处理完成"); } - //新开票信息 - coscoSupplierInvoiceMapper.deleteCoscoSupplierInvoiceById(supplierId); - - CoscoSupplierChangeInvoice newInvoice = coscoSupplierChangeInvoiceMapper.selectBySupplierChangeApplyId(appid); - CoscoSupplierInvoice oldInvoice = new CoscoSupplierInvoice(); - BeanUtil.copyProperties(newInvoice,oldInvoice); - - oldInvoice.setId(CoscoIdUtil.getId()); - oldInvoice.setSupplierId(supplierId); - oldInvoice.setCreateBy(createBy); - oldInvoice.setCreateTime(CoscoDateUtils.getNowDate()); - oldInvoice.setUpdateBy(updateBy); - oldInvoice.setUpdateTime(CoscoDateUtils.getNowDate()); - oldInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(oldInvoice); - - - - //新银行 - coscoSupplierBankMapper.deleteCoscoSupplierBankById(supplierId); - - CoscoSupplierChangeBank newBank = new CoscoSupplierChangeBank(); - newBank.setSupplierId(newCoscoSupplierBase.getId()); - List newBankList = - coscoSupplierChangeBankMapper.selectCoscoSupplierChangeBankList(newBank); - for(CoscoSupplierChangeBank coscoSupplierChangeBank : newBankList){ - CoscoSupplierBank coscoSupplierBank = new CoscoSupplierBank(); - BeanUtil.copyProperties(coscoSupplierChangeBank,coscoSupplierBank); - String bankId = CoscoIdUtil.getId(); - coscoSupplierBank.setId(bankId); - coscoSupplierBank.setSupplierId(supplierId); - coscoSupplierBank.setCreateBy(createBy); - coscoSupplierBank.setCreateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBank.setUpdateBy(updateBy); - coscoSupplierBank.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBank.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBankMapper.insertCoscoSupplierBank(coscoSupplierBank); - - CoscoSupplierChangeBank coscoSupplierChangeBank1 = new CoscoSupplierChangeBank(); - coscoSupplierChangeBank1.setId(coscoSupplierChangeBank.getId()); - coscoSupplierChangeBank1.setSupplierBankId(bankId); - coscoSupplierChangeBankMapper.updateCoscoSupplierChangeBank(coscoSupplierChangeBank1); - }*/ - - //修改审批状态 + //修改主体审批状态，封装实体 CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply(); + + //审批通过 + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + Date date = CoscoDateUtils.getNowDate(); + //新基本信息 + CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid); + + //老基本信息 + CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(coscoSupplierChangeApply.getSupplierId()); + String supplierId = coscoSupplierBase.getId(); + BeanUtil.copyProperties(newCoscoSupplierBase,coscoSupplierBase); + coscoSupplierBase.setId(supplierId); + coscoSupplierBase.setUpdateTime(date); + coscoSupplierBase.setLastUpdateTime(date); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + + //消息通知用到的 + coscoSupplierChangeApply1.setSupplierName(coscoSupplierBase.getName()); + coscoSupplierChangeApply1.setSupplierId(supplierId); + } + + coscoSupplierChangeApply1.setId(coscoSupplierChangeApply.getId()); coscoSupplierChangeApply1.setApproveStatus(vo.getApproveStatus()); coscoSupplierChangeApply1.setUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierChangeApply1.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(coscoSupplierChangeApply1); - return true; + + return coscoSupplierChangeApply1; + } + + @Override + public void updateSupplierBase(CoscoSupplierBase coscoSupplierBase) { + Date date = CoscoDateUtils.getNowDate(); + coscoSupplierBase.setUpdateTime(date); + coscoSupplierBase.setLastUpdateTime(date); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); } /** @@ -428,6 +330,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { @Override @Transactional public Boolean update(CoscoSupplierVo vo) { + Date date = CoscoDateUtils.getNowDate(); //基本信息新增 CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); @@ -451,8 +354,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { } //修改基本信息 coscoSupplierBase.setUpdateBy("1"); - coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBase.setUpdateTime(date); + coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); return true; } @@ -465,6 +368,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { */ @Transactional public Boolean insertCoscoSupplierChangeApply(CoscoSupplierBase newCoscoSupplierBase,CoscoSupplierBase oldCoscoSupplierBase,CoscoSupplierVo vo) { + Date date = CoscoDateUtils.getNowDate(); String applyId = PropertyUtils.getSnowflakeId(); //主体信息---待审批 CoscoSupplierChangeApply coscoSupplierChangeApply = new CoscoSupplierChangeApply(); @@ -473,13 +377,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierChangeApply.setTitle(vo.getTitle()); coscoSupplierChangeApply.setChangeDesc(vo.getChangeDesc()); coscoSupplierChangeApply.setChangeBy("1"); - coscoSupplierChangeApply.setChangeTime(CoscoDateUtils.getNowDate()); + coscoSupplierChangeApply.setChangeTime(date); coscoSupplierChangeApply.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ); coscoSupplierChangeApply.setCreateBy("1"); - coscoSupplierChangeApply.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierChangeApply.setCreateTime(date); coscoSupplierChangeApply.setUpdateBy("1"); - coscoSupplierChangeApply.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierChangeApply.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierChangeApply.setUpdateTime(date); + coscoSupplierChangeApply.setLastUpdateTime(date); coscoSupplierChangeApplyMapper.insertCoscoSupplierChangeApply(coscoSupplierChangeApply); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java index 00aaf94..c3e9579 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierInvoiceServiceImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -61,12 +62,13 @@ public class CoscoSupplierInvoiceServiceImpl implements ICoscoSupplierInvoiceSer */ @Override public Boolean insertCoscoSupplierInvoice(CoscoSupplierInvoice coscoSupplierInvoice) { + Date date = CoscoDateUtils.getNowDate(); coscoSupplierInvoice.setId(CoscoIdUtil.getId()); coscoSupplierInvoice.setCreateBy("1"); - coscoSupplierInvoice.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierInvoice.setCreateTime(date); coscoSupplierInvoice.setUpdateBy("1"); - coscoSupplierInvoice.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierInvoice.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierInvoice.setUpdateTime(date); + coscoSupplierInvoice.setLastUpdateTime(date); coscoSupplierInvoiceMapper.insertCoscoSupplierInvoice(coscoSupplierInvoice); return true; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java index d495f57..515494e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierQualificationsServiceImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -62,12 +63,13 @@ public class CoscoSupplierQualificationsServiceImpl implements ICoscoSupplierQua */ @Override public Boolean insertCoscoSupplierQualifications(CoscoSupplierQualifications coscoSupplierQualifications) { + Date date = CoscoDateUtils.getNowDate(); coscoSupplierQualifications.setId(CoscoIdUtil.getId()); coscoSupplierQualifications.setCreateBy("1"); - coscoSupplierQualifications.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierQualifications.setCreateTime(date); coscoSupplierQualifications.setUpdateBy("1"); - coscoSupplierQualifications.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierQualifications.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierQualifications.setUpdateTime(date); + coscoSupplierQualifications.setLastUpdateTime(date); coscoSupplierQualificationsMapper.insertCoscoSupplierQualifications(coscoSupplierQualifications); return true; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java index 92f085c..01e48ad 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyQuestionReplyServiceImpl.java @@ -1,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyQuestionReply; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyQuestionReplyMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyQuestionReplyService; @@ -50,7 +52,13 @@ public class CoscoSupplierSurveyQuestionReplyServiceImpl implements ICoscoSuppli */ @Override public int insertCoscoSupplierSurveyQuestionReply(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply) { - coscoSupplierSurveyQuestionReply.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoSupplierSurveyQuestionReply.setId(CoscoIdUtil.getId()); + coscoSupplierSurveyQuestionReply.setCreateBy("1"); + coscoSupplierSurveyQuestionReply.setCreateTime(date); + coscoSupplierSurveyQuestionReply.setUpdateBy("1"); + coscoSupplierSurveyQuestionReply.setUpdateTime(date); + coscoSupplierSurveyQuestionReply.setLastUpdateTime(date); return coscoSupplierSurveyQuestionReplyMapper.insertCoscoSupplierSurveyQuestionReply(coscoSupplierSurveyQuestionReply); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java index cb52fc8..ebcfcd4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierSurveyServiceImpl.java @@ -1,8 +1,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurvey; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierSurveyMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyService; @@ -50,7 +52,13 @@ public class CoscoSupplierSurveyServiceImpl implements ICoscoSupplierSurveyServi */ @Override public int insertCoscoSupplierSurvey(CoscoSupplierSurvey coscoSupplierSurvey) { - coscoSupplierSurvey.setCreateTime(CoscoDateUtils.getNowDate()); + Date date = CoscoDateUtils.getNowDate(); + coscoSupplierSurvey.setId(CoscoIdUtil.getId()); + coscoSupplierSurvey.setCreateBy("1"); + coscoSupplierSurvey.setCreateTime(date); + coscoSupplierSurvey.setUpdateBy("1"); + coscoSupplierSurvey.setUpdateTime(date); + coscoSupplierSurvey.setLastUpdateTime(date); return coscoSupplierSurveyMapper.insertCoscoSupplierSurvey(coscoSupplierSurvey); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java index d39438d..acfb371 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -8,9 +9,13 @@ 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.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupplierCategoryVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -132,71 +137,86 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { */ @Override @Transactional - public Boolean updateCoscoSupplierexit(CoscoSupplierexit vo) { + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSPLTC) + public CoscoSupplierExitSupplierCategoryVo updateCoscoSupplierexit(CoscoSupplierexit vo) { + CoscoSupplierExitSupplierCategoryVo coscoSupplierExitSupplierCategoryVo = new CoscoSupplierExitSupplierCategoryVo(); + //先验证一下主任务表数据状态 CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId()); if(coscoSupplierexit == null){ - return true; + throw new IllegalArgumentException("任务信息不能为空"); } if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus()) ){ - return true; + throw new IllegalArgumentException("任务已处理完成"); } + Date date = CoscoDateUtils.getNowDate(); //修改主表状态 CoscoSupplierexit coscoSupplierexit1 = new CoscoSupplierexit(); coscoSupplierexit1.setApproveStatus(vo.getApproveStatus()); coscoSupplierexit1.setWorkFlowId(vo.getWorkFlowId()); coscoSupplierexit1.setId(vo.getId()); - coscoSupplierexit1.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierexit1.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierexit1.setUpdateTime(date); + coscoSupplierexit1.setLastUpdateTime(date); coscoSupplierexitMapper.updateCoscoSupplierexit(coscoSupplierexit1); //查询该任务下的所有供应商品类 CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory(); category.setSupplierexitId(vo.getId()); List categoryList = coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(category); - for(CoscoSupplierexitSupplierCategory category1 : categoryList){ - CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory.setCategoryId(category1.getCategoryId()); - coscoAccessSupplierCategory.setSupplierId(category1.getSupplierId()); - coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); - coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(coscoAccessSupplierCategory); - } - CoscoSupplierexitSupplier coscoSupplierexitSupplier = new CoscoSupplierexitSupplier(); - coscoSupplierexitSupplier.setSupplierexitId(vo.getId()); - List coscoSupplierexitSuppliers = coscoSupplierexitSupplierMapper.selectCoscoSupplierexitSupplierList(coscoSupplierexitSupplier); - for(CoscoSupplierexitSupplier coscoSupplierexitSupplier1 : coscoSupplierexitSuppliers){ - //查询该供应商是否还有准入的品类数据 - CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); - coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); - Integer countNum = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory); - if(countNum == 0){//说明当前部门下没有品类了 + //审批通过 + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + + for(CoscoSupplierexitSupplierCategory category1 : categoryList){ + CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory.setCategoryId(category1.getCategoryId()); + coscoAccessSupplierCategory.setSupplierId(category1.getSupplierId()); + coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); + coscoAccessSupplierCategoryMapper.deleteCoscoAccessSupplierCategoryById(coscoAccessSupplierCategory); + } + + + //查询该任务下的所有供应商 + CoscoSupplierexitSupplier coscoSupplierexitSupplier = new CoscoSupplierexitSupplier(); + coscoSupplierexitSupplier.setSupplierexitId(vo.getId()); + List coscoSupplierexitSuppliers = coscoSupplierexitSupplierMapper.selectCoscoSupplierexitSupplierList(coscoSupplierexitSupplier); + for(CoscoSupplierexitSupplier coscoSupplierexitSupplier1 : coscoSupplierexitSuppliers){ //查询该供应商是否还有准入的品类数据 - CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); - Integer countNum2 = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory2); - if(countNum2 == 0){//别的部门也没有品类了 - //修改注册信息表状态 - CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); - coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId()); - coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); - coscoSupplierBase.setUpdateBy("1"); - coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + CoscoAccessSupplierCategory coscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + coscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); + Integer countNum = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory); + if(countNum == 0){//说明当前部门下没有品类了 + //查询该供应商是否还有准入的品类数据 + CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); + coscoAccessSupplierCategory2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + Integer countNum2 = coscoAccessSupplierCategoryMapper.selectCount(coscoAccessSupplierCategory2); + if(countNum2 == 0){//别的部门也没有品类了 + //修改供应商注册信息表状态 + CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId()); + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoSupplierBase.setUpdateBy("1"); + coscoSupplierBase.setUpdateTime(date); + coscoSupplierBase.setLastUpdateTime(date); + coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + } + //修改准入供应商关联表状态 + CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); + coscoAccessSupplier2.setDeptId(coscoSupplierexit.getDeptId()); + coscoAccessSupplier2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); + coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); + coscoAccessSupplierMapper.updateCoscoAccessSupplierBySupplierIdAndDeptId(coscoAccessSupplier2); } - //修改准入供应商表状态 - CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); - coscoAccessSupplier2.setDeptId(coscoSupplierexit.getDeptId()); - coscoAccessSupplier2.setSupplierId(coscoSupplierexitSupplier1.getSupplierId()); - coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); - coscoAccessSupplierMapper.updateCoscoAccessSupplierBySupplierIdAndDeptId(coscoAccessSupplier2); } } - return true; + //所有退出的品类发给消息 + coscoSupplierExitSupplierCategoryVo.setCoscoSupplierexitSupplierCategoryList(categoryList); + + coscoSupplierExitSupplierCategoryVo.setApproveStatus(vo.getApproveStatus()); + return coscoSupplierExitSupplierCategoryVo; } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java index 72032f3..74eecb5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java @@ -2,9 +2,13 @@ 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.common.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; 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.ICoscoAccessSupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -23,8 +27,6 @@ public class SupplierSyncTask { @Autowired private CoscoSupplierBaseMapper coscoSupplierBaseMapper; - @Autowired - private ICoscoMessageService coscoMessageService; @Autowired private CoscoAccessSupplierMapper coscoAccessSupplierMapper; @@ -35,15 +37,20 @@ public class SupplierSyncTask { @Autowired private CoscoSupplierQualificationsMapper coscoSupplierQualificationsMapper; + @Autowired + private ICoscoAccessSupplierService coscoAccessSupplierService; + + + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); //营业执照 // 每天凌晨1点检查（生产环境推荐） @Scheduled(cron = "0 0 1 * * ?") + //@Scheduled(fixedRate = 5000) @Transactional public void reportCurrentTimeYyzz(){ - System.out.println("开始执行供应商数据同步任务: " + System.currentTimeMillis()); CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); @@ -56,13 +63,13 @@ public class SupplierSyncTask { long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate); if (daysRemaining == 30) { - sendNotificationYyzz(supplier, "30天到期提醒", supplier.getLicenceDate(),"营业执照"); + coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining); } else if (daysRemaining == 15) { - sendNotificationYyzz(supplier, "15天到期紧急提醒", supplier.getLicenceDate(),"营业执照"); + coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining); } else if (daysRemaining == 7) { - sendNotificationYyzz(supplier, "7天到期最后通牒", supplier.getLicenceDate(),"营业执照"); + coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining); } else if (daysRemaining == 0) { - sendNotificationYyzz(supplier, "营业执照已过期！", supplier.getLicenceDate(),"营业执照"); + coscoAccessSupplierService.sendNotificationYyzz(supplier, supplier.getLicenceDate(),daysRemaining); removeSupplier(supplier); } }); @@ -71,12 +78,12 @@ public class SupplierSyncTask { //资质信息 // 每天凌晨1点检查（生产环境推荐） @Scheduled(cron = "0 0 1 * * ?") + //@Scheduled(fixedRate = 5000) @Transactional public void reportCurrentTimeZzxx(){ - System.out.println("开始执行供应商数据同步任务: " + System.currentTimeMillis()); CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); - + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); suppliers.forEach(supplier -> { CoscoSupplierQualifications coscoSupplierQualifications = new CoscoSupplierQualifications(); @@ -85,55 +92,39 @@ public class SupplierSyncTask { coscoSupplierQualifications1.forEach(qualifications -> { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - LocalDate expiryDate = parseDate(sdf.format(qualifications.getTermOfValidity())); + + String termOfValidity = sdf.format(qualifications.getTermOfValidity()); + LocalDate expiryDate = parseDate(termOfValidity); if (expiryDate == null) return; LocalDate today = LocalDate.now(); long daysRemaining = ChronoUnit.DAYS.between(today, expiryDate); if (daysRemaining == 30) { - sendNotificationZzxx(supplier,qualifications, "30天到期提醒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining); } else if (daysRemaining == 15) { - sendNotificationZzxx(supplier,qualifications,"15天到期紧急提醒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining); } else if (daysRemaining == 7) { - sendNotificationZzxx(supplier,qualifications,"7天到期最后通牒", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining); } else if (daysRemaining == 0) { - sendNotificationZzxx(supplier,qualifications,"营业执照已过期！", sdf.format(qualifications.getTermOfValidity()),"资质信息"); + coscoAccessSupplierService.sendNotificationZzxx(supplier,qualifications,termOfValidity,daysRemaining); } }); }); } - //添加推送数据 - private void sendNotificationYyzz(CoscoSupplierBase supplier, String title, String endTime,String type) { - //1.准入单位提示语：您的准入的XXX供应商营业执照将于XXX日到期 - //2.供应商提示语：您的企业营业执照将于XXX日到期，请及时更新 - // - //供应商营业执照过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送营业执照过期提示系统信息，分别发送准入单位及供应商 - //coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商营业执照将于"+endTime+"日到期",type); - // coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业营业执照将于"+endTime+"日到期，请及时更新",type); - } - - private void sendNotificationZzxx(CoscoSupplierBase supplier,CoscoSupplierQualifications qualifications ,String title, String endTime,String type) { - //1.准入单位提示语：您的准入的XXX供应商XXX资质将于XXX日到期 - //2.供应商提示语：您的企业XXX资质将于XXX日到期，请及时更新 - // - //供应商资质过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送资质过期提示系统信息，分别发送准入单位及供应商 - //coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商"+qualifications.getName()+"资质将于"+endTime+"日到期",type); - //coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业"+qualifications.getName()+"资质将于"+endTime+"日到期，请及时更新",type); - } //移除供应商所有信息 @Transactional public void removeSupplier(CoscoSupplierBase supplier) { + Date date = CoscoDateUtils.getNowDate(); //修改注册信息表状态 CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(supplier.getId()); coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); - coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierBase.setUpdateTime(date); + coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); //修改准入供应商表状态 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java new file mode 100644 index 0000000..4e04082 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierBaseVo.java @@ -0,0 +1,34 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications; +import lombok.Data; + +import java.util.List; + +@Data +public class CoscoSupplierBaseVo { + /** + * 供应商id + */ + private String supplierId; + + //供应商名 + private String supplierName; + + + /** + * 供应商准入的所有部门 + */ + List coscoAccessSupplierList; + + //到期时间 + String endTime; + + //剩余天数 + Long daysRemaining; + + //资质信息 + String qualificationsName; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java new file mode 100644 index 0000000..3f47067 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java @@ -0,0 +1,22 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory; +import lombok.Data; + +import java.util.List; + +@Data +public class CoscoSupplierExitSupplierCategoryVo { + + /** + * 供应商id集合 + */ + List coscoSupplierexitSupplierCategoryList; + + /** + * 审批状态 + */ + Long approveStatus; + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java new file mode 100644 index 0000000..825f0c9 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/UserItmeMessageVo.java @@ -0,0 +1,17 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexitSupplierCategory; +import lombok.Data; + +import java.util.List; + +@Data +public class UserItmeMessageVo { + + /** + * 人员集合 + */ + List coscoAccessUserList; + +} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml index 0e6b457..19bdcd8 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml @@ -7,17 +7,32 @@ + - select s.`name` as supplierName,a.access_work_id, a.supplier_id from cosco_access_supplier a - left join cosco_supplier_base s on a.supplier_id = s.id + SELECT + s.`name` AS supplierName, + a.access_work_id, + a.supplier_id, + a.dept_id + FROM + cosco_access_supplier a + LEFT JOIN cosco_supplier_base s ON a.supplier_id = s.id