From 7942594c3c06b2e3bba9a8e071369a0a1694e848 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Tue, 24 Jun 2025 11:48:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/constant/EvaluateTaskConstant.java | 4 + .../controller/SynchronousController.java | 12 +- .../coscoBlack/dao/CoscoBlacklistMapper.java | 7 + .../dao/mapper/CoscoBlacklistMapper.xml | 10 + .../service/ICoscoBlacklistService.java | 7 + .../impl/CoscoBlacklistServiceImpl.java | 51 +- .../supplier/coscoBlack/vo/BecomeDueVo.java | 20 + .../vo/AddCoscoCategoryLibraryVo.java | 8 +- .../CoscoEvaluateTaskController.java | 13 + .../CoscoEvaluateTaskSupplierController.java | 6 + .../dao/CoscoEvaluateTaskMapper.java | 6 + .../dao/mapper/CoscoEvaluateTaskMapper.xml | 72 +- .../mapper/CoscoEvaluateTemplateMapper.xml | 29 +- .../entity/CoscoEvaluateTask.java | 11 + .../entity/CoscoEvaluateTemplate.java | 2 + .../service/ICoscoEvaluateTaskService.java | 18 + .../ICoscoEvaluateTaskSupplierService.java | 2 + .../impl/CoscoEvaluateTaskServiceImpl.java | 32 + .../CoscoEvaluateTaskSupplierServiceImpl.java | 67 +- .../impl/ScheduledTasksServiceImpl.java | 19 + .../vo/CoscoEvaluateTaskListVo.java | 10 + .../CoscoSupplierBaseController.java | 31 +- .../dao/mapper/CoscoSupplierBaseMapper.java | 9 +- .../service/ICoscoSupplierBaseService.java | 5 +- .../impl/CoscoSupplierBaseServiceImpl.java | 7 +- .../coscosupplier/vo/SupplierPageVo.java | 54 + .../controller/DictProjectController.java | 95 ++ .../supplier/dict/dao/DictProjectMapper.java | 71 ++ .../dict/dao/mapper/DictProjectMapper.xml | 180 +++ .../supplier/dict/entity/DictProject.java | 53 + .../dict/service/IDictProjectService.java | 69 ++ .../service/impl/DictProjectServiceImpl.java | 98 ++ .../zyhy/ebtp/supplier/util/DateUtils.java | 3 +- .../dao/mapper/CoscoSupplierBaseMapper.xml | 1020 +++++++++-------- 34 files changed, 1566 insertions(+), 535 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java index 777ff88..eb13d1f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/EvaluateTaskConstant.java @@ -9,4 +9,8 @@ public interface EvaluateTaskConstant { * 开启权重 */ public static final Long EVALUATE_TASK_WEIGHT_STATUS_YD = 1L; + /** + * Indicator_type + */ + public static final String INDICATOR_TYPE_ND = "Indicator_type"; } 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 de6d7be..731158d 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 @@ -7,6 +7,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddCoscoEvaluateTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierChangeApply; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit; @@ -43,6 +45,8 @@ public class SynchronousController { @Autowired private ICoscoSupplierBaseService coscoSupplierBaseService; + @Autowired + private ICoscoEvaluateTaskService coscoEvaluateTaskService; @@ -116,7 +120,13 @@ public class SynchronousController { return BaseResponse.success(coscoSupplierBaseService.updateCoscoSupplierBase(vo)); } - + /** + * 供应商评价审核审批回调接口 + */ + @PostMapping("/evaluateApprove") + public BaseResponse evaluateApprove(@RequestBody AddCoscoEvaluateTaskVo vo) { + return BaseResponse.success(coscoEvaluateTaskService.evaluateApprove(vo)); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistMapper.java index 85092e3..78e1235 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/CoscoBlacklistMapper.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo; import io.lettuce.core.dynamic.annotation.Param; @@ -78,4 +79,10 @@ public interface CoscoBlacklistMapper { * @return */ CoscoBlacklist selectByWorkFlowId(String workFlowId); + + /** + * 查询到期供应商 + * @return + */ + List selectBecomeDue(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml index 9cfffe8..01018ca 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml @@ -229,5 +229,15 @@ FROM cosco_blacklist cb + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java index 89bb110..1a12e6c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo; @@ -95,4 +96,10 @@ public interface ICoscoBlacklistService { * @return */ int restoreSubmit(AddBlackListVo listVo); + + /** + * 获取到期供应商 + * @return + */ + List selectBecomeDue(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index ef677ac..e7b378c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -4,24 +4,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklist; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistSupplierService; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; import com.chinaunicom.zyhy.ebtp.supplier.util.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -50,7 +51,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { @Override public BlackListInfoVo selectCoscoBlacklistById(String id) { CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectCoscoBlacklistById(id); - BlackListInfoVo vo =new BlackListInfoVo(); + BlackListInfoVo vo = new BlackListInfoVo(); vo.setId(coscoBlacklist.getId()); vo.setBlacklistReason(coscoBlacklist.getBlacklistReason()); vo.setBacklistType(coscoBlacklist.getBacklistType()); @@ -58,8 +59,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier(); coscoBlacklistSupplier.setBlacklistId(id); List coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); - List supperList=new ArrayList<>(); - coscoBlacklistSuppliers.forEach(cosupplier ->{ + List supperList = new ArrayList<>(); + coscoBlacklistSuppliers.forEach(cosupplier -> { supperList.add(cosupplier.getSupplierId()); }); vo.setSupplierList(coscoSupplierBaseMapper.selectSupplierByIds(supperList)); @@ -136,7 +137,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { public IPage getPage(BlackListVo template) { IPage p = new Page<>(template.getBasePageRequest().getPageNo(), template.getBasePageRequest().getPageSize()); - return coscoBlacklistMapper.selectPage(p,template); + return coscoBlacklistMapper.selectPage(p, template); } @Override @@ -146,6 +147,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { CoscoBlacklist coscoBlacklist = new CoscoBlacklist(); coscoBlacklist.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT); coscoBlacklist.setId(listVo.getId()); + + coscoBlacklist.setWorkFlowId(PropertyUtils.getSnowflakeId()); return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); @@ -153,10 +156,11 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { /** * 恢复审批提交 + * * @param listVo * @return */ - public int restoreSubmit(AddBlackListVo listVo){ + public int restoreSubmit(AddBlackListVo listVo) { CoscoBlacklist coscoBlacklist = new CoscoBlacklist(); coscoBlacklist.setRestoreApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT); coscoBlacklist.setId(listVo.getId()); @@ -165,37 +169,41 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { return coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); } + @Override + public List selectBecomeDue() { + return coscoBlacklistMapper.selectBecomeDue(); + } + @Override @Transactional(rollbackFor = Exception.class) public int receiveApprove(CoscoBlacklist list) { CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId()); - if(CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())){ + if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) { coscoBlacklist.setApproveStatus(list.getApproveStatus()); coscoBlacklist.setStartTime(new Date()); //获取加入黑名单时间 - coscoBlacklist.setEndTime(DateUtils.plusYears(5)); + coscoBlacklist.setEndTime(DateUtils.plusYears(Integer.parseInt(coscoBlacklist.getTimelimitType()))); coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); - if(CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())){ + if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) { CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier(); coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId()); List coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); - coscoBlacklistSuppliers.forEach(cosupplier ->{ + coscoBlacklistSuppliers.forEach(cosupplier -> { //判断黑名单 - if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){ + if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(cosupplier.getSupplierId()); coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); } //判断灰名单 - if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){ + if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(cosupplier.getSupplierId()); coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); } }); - } } return 0; @@ -204,23 +212,25 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { @Override public int blacklistRestoreApprove(CoscoBlacklist list) { CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getRestoreWorkFlowId()); - if(CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getRestoreApproveStatus())){ + if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getRestoreApproveStatus())) { coscoBlacklist.setRestoreApproveStatus(list.getRestoreApproveStatus()); - coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); - if(CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())){ + if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) { CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier(); coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId()); List coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); - coscoBlacklistSuppliers.forEach(cosupplier ->{ + //获取添加时限 + DictProject dictProject = new DictProject(); + dictProject.setParentCode(EvaluateTaskConstant.INDICATOR_TYPE_ND); + coscoBlacklistSuppliers.forEach(cosupplier -> { //判断黑名单 - if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){ + if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(cosupplier.getSupplierId()); coscoSupplierBase.setBlacklistStatus(CoscoCategoryConstant.ISTRUE); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); } //判断灰名单 - if(coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)){ + if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(cosupplier.getSupplierId()); coscoSupplierBase.setGreylistStatus(CoscoCategoryConstant.ISTRUE); @@ -229,6 +239,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { }); } + coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist); } return 0; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java new file mode 100644 index 0000000..35145d1 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java @@ -0,0 +1,20 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo; + +import lombok.Data; + +@Data +public class BecomeDueVo { + /** + * 部门id + */ + private String deptId; + /** + * 供应商名称 + */ + private String name; + /** + * 创建人 + */ + private String creater; + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibraryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibraryVo.java index d81e3d4..8c691d1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibraryVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/AddCoscoCategoryLibraryVo.java @@ -8,8 +8,12 @@ import java.util.List; @Data public class AddCoscoCategoryLibraryVo extends CoscoCategoryLibrary { - + /** + * 品类信息 + */ private List categoryIds; - + /** + * 附件信息 + */ private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java index 8e834c8..77af5f0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java @@ -91,6 +91,19 @@ public class CoscoEvaluateTaskController extends BaseController { return BaseResponse.success(coscoEvaluateTaskService.addTask(addCoscoEvaluateTaskVo)); } + /** + * 提交供应商评价任务 + * @param addCoscoEvaluateTaskVo + * @return + */ + @PostMapping("/submit") + public BaseResponse submit(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskService.selectById(addCoscoEvaluateTaskVo.getId()); + if(coscoEvaluateTask.getApproveStatus()!=null){ + return BaseResponse.fail("任务已提交"); + } + return BaseResponse.success(coscoEvaluateTaskService.submit(addCoscoEvaluateTaskVo)); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java index bf085be..d165f15 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java @@ -36,6 +36,12 @@ public class CoscoEvaluateTaskSupplierController extends BaseController { } + @GetMapping("/getScoreResult") + public BaseResponse getScoreResult(String id) { + return BaseResponse.success(coscoEvaluateTaskSupplierService.getScoreResult(id)); + } + + /** * 获取【供应商评价_评价任务关联供应商表】详细信息 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java index 395a19d..03bc55d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java @@ -74,4 +74,10 @@ public interface CoscoEvaluateTaskMapper { * @return */ List selectCloseTask(); + + /** + * 根据工作流id查询评价任务信息 + * @param workFlowId + */ + CoscoEvaluateTask selectByWorkFlowId(String workFlowId); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index 10776ef..7a2e670 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -25,11 +25,17 @@ + + + + select id, evaluate_theme, + approve_status, + work_flow_id, dept_id, evaluate_year, start_time, @@ -103,10 +109,66 @@ + + + + + + + @@ -103,8 +108,28 @@ getTaskPage(TaskPageVo taskListVo); + /** + * 根据id查询数据 + * @param id + * @return + */ + CoscoEvaluateTask selectById(String id); + + /** + * 提交任务到oa + * @param addCoscoEvaluateTaskVo + * @return + */ + int submit(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo); + + /** + * 供应商评价审核审批回调接口 + */ + int evaluateApprove(AddCoscoEvaluateTaskVo vo); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskSupplierService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskSupplierService.java index b119522..4e0fe48 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskSupplierService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTaskSupplierService.java @@ -69,4 +69,6 @@ public interface ICoscoEvaluateTaskSupplierService { IPage getSupplierDimension(SupplierDimensionVo vo); IPage getPage(CoscoEvaluateTaskSupplier taskListVo); + + Object getScoreResult(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index cf402d7..aebb3f8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; @@ -79,6 +80,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo.setWeightDept(coscoEvaluateTask.getWeightDept()); addCoscoEvaluateTaskVo.setWeightValue(coscoEvaluateTask.getWeightValue()); addCoscoEvaluateTaskVo.setStatus(coscoEvaluateTask.getStatus()); + addCoscoEvaluateTaskVo.setTemplateName(coscoEvaluateTask.getTemplateName()); + addCoscoEvaluateTaskVo.setCategoryName(coscoEvaluateTask.getCategoryName()); //获取项目列表及用户信息 CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier(); coscoEvaluateTaskSupplier.setEvaluateTaskId(id); @@ -205,6 +208,35 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { return coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo); } + @Override + public CoscoEvaluateTask selectById(String id) { + return coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(id); + } + + /** + * 任务提交 + * @param addCoscoEvaluateTaskVo + * @return + */ + @Override + public int submit(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + addCoscoEvaluateTaskVo.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_WAIT); + addCoscoEvaluateTaskVo.setUpdateTime(new Date()); + addCoscoEvaluateTaskVo.setWorkFlowId(PropertyUtils.getSnowflakeId()); + return coscoEvaluateTaskMapper.updateCoscoEvaluateTask(addCoscoEvaluateTaskVo); + } + + /** + * 供应商评价审核审批回调接口 + */ + @Override + public int evaluateApprove(AddCoscoEvaluateTaskVo vo) { + CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId()); + coscoEvaluateTask.setApproveStatus(vo.getApproveStatus()); + coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask); + return 0; + } + /** * 添加任务 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java index 5c0aedd..ae74003 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java @@ -1,16 +1,19 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierMapper; -import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService; /** @@ -23,6 +26,16 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTa public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskSupplierService { @Autowired private CoscoEvaluateTaskSupplierMapper coscoEvaluateTaskSupplierMapper; + @Autowired + private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper; + @Autowired + private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + @Autowired + private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper; + @Autowired + private CoscoEvaluateScoringResultMapper coscoEvaluateScoringResultMapper; + @Autowired + private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper; /** * 查询【供应商评价_评价任务关联供应商表】 @@ -94,6 +107,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS /** * 供应商维度评价列表 + * * @param vo * @return */ @@ -110,4 +124,49 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS taskListVo.getBasePageRequest().getPageSize()); return coscoEvaluateTaskSupplierMapper.getPage(p, taskListVo); } + + @Override + public TaskIndicatorBaseVo getScoreResult(String id) { + CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierById(id); + CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplier.getEvaluateTaskId()); + BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplier.getSupplierId()); + TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo(); + taskIndicatorBaseVo.setName(baseCategoryNameVo.getName()); + taskIndicatorBaseVo.setCategory(baseCategoryNameVo.getCategoryName()); + List taskIndicatorVo = new ArrayList<>(); + CoscoEvaluateScoringResult result = new CoscoEvaluateScoringResult(); + result.setEvaluateTaskSupplierId(id); + List coscoEvaluateScoringResults = coscoEvaluateScoringResultMapper.selectCoscoEvaluateScoringResultList(result); + CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd = new CoscoEvaluateTemplateIndicatorNd(); + coscoEvaluateTemplateIndicatorNd.setTemplateId(coscoEvaluateTask.getTemplateId()); + List coscoEvaluateTemplateIndicatorNds = coscoEvaluateTemplateIndicatorNdMapper.selectCoscoEvaluateTemplateIndicatorNdList(coscoEvaluateTemplateIndicatorNd); + CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt = new CoscoEvaluateTemplateIndicatorSt(); + coscoEvaluateTemplateIndicatorSt.setTemplateId(coscoEvaluateTask.getTemplateId()); + List coscoEvaluateTemplateIndicatorSts = + coscoEvaluateTemplateIndicatorStMapper.selectCoscoEvaluateTemplateIndicatorStList(coscoEvaluateTemplateIndicatorSt); + coscoEvaluateTemplateIndicatorSts.forEach(st -> { + List collect = coscoEvaluateTemplateIndicatorNds.stream().filter(scoring -> scoring.getIndicatorStId().equals(st.getId())).collect(Collectors.toList()); + List subIndicator = new ArrayList<>(); + for (CoscoEvaluateTemplateIndicatorNd evaluateTemplateIndicatorNd : collect) { + TaskSubIndicatorVo vo = new TaskSubIndicatorVo(); + vo.setId(evaluateTemplateIndicatorNd.getId()); + vo.setSubIndicator(evaluateTemplateIndicatorNd.getSubIndicator()); + vo.setSubScore(evaluateTemplateIndicatorNd.getScore()); + vo.setStarIndicator(evaluateTemplateIndicatorNd.getIsStar()); + List collect1 = coscoEvaluateScoringResults.stream().filter(scoring -> scoring.getIndicatorNdId().equals(evaluateTemplateIndicatorNd.getId())).collect(Collectors.toList()); + if (collect1.size() > 0) { + vo.setScoreNum(collect1.get(0).getIndicatorScore().toString()); + } + subIndicator.add(vo); + } + TaskIndicatorVo vo = new TaskIndicatorVo(); + vo.setBaseIndicator(st.getBaseIndicator()); + vo.setIndicatorDesc(st.getDescIndicator()); + vo.setScore(st.getScore()); + vo.setSubIndicator(subIndicator); + taskIndicatorVo.add(vo); + }); + taskIndicatorBaseVo.setTaskIndicatorVo(taskIndicatorVo); + return taskIndicatorBaseVo; + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 4612422..43715c3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.service.ICoscoBlacklistService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ScheduledTasksService; @@ -33,6 +35,9 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { @Autowired private CoscoEvaluateTaskDeptWeightMapper coscoEvaluateTaskDeptWeightMapper; + @Autowired + private ICoscoBlacklistService coscoBlacklistService; + /** * 定时任务查看待开启的任务。如果时间小于当前时间那么开启任务 */ @@ -165,4 +170,18 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { coscoEvaluateScoringResult.setCreateTime(new Date()); coscoEvaluateScoringResults.add(coscoEvaluateScoringResult); } + + + /** + * 黑名单到期提醒 + */ + @Scheduled(cron = "0 0 2 * * ?") + public void blacklistExpire() { + //黑名单到期提醒 + List becomeDueVos = coscoBlacklistService.selectBecomeDue(); + //添加消息 + becomeDueVos.forEach(becomeDueVo ->{ + + }); + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java index c779106..579257d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java @@ -50,6 +50,16 @@ public class CoscoEvaluateTaskListVo { * 评价名称 */ private String statusName; + + /** + * 审批状态(0.待审批、1.审批通过、2.审批未通过) + */ + private String approveStatus; + + /** + * 审批状态名称 + */ + private String approveStatusName; @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } 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 d0df9a2..b9e365a 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 @@ -1,28 +1,18 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; -import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; /** @@ -49,6 +39,14 @@ public class CoscoSupplierBaseController extends BaseController { return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); } + /** + * 分页查询已准入的供应商给用户进行选择 + */ + @PostMapping("/getSupplierPage") + public BaseResponse> getSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody SupplierPageVo supplierPageVo) { + return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierPageVo)); + } + /** * 供应商注册 @@ -134,15 +132,4 @@ public class CoscoSupplierBaseController extends BaseController { } - /** - * 获取选择供应商信息 - * @return 返回结果 - */ - @ApiOperation("查询分页数据") - @PostMapping("/getSupplierPage") - public BaseResponse> getSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody BlackSupplierVo supplierVo) { - - return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierVo)); - } - } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java index f099de9..75c6e02 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java @@ -5,6 +5,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.data.repository.query.Param; import java.util.List; @@ -81,5 +82,11 @@ public interface CoscoSupplierBaseMapper { */ List selectSupplierByIds(List supperList); - IPage getSupplierPage(IPage page, @Param("vo") BlackSupplierVo vo); + /** + * 查询选择人员 + * @param page + * @param vo + * @return + */ + IPage getSupplierPage(IPage page, @Param("vo") SupplierPageVo vo); } 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 6c44ca0..5bd0e23 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 @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import java.util.List; @@ -67,8 +68,8 @@ public interface ICoscoSupplierBaseService { /** * 获取选择供应商信息 - * @param supplierVo + * @param supplierPageVo * @return */ - IPage getSupplierPage(BlackSupplierVo supplierVo); + IPage getSupplierPage(SupplierPageVo supplierPageVo); } 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 91a48db..3796ffa 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,6 +15,7 @@ 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.common.CoscoDateUtils; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -410,9 +411,9 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { } @Override - public IPage getSupplierPage(BlackSupplierVo supplierVo) { - IPage page = new Page<>(supplierVo.getBasePageRequest().getPageNo(), supplierVo.getBasePageRequest().getPageSize()); + public IPage getSupplierPage(SupplierPageVo supplierPageVo) { + IPage page = new Page<>(supplierPageVo.getBasePageRequest().getPageNo(), supplierPageVo.getBasePageRequest().getPageSize()); - return coscoSupplierBaseMapper.getSupplierPage(page ,supplierVo); + return coscoSupplierBaseMapper.getSupplierPage(page ,supplierPageVo); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java new file mode 100644 index 0000000..67cee2a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -0,0 +1,54 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; + +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class SupplierPageVo { + + /** 供应商ID */ + private String id; + + /** 供应商名称 */ + private String name; + + /** 部门ID */ + private String deptId; + + /** + * 部门名称 + */ + private String deptName; + /** + * 公司名称 + */ + private String companyName; + + /** 准入时间 */ + private Date admissionTime; + + /** 所属品类（多个以逗号分隔） */ + private String categoryName; + + /** 最新评价等级 */ + private String levelName; + + /** 最新评价时间 */ + private Date evaluationTime; + + /** + * 黑名单部门list + */ + private List blackListDept; + /** + * 查询部门list + */ + private List deptList; + + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java new file mode 100644 index 0000000..52dd81e --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java @@ -0,0 +1,95 @@ +package com.chinaunicom.zyhy.ebtp.supplier.dict.controller; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskPageVo; +import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; +import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 项目字典Controller + * + * @author ruoyi + * @date 2025-06-23 + */ +@RestController +@RequestMapping("/cosco/dictProject") +public class DictProjectController extends BaseController { + @Autowired + private IDictProjectService dictProjectService; + + /** + * 顶级列表查询 + * @param dictProject + * @return + */ + @PostMapping("/getTopLevelList") + public BaseResponse> getTopLevelList(@RequestBody DictProject dictProject){ + dictProject.setParentCode("/"); + return BaseResponse.success(dictProjectService.getPage(dictProject)); + } + + /** + * 二级列表查询 + * @param dictProject + * @return + */ + @PostMapping("/getSecondaryList") + public BaseResponse> getSecondaryList(@RequestBody DictProject dictProject){ + return BaseResponse.success(dictProjectService.getPage(dictProject)); + } + + + /** + * 获取所有列表 + * @param parentCode + * @return + */ + @GetMapping("/getAllList/{parentCode}") + public BaseResponse getAllList(@PathVariable String parentCode) { + DictProject dictProject = new DictProject(); + dictProject.setParentCode(parentCode); + List list = dictProjectService.selectDictProjectList(dictProject); + return BaseResponse.success(list); + } + + + + /** + * 获取项目字典详细信息 + */ + @GetMapping(value = "/{id}") + public BaseResponse getInfo(@PathVariable("id") Long id) { + return BaseResponse.success(dictProjectService.selectDictProjectById(id)); + } + + /** + * 新增项目字典 + */ + @PostMapping + public BaseResponse add(@RequestBody DictProject dictProject) { + return BaseResponse.success(dictProjectService.insertDictProject(dictProject)); + } + + /** + * 修改项目字典 + */ + @PutMapping + public BaseResponse edit(@RequestBody DictProject dictProject) { + return BaseResponse.success(dictProjectService.updateDictProject(dictProject)); + } + + /** + * 删除项目字典 + */ + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable Long[] ids) { + return BaseResponse.success(dictProjectService.deleteDictProjectByIds(ids)); + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java new file mode 100644 index 0000000..7c20697 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java @@ -0,0 +1,71 @@ +package com.chinaunicom.zyhy.ebtp.supplier.dict.dao; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +/** + * 项目字典Mapper接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface DictProjectMapper { + /** + * 查询项目字典 + * + * @param id 项目字典主键 + * @return 项目字典 + */ + public DictProject selectDictProjectById(Long id); + + /** + * 查询项目字典列表 + * + * @param dictProject 项目字典 + * @return 项目字典集合 + */ + public List selectDictProjectList(DictProject dictProject); + + /** + * 新增项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + public int insertDictProject(DictProject dictProject); + + /** + * 修改项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + public int updateDictProject(DictProject dictProject); + + /** + * 删除项目字典 + * + * @param id 项目字典主键 + * @return 结果 + */ + public int deleteDictProjectById(Long id); + + /** + * 批量删除项目字典 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDictProjectByIds(Long[] ids); + + /** + * 列表信息 + * @param p + * @param vo + * @return + */ + IPage selectPage(IPage p,@Param("vo") DictProject vo); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml new file mode 100644 index 0000000..b2069ad --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + select id, + code, + dic_name, + parent_code, + parent_type, + default_flag, + use_flag, + order_flag, + description, + dict_type_code, + dict_type_name + from dict_project + + + + + + + + + + insert into dict_project + + code, + dic_name, + parent_code, + parent_type, + default_flag, + use_flag, + order_flag, + description, + dict_type_code, + dict_type_name, + + + #{code}, + #{dicName}, + #{parentCode}, + #{parentType}, + #{defaultFlag}, + #{useFlag}, + #{orderFlag}, + #{description}, + #{dictTypeCode}, + #{dictTypeName}, + + + + insert into dict_project + ( id, code, dic_name, parent_code, parent_type, default_flag, use_flag, order_flag, description, dict_type_code, + dict_type_name) + values + + ( #{item.id}, #{item.code}, #{item.dicName}, #{item.parentCode}, #{item.parentType}, #{item.defaultFlag}, + #{item.useFlag}, #{item.orderFlag}, #{item.description}, #{item.dictTypeCode}, #{item.dictTypeName}) + + + + update dict_project + + code = + #{code}, + + dic_name = + #{dicName}, + + parent_code = + #{parentCode}, + + parent_type = + #{parentType}, + + default_flag = + #{defaultFlag}, + + use_flag = + #{useFlag}, + + order_flag = + #{orderFlag}, + + description = + #{description}, + + dict_type_code = + #{dictTypeCode}, + + dict_type_name = + #{dictTypeName}, + + + where id = #{id} + + + + update dict_project + set del_flag = 2 + where id = #{id} + + + + update dict_project set del_flag = 2 where id in + + #{id} + + + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java new file mode 100644 index 0000000..92b20fe --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java @@ -0,0 +1,53 @@ +package com.chinaunicom.zyhy.ebtp.supplier.dict.entity; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目字典对象 dict_project + * + * @author ruoyi + * @date 2025-06-23 + */ +@Data +public class DictProject extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long id; + + /** 字典code */ + private String code; + + /** 字典名称 */ + private String dicName; + + /** 父类code */ + private String parentCode; + + /** 父类类型 */ + private String parentType; + + /** 是否默认 */ + private String defaultFlag; + + /** 是否应用 */ + private String useFlag; + + /** 排序 */ + private Long orderFlag; + + /** 描述 */ + private String description; + + /** 分组编码 */ + private String dictTypeCode; + + /** 分组名称 */ + private String dictTypeName; + + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java new file mode 100644 index 0000000..298552a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java @@ -0,0 +1,69 @@ +package com.chinaunicom.zyhy.ebtp.supplier.dict.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; + +import java.util.List; + +/** + * 项目字典Service接口 + * + * @author ruoyi + * @date 2025-06-23 + */ +public interface IDictProjectService { + /** + * 查询项目字典 + * + * @param id 项目字典主键 + * @return 项目字典 + */ + public DictProject selectDictProjectById(Long id); + + /** + * 查询项目字典列表 + * + * @param dictProject 项目字典 + * @return 项目字典集合 + */ + public List selectDictProjectList(DictProject dictProject); + + /** + * 新增项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + public int insertDictProject(DictProject dictProject); + + /** + * 修改项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + public int updateDictProject(DictProject dictProject); + + /** + * 批量删除项目字典 + * + * @param ids 需要删除的项目字典主键集合 + * @return 结果 + */ + public int deleteDictProjectByIds(Long[] ids); + + /** + * 删除项目字典信息 + * + * @param id 项目字典主键 + * @return 结果 + */ + public int deleteDictProjectById(Long id); + + /** + * 顶级列表 + * @param dictProject + * @return + */ + IPage getPage(DictProject dictProject); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java new file mode 100644 index 0000000..843cac9 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java @@ -0,0 +1,98 @@ +package com.chinaunicom.zyhy.ebtp.supplier.dict.service.impl; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo; +import com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictProjectMapper; +import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject; +import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目字典Service业务层处理 + * + * @author ruoyi + * @date 2025-06-23 + */ +@Service +public class DictProjectServiceImpl implements IDictProjectService { + @Autowired + private DictProjectMapper dictProjectMapper; + + /** + * 查询项目字典 + * + * @param id 项目字典主键 + * @return 项目字典 + */ + @Override + public DictProject selectDictProjectById(Long id) { + return dictProjectMapper.selectDictProjectById(id); + } + + /** + * 查询项目字典列表 + * + * @param dictProject 项目字典 + * @return 项目字典 + */ + @Override + public List selectDictProjectList(DictProject dictProject) { + return dictProjectMapper.selectDictProjectList(dictProject); + } + + /** + * 新增项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + @Override + public int insertDictProject(DictProject dictProject) { + return dictProjectMapper.insertDictProject(dictProject); + } + + /** + * 修改项目字典 + * + * @param dictProject 项目字典 + * @return 结果 + */ + @Override + public int updateDictProject(DictProject dictProject) { + return dictProjectMapper.updateDictProject(dictProject); + } + + /** + * 批量删除项目字典 + * + * @param ids 需要删除的项目字典主键 + * @return 结果 + */ + @Override + public int deleteDictProjectByIds(Long[] ids) { + return dictProjectMapper.deleteDictProjectByIds(ids); + } + + /** + * 删除项目字典信息 + * + * @param id 项目字典主键 + * @return 结果 + */ + @Override + public int deleteDictProjectById(Long id) { + return dictProjectMapper.deleteDictProjectById(id); + } + + @Override + public IPage getPage(DictProject dictProject) { + IPage p = new Page<>(dictProject.getBasePageRequest().getPageNo(), + dictProject.getBasePageRequest().getPageSize()); + return dictProjectMapper.selectPage(p, dictProject); + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java index ffa4f09..23805b6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java @@ -8,8 +8,7 @@ public class DateUtils { public static Date plusYears(int year){ LocalDate currentDate = LocalDate.now(); // 获取当前日期 - int yearsToAdd = 5; // 要添加的年数 - LocalDate futureDate = currentDate.plusYears(yearsToAdd); // 加年限 + LocalDate futureDate = currentDate.plusYears(year); // 加年限 return Date.from(futureDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index aba3995..69e4154 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -4,128 +4,129 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT - id, - dept_id, - supplier_type, - CASE supplier_type - WHEN 'dvs' THEN '境内企业' - WHEN 'ovs' THEN '境外企业' - WHEN 'pe' THEN '个人' - ELSE supplier_type - END AS supplier_type_cn, - licence_accessory, - licence_date, - enterprise_type, - name, - name_en, - social_credit_code, - `range`, - reg_address, - work_address, - parent_company_investor, - legal_person, - id_card, - capital, - contacts_name, - contacts_phone, - contacts_type, - contacts_email, - telephone, - nation, - vat, - taxpayer_id, - currency, - person_name, - person_phone, - person_bank, - person_account, - remark, - access_status, - CASE access_status - WHEN 0 THEN '未准入' - WHEN 1 THEN '已准入' - ELSE CAST(access_status AS CHAR) - END AS access_status_cn, - blacklist_status, - CASE blacklist_status - WHEN 0 THEN '未加入' - WHEN 1 THEN '已加入' - ELSE CAST(blacklist_status AS CHAR) - END AS blacklist_status_cn, - greylist_status, - CASE greylist_status - WHEN 0 THEN '未加入' - WHEN 1 THEN '已加入' - ELSE CAST(greylist_status AS CHAR) - END AS greylist_status_cn, - fillin_status, - CASE fillin_status - WHEN 0 THEN '否' - WHEN 1 THEN '是' - ELSE CAST(fillin_status AS CHAR) - END AS fillin_status_cn, - fillin_by, - sap_code, - create_by, - create_time, - update_by, - update_time, - last_update_time - FROM - cosco_supplier_base + SELECT id, + dept_id, + supplier_type, + CASE supplier_type + WHEN 'dvs' THEN '境内企业' + WHEN 'ovs' THEN '境外企业' + WHEN 'pe' THEN '个人' + ELSE supplier_type + END AS supplier_type_cn, + licence_accessory, + licence_date, + enterprise_type, + name, + name_en, + social_credit_code, + `range`, + reg_address, + work_address, + parent_company_investor, + legal_person, + id_card, + capital, + contacts_name, + contacts_phone, + contacts_type, + contacts_email, + telephone, + nation, + vat, + taxpayer_id, + currency, + person_name, + person_phone, + person_bank, + person_account, + remark, + access_status, + CASE access_status + WHEN 0 THEN '未准入' + WHEN 1 THEN '已准入' + ELSE CAST(access_status AS CHAR) + END AS access_status_cn, + blacklist_status, + CASE blacklist_status + WHEN 0 THEN '未加入' + WHEN 1 THEN '已加入' + ELSE CAST(blacklist_status AS CHAR) + END AS blacklist_status_cn, + greylist_status, + CASE greylist_status + WHEN 0 THEN '未加入' + WHEN 1 THEN '已加入' + ELSE CAST(greylist_status AS CHAR) + END AS greylist_status_cn, + fillin_status, + CASE fillin_status + WHEN 0 THEN '否' + WHEN 1 THEN '是' + ELSE CAST(fillin_status AS CHAR) + END AS fillin_status_cn, + fillin_by, + sap_code, + create_by, + create_time, + update_by, + update_time, + last_update_time + FROM cosco_supplier_base - and del_flag = 'normal' @@ -239,353 +240,369 @@ - and del_flag = 'normal' - - and dept_id = #{vo.deptId} - - - and supplier_type = #{supplierType} - - - and licence_accessory = #{licenceAccessory} - - - and licence_date = #{licenceDate} - - - and enterprise_type = #{enterpriseType} - - - and name like concat('%', #{name}, '%') - - - and name_en = #{nameEn} - - - and social_credit_code = #{socialCreditCode} - - - and `range` = #{range} - - - and reg_address = #{regAddress} - - - and work_address = #{workAddress} - - - and parent_company_investor = #{parentCompanyInvestor} - - - and legal_person = #{legalPerson} - - - and id_card = #{idCard} - - - and capital = #{capital} - - - and contacts_name like concat('%', #{contactsName}, '%') - - - and contacts_phone = #{contactsPhone} - - - and contacts_type = #{contactsType} - - - and contacts_email = #{contactsEmail} - - - and telephone = #{telephone} - - - and nation = #{nation} - - - and vat = #{vat} - - - and taxpayer_id = #{taxpayerId} - - - and currency = #{currency} - - - and person_name like concat('%', #{personName}, '%') - - - and person_phone = #{personPhone} - - - and person_bank = #{personBank} - - - and person_account = #{personAccount} - - - and access_status = #{accessStatus} - - - and blacklist_status = #{blacklistStatus} - - - and greylist_status = #{greylistStatus} - - - and fillin_status = #{fillinStatus} - - - and fillin_by = #{fillinBy} - - - and sap_code = #{sapCode} - - - and last_update_time = #{lastUpdateTime} - + + and dept_id = #{vo.deptId} + + + and supplier_type = #{supplierType} + + + and licence_accessory = #{licenceAccessory} + + + and licence_date = #{licenceDate} + + + and enterprise_type = #{enterpriseType} + + + and name like concat('%', #{name}, '%') + + + and name_en = #{nameEn} + + + and social_credit_code = #{socialCreditCode} + + + and `range` = #{range} + + + and reg_address = #{regAddress} + + + and work_address = #{workAddress} + + + and parent_company_investor = #{parentCompanyInvestor} + + + and legal_person = #{legalPerson} + + + and id_card = #{idCard} + + + and capital = #{capital} + + + and contacts_name like concat('%', #{contactsName}, '%') + + + and contacts_phone = #{contactsPhone} + + + and contacts_type = #{contactsType} + + + and contacts_email = #{contactsEmail} + + + and telephone = #{telephone} + + + and nation = #{nation} + + + and vat = #{vat} + + + and taxpayer_id = #{taxpayerId} + + + and currency = #{currency} + + + and person_name like concat('%', #{personName}, '%') + + + and person_phone = #{personPhone} + + + and person_bank = #{personBank} + + + and person_account = #{personAccount} + + + and access_status = #{accessStatus} + + + and blacklist_status = #{blacklistStatus} + + + and greylist_status = #{greylistStatus} + + + and fillin_status = #{fillinStatus} + + + and fillin_by = #{fillinBy} + + + and sap_code = #{sapCode} + + + and last_update_time = #{lastUpdateTime} + - + insert into cosco_supplier_base - id, - supplier_type, - licence_accessory, - licence_date, - enterprise_type, - name, - name_en, - social_credit_code, - `range`, - reg_address, - work_address, - parent_company_investor, - legal_person, - id_card, - capital, - contacts_name, - contacts_phone, - contacts_type, - contacts_email, - telephone, - nation, - vat, - taxpayer_id, - currency, - person_name, - person_phone, - person_bank, - person_account, - remark, - access_status, - blacklist_status, - greylist_status, - fillin_status, - fillin_by, - sap_code, - del_flag, - create_by, - create_time, - update_by, - update_time, - last_update_time, + id, + supplier_type, + licence_accessory, + licence_date, + enterprise_type, + name, + name_en, + social_credit_code, + `range`, + reg_address, + work_address, + parent_company_investor, + legal_person, + id_card, + capital, + contacts_name, + contacts_phone, + contacts_type, + contacts_email, + telephone, + nation, + vat, + taxpayer_id, + currency, + person_name, + person_phone, + person_bank, + person_account, + remark, + access_status, + blacklist_status, + greylist_status, + fillin_status, + fillin_by, + sap_code, + del_flag, + create_by, + create_time, + update_by, + update_time, + last_update_time, - #{id}, - #{supplierType}, - #{licenceAccessory}, - #{licenceDate}, - #{enterpriseType}, - #{name}, - #{nameEn}, - #{socialCreditCode}, - #{range}, - #{regAddress}, - #{workAddress}, - #{parentCompanyInvestor}, - #{legalPerson}, - #{idCard}, - #{capital}, - #{contactsName}, - #{contactsPhone}, - #{contactsType}, - #{contactsEmail}, - #{telephone}, - #{nation}, - #{vat}, - #{taxpayerId}, - #{currency}, - #{personName}, - #{personPhone}, - #{personBank}, - #{personAccount}, - #{remark}, - #{accessStatus}, - #{blacklistStatus}, - #{greylistStatus}, - #{fillinStatus}, - #{fillinBy}, - #{sapCode}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{lastUpdateTime}, + #{id}, + #{supplierType}, + #{licenceAccessory}, + #{licenceDate}, + #{enterpriseType}, + #{name}, + #{nameEn}, + #{socialCreditCode}, + #{range}, + #{regAddress}, + #{workAddress}, + #{parentCompanyInvestor}, + #{legalPerson}, + #{idCard}, + #{capital}, + #{contactsName}, + #{contactsPhone}, + #{contactsType}, + #{contactsEmail}, + #{telephone}, + #{nation}, + #{vat}, + #{taxpayerId}, + #{currency}, + #{personName}, + #{personPhone}, + #{personBank}, + #{personAccount}, + #{remark}, + #{accessStatus}, + #{blacklistStatus}, + #{greylistStatus}, + #{fillinStatus}, + #{fillinBy}, + #{sapCode}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{lastUpdateTime}, insert into cosco_supplier_base - ( id, supplier_type, licence_accessory, licence_date, enterprise_type, name, name_en, social_credit_code, `range`, reg_address, work_address, parent_company_investor, legal_person, id_card, capital, contacts_name, contacts_phone, contacts_type, contacts_email, telephone, nation, vat, taxpayer_id, currency, person_name, person_phone, person_bank, person_account, remark, access_status, blacklist_status, greylist_status, fillin_status, fillin_by, sap_code, del_flag, create_by, create_time, update_by, update_time, last_update_time) + ( id, supplier_type, licence_accessory, licence_date, enterprise_type, name, name_en, social_credit_code, + `range`, reg_address, work_address, parent_company_investor, legal_person, id_card, capital, contacts_name, + contacts_phone, contacts_type, contacts_email, telephone, nation, vat, taxpayer_id, currency, person_name, + person_phone, person_bank, person_account, remark, access_status, blacklist_status, greylist_status, + fillin_status, fillin_by, sap_code, del_flag, create_by, create_time, update_by, update_time, last_update_time) values - ( #{item.id}, #{item.supplierType}, #{item.licenceAccessory}, #{item.licenceDate}, #{item.enterpriseType}, #{item.name}, #{item.nameEn}, #{item.socialCreditCode}, #{item.range}, #{item.regAddress}, #{item.workAddress}, #{item.parentCompanyInvestor}, #{item.legalPerson}, #{item.idCard}, #{item.capital}, #{item.contactsName}, #{item.contactsPhone}, #{item.contactsType}, #{item.contactsEmail}, #{item.telephone}, #{item.nation}, #{item.vat}, #{item.taxpayerId}, #{item.currency}, #{item.personName}, #{item.personPhone}, #{item.personBank}, #{item.personAccount}, #{item.remark}, #{item.accessStatus}, #{item.blacklistStatus}, #{item.greylistStatus}, #{item.fillinStatus}, #{item.fillinBy}, #{item.sapCode}, #{item.delFlag}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) + ( #{item.id}, #{item.supplierType}, #{item.licenceAccessory}, #{item.licenceDate}, #{item.enterpriseType}, + #{item.name}, #{item.nameEn}, #{item.socialCreditCode}, #{item.range}, #{item.regAddress}, + #{item.workAddress}, #{item.parentCompanyInvestor}, #{item.legalPerson}, #{item.idCard}, #{item.capital}, + #{item.contactsName}, #{item.contactsPhone}, #{item.contactsType}, #{item.contactsEmail}, #{item.telephone}, + #{item.nation}, #{item.vat}, #{item.taxpayerId}, #{item.currency}, #{item.personName}, #{item.personPhone}, + #{item.personBank}, #{item.personAccount}, #{item.remark}, #{item.accessStatus}, #{item.blacklistStatus}, + #{item.greylistStatus}, #{item.fillinStatus}, #{item.fillinBy}, #{item.sapCode}, #{item.delFlag}, + #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.lastUpdateTime}) - + update cosco_supplier_base - supplier_type = - #{supplierType}, - - licence_accessory = - #{licenceAccessory}, - - licence_date = - #{licenceDate}, - - enterprise_type = - #{enterpriseType}, - - name = - #{name}, - - name_en = - #{nameEn}, - - social_credit_code = - #{socialCreditCode}, - - `range` = - #{range}, - - reg_address = - #{regAddress}, - - work_address = - #{workAddress}, - - parent_company_investor = - #{parentCompanyInvestor}, - - legal_person = - #{legalPerson}, - - id_card = - #{idCard}, - - capital = - #{capital}, - - contacts_name = - #{contactsName}, - - contacts_phone = - #{contactsPhone}, - - contacts_type = - #{contactsType}, - - contacts_email = - #{contactsEmail}, - - telephone = - #{telephone}, - - nation = - #{nation}, - - vat = - #{vat}, - - taxpayer_id = - #{taxpayerId}, - - currency = - #{currency}, - - person_name = - #{personName}, - - person_phone = - #{personPhone}, - - person_bank = - #{personBank}, - - person_account = - #{personAccount}, - - remark = - #{remark}, - - access_status = - #{accessStatus}, - - blacklist_status = - #{blacklistStatus}, - - greylist_status = - #{greylistStatus}, - - fillin_status = - #{fillinStatus}, - - fillin_by = - #{fillinBy}, - - sap_code = - #{sapCode}, - - del_flag = - #{delFlag}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - - last_update_time = - #{lastUpdateTime}, - - dept_id = - #{deptId}, - + supplier_type = + #{supplierType}, + + licence_accessory = + #{licenceAccessory}, + + licence_date = + #{licenceDate}, + + enterprise_type = + #{enterpriseType}, + + name = + #{name}, + + name_en = + #{nameEn}, + + social_credit_code = + #{socialCreditCode}, + + `range` = + #{range}, + + reg_address = + #{regAddress}, + + work_address = + #{workAddress}, + + parent_company_investor = + #{parentCompanyInvestor}, + + legal_person = + #{legalPerson}, + + id_card = + #{idCard}, + + capital = + #{capital}, + + contacts_name = + #{contactsName}, + + contacts_phone = + #{contactsPhone}, + + contacts_type = + #{contactsType}, + + contacts_email = + #{contactsEmail}, + + telephone = + #{telephone}, + + nation = + #{nation}, + + vat = + #{vat}, + + taxpayer_id = + #{taxpayerId}, + + currency = + #{currency}, + + person_name = + #{personName}, + + person_phone = + #{personPhone}, + + person_bank = + #{personBank}, + + person_account = + #{personAccount}, + + remark = + #{remark}, + + access_status = + #{accessStatus}, + + blacklist_status = + #{blacklistStatus}, + + greylist_status = + #{greylistStatus}, + + fillin_status = + #{fillinStatus}, + + fillin_by = + #{fillinBy}, + + sap_code = + #{sapCode}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + last_update_time = + #{lastUpdateTime}, + + dept_id = + #{deptId}, + where id = #{id} - update cosco_supplier_base set del_flag = 2 + update cosco_supplier_base + set del_flag = 2 where id = #{id} @@ -606,6 +623,98 @@ + -