From 35aa3ae068b5e000619e1adc2103fd345edf3cc8 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Fri, 27 Jun 2025 16:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/supplier/common/CoscoBaseEntity.java | 23 - .../dao/mapper/CoscoCategoryMapper.xml | 2 +- .../CoscoAccessWorkCategoryController.java | 2 - .../controller/CoscoAccessWorkController.java | 10 +- .../controller/CoscoMessageController.java | 9 - .../CoscoSupplierBankController.java | 8 - .../CoscoSupplierBaseController.java | 122 +++-- .../CoscoSupplierChangeApplyController.java | 23 - .../CoscoSupplierInvoiceController.java | 12 +- ...CoscoSupplierQualificationsController.java | 12 +- ...coSupplierSurveyAttachmentsController.java | 12 +- .../CoscoSupplierexitController.java | 6 +- .../CoscoSurveyQuestionController.java | 4 +- .../CoscoAccessSupplierCategoryMapper.java | 1 - .../dao/mapper/CoscoAccessSupplierMapper.java | 1 - .../dao/mapper/CoscoAccessWorkMapper.java | 2 - .../dao/mapper/CoscoMessageMapper.java | 1 - .../dao/mapper/CoscoSupplierBaseMapper.java | 5 +- .../CoscoSupplierChangeApplyMapper.java | 3 - .../mapper/CoscoSupplierChangeBaseMapper.java | 2 - .../CoscoSupplierChangeInvoiceMapper.java | 4 - .../mapper/CoscoSupplierInvoiceMapper.java | 1 - .../CoscoSupplierQualificationsMapper.java | 1 - .../CoscoSupplierSurveyAttachmentsMapper.java | 1 - ...scoSupplierexitSupplierCategoryMapper.java | 1 - .../entity/CoscoAccessCategory.java | 4 - .../coscosupplier/entity/CoscoAccessItem.java | 12 +- .../entity/CoscoAccessItemAttachments.java | 8 +- .../entity/CoscoAccessSupplier.java | 4 - .../entity/CoscoAccessSupplierCategory.java | 8 +- .../coscosupplier/entity/CoscoAccessUser.java | 8 +- .../entity/CoscoAccessUserItem.java | 8 +- .../entity/CoscoAccessUserItemVo.java | 2 - .../coscosupplier/entity/CoscoAccessWork.java | 14 +- .../entity/CoscoAccessWorkAttachments.java | 8 +- .../entity/CoscoAccessWorkCategoryVo.java | 2 - .../entity/CoscoSupplierBank.java | 6 +- .../entity/CoscoSupplierBase.java | 6 +- .../entity/CoscoSupplierChangeApply.java | 10 +- .../entity/CoscoSupplierChangeApplyVo.java | 16 +- .../entity/CoscoSupplierChangeBank.java | 3 - .../entity/CoscoSupplierChangeBase.java | 3 - .../entity/CoscoSupplierChangeHistory.java | 7 +- .../entity/CoscoSupplierChangeInvoice.java | 3 - .../CoscoSupplierChangeQualifications.java | 7 +- .../entity/CoscoSupplierDiffVo.java | 23 +- .../entity/CoscoSupplierInvoice.java | 4 +- .../entity/CoscoSupplierQualifications.java | 4 +- .../entity/CoscoSupplierSurvey.java | 4 +- .../CoscoSupplierSurveyAttachments.java | 4 +- .../CoscoSupplierSurveyQuestionReply.java | 4 +- .../entity/CoscoSupplierTianyanchaIc.java | 4 +- .../coscosupplier/entity/CoscoSupplierVo.java | 1 - .../entity/CoscoSupplierexit.java | 7 +- .../entity/CoscoSupplierexitSupplier.java | 3 - .../CoscoSupplierexitSupplierCategory.java | 3 - .../entity/CoscoSupplierexitVo.java | 1 - .../entity/CoscoSurveyQuestion.java | 8 +- .../entity/CoscoSurveyQuestionOption.java | 4 +- .../entity/InvoiceChangeDiffVo.java | 83 ---- .../entity/SupplierChangeDiffResult.java | 93 ---- .../ICoscoAccessWorkCategoryService.java | 7 +- .../service/ICoscoAccessWorkService.java | 6 +- .../service/ICoscoMessageService.java | 1 - .../service/ICoscoSupplierBankService.java | 1 - .../service/ICoscoSupplierBaseService.java | 9 +- .../ICoscoSupplierChangeApplyService.java | 19 +- .../service/ICoscoSupplierInvoiceService.java | 1 - .../ICoscoSupplierQualificationsService.java | 2 - ...CoscoSupplierSurveyAttachmentsService.java | 1 - .../service/ICoscoSupplierexitService.java | 5 +- .../impl/CoscoAccessCategoryServiceImpl.java | 4 +- ...CoscoAccessItemAttachmentsServiceImpl.java | 6 +- .../impl/CoscoAccessItemServiceImpl.java | 7 +- ...oscoAccessSupplierCategoryServiceImpl.java | 6 +- .../impl/CoscoAccessSupplierServiceImpl.java | 4 +- .../impl/CoscoAccessUserItemServiceImpl.java | 6 +- .../impl/CoscoAccessUserServiceImpl.java | 7 +- ...CoscoAccessWorkAttachmentsServiceImpl.java | 6 +- .../CoscoAccessWorkCategoryServiceImpl.java | 27 +- .../impl/CoscoAccessWorkServiceImpl.java | 252 ++++++---- .../service/impl/CoscoMessageServiceImpl.java | 6 +- .../impl/CoscoSupplierBankServiceImpl.java | 21 +- .../impl/CoscoSupplierBaseServiceImpl.java | 71 +-- .../CoscoSupplierChangeApplyServiceImpl.java | 469 +----------------- .../CoscoSupplierChangeBankServiceImpl.java | 4 +- .../CoscoSupplierChangeBaseServiceImpl.java | 4 +- ...CoscoSupplierChangeHistoryServiceImpl.java | 4 +- ...CoscoSupplierChangeInvoiceServiceImpl.java | 4 +- ...pplierChangeQualificationsServiceImpl.java | 4 +- .../impl/CoscoSupplierInvoiceServiceImpl.java | 15 +- ...oscoSupplierQualificationsServiceImpl.java | 16 +- ...oSupplierSurveyAttachmentsServiceImpl.java | 13 +- ...upplierSurveyQuestionReplyServiceImpl.java | 16 +- .../impl/CoscoSupplierSurveyServiceImpl.java | 8 +- .../CoscoSupplierTianyanchaIcServiceImpl.java | 6 +- .../impl/CoscoSupplierexitServiceImpl.java | 9 +- ...pplierexitSupplierCategoryServiceImpl.java | 4 +- .../CoscoSupplierexitSupplierServiceImpl.java | 4 +- .../CoscoSurveyQuestionOptionServiceImpl.java | 6 +- .../impl/CoscoSurveyQuestionServiceImpl.java | 6 +- .../coscosupplier/task/SupplierSyncTask.java | 57 ++- .../coscosupplier/vo/CoscoSupplierBaseVo.java | 2 - .../CoscoSupplierExitSupplierCategoryVo.java | 1 - .../coscosupplier/vo/UserItmeMessageVo.java | 1 - .../dao/mapper/CoscoSupplierBankMapper.xml | 1 + .../dao/mapper/CoscoSupplierBaseMapper.xml | 124 +++++ .../mapper/CoscoSupplierChangeBaseMapper.xml | 131 ----- .../CoscoSupplierChangeInvoiceMapper.xml | 58 --- 109 files changed, 630 insertions(+), 1469 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/InvoiceChangeDiffVo.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/SupplierChangeDiffResult.java 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 af67625..ac1659e 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 @@ -1,18 +1,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.common; -import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * Entity基类 @@ -56,9 +50,6 @@ public class CoscoBaseEntity implements Serializable @ApiModelProperty(value = "备注") private String remark; - /** 请求参数 */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map params; public String getSearchValue() { @@ -120,20 +111,6 @@ public class CoscoBaseEntity implements Serializable this.remark = remark; } - public Map getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map params) - { - this.params = params; - } - public Integer getPageNo() { return pageNo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml index a4c1617..0e328e9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml @@ -102,7 +102,7 @@ + + WHERE + id NOT IN ( + SELECT + cas.supplier_id + FROM + cosco_access_work caw + LEFT JOIN cosco_access_supplier cas ON caw.id = cas.access_work_id + WHERE + ( + caw.approve_status IS NULL + OR caw.approve_status IN ( 0, 1 )) + + AND cas.dept_id IN (#{vo.deptId}) + + ) + + and supplier_type = #{vo.supplierType} + + + and licence_accessory = #{vo.licenceAccessory} + + + and licence_date = #{vo.licenceDate} + + + and enterprise_type = #{vo.enterpriseType} + + + and name like concat('%', #{vo.name}, '%') + + + and name_en = #{vo.nameEn} + + + and social_credit_code = #{vo.socialCreditCode} + + + and `range` = #{vo.range} + + + and reg_address = #{vo.regAddress} + + + and work_address = #{vo.workAddress} + + + and parent_company_investor = #{vo.parentCompanyInvestor} + + + and legal_person = #{vo.legalPerson} + + + and id_card = #{vo.idCard} + + + and capital = #{vo.capital} + + + and contacts_name like concat('%', #{vo.contactsName}, '%') + + + and contacts_phone = #{vo.contactsPhone} + + + and contacts_type = #{vo.contactsType} + + + and contacts_email = #{vo.contactsEmail} + + + and telephone = #{telephone} + + + and nation = #{nation} + + + and vat = #{vo.vat} + + + and taxpayer_id = #{vo.taxpayerId} + + + and currency = #{vo.currency} + + + and person_name like concat('%', #{vo.personName}, '%') + + + and person_phone = #{vo.personPhone} + + + and person_bank = #{vo.personBank} + + + and person_account = #{vo.personAccount} + + + and access_status = #{vo.accessStatus} + + + and blacklist_status = #{vo.blacklistStatus} + + + and greylist_status = #{vo.greylistStatus} + + + and fillin_status = #{vo.fillinStatus} + + + and fillin_by = #{vo.fillinBy} + + + and sap_code = #{vo.sapCode} + + + and last_update_time = #{vo.lastUpdateTime} + + + order by create_time desc + + + - -