From e3473c969adf0ac9cd5618de1dbb2a252277658e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 28 Feb 2023 13:42:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9B=86=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/CompanyProductRelevanceRequest.java | 1 + .../admin/req/basic/FilterUdiInfoRequest.java | 1 + .../CompanyProductRelevanceResponse.java | 5 + .../info/CompanyProductRelevanceDao.xml | 293 +++++++++++------- 4 files changed, 191 insertions(+), 109 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java index 740c2e1..0b06cf4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java @@ -48,4 +48,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String unitFk; private String corpId; private String billType; + private Boolean groupBuy; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java index 67c0126..2250713 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java @@ -62,5 +62,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String companyName; private String supId; + private Boolean groupBuy; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java index e1acf16..ce37247 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java @@ -82,4 +82,9 @@ public class CompanyProductRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + + + private boolean dispatch; //是否可配送 + private boolean groupBuy; //是否集采产品 + } diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml index 67b4707..c59beed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -2,23 +2,25 @@ - - select - company_product_relevance.id,company_product_relevance.customerId,company_product_relevance.auditStatus, - basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.id rlId, - basic_udirel.isUseDy, basic_udirel.isLock, - basic_udirel.thirdId1,basic_udirel.thirdId2, - basic_udirel.thirdId3,basic_udirel.thirdId4, - basic_udirel.thirdName1,basic_udirel.thirdName2, - basic_udirel.thirdName3,basic_udirel.thirdName4, - basic_udirel.ybbm,basic_udirel.sptm, - basic_udirel.manufactory,basic_udirel.measname,basic_udirel.lockStatus,basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct,basic_products.productType, - basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, - basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm, - basic_products.bzcj,basic_products.addType,basic_udirel.isDisable, - basic_products.deviceRecordKey,basic_products.cpmctymc, - basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb, - basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, - basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, - customer_info.companyName, - basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.cpdls, - basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price,basic_products.spmc - ,basic_products.basicPrductRemak1 - ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 - ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 + select company_product_relevance.id, + company_product_relevance.customerId, + company_product_relevance.auditStatus, + basic_udirel.thirdId, + basic_udirel.thirdName, + basic_udirel.id rlId, + basic_udirel.isUseDy, + basic_udirel.isLock, + basic_udirel.thirdId1, + basic_udirel.thirdId2, + basic_udirel.thirdId3, + basic_udirel.thirdId4, + basic_udirel.thirdName1, + basic_udirel.thirdName2, + basic_udirel.thirdName3, + basic_udirel.thirdName4, + basic_udirel.ybbm, + basic_udirel.sptm, + basic_udirel.manufactory, + basic_udirel.measname, + basic_udirel.lockStatus, + basic_udirel.dispatch, + basic_udirel.groupBuy, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.productType, + basic_products.nameCode, + basic_products.packRatio, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.addType, + basic_udirel.isDisable, + basic_products.deviceRecordKey, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.uuid, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + customer_info.companyName, + basic_udirel.mainId, + basic_udirel.mainName, + basic_udirel.isAdavence, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.cpdls, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.originUuid, + company_product_relevance.price, + basic_products.spmc + , + basic_products.basicPrductRemak1 + , + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6 + , + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8 FROM company_product_relevance - inner JOIN basic_udirel - ON company_product_relevance.udiRlIdFk = basic_udirel.id - inner JOIN basic_products - ON basic_udirel.uuid = basic_products.uuid - inner JOIN customer_info on customer_info.customerId = company_product_relevance.customerId + inner JOIN basic_udirel + ON company_product_relevance.udiRlIdFk = basic_udirel.id + inner JOIN basic_products + ON basic_udirel.uuid = basic_products.uuid + inner JOIN customer_info on customer_info.customerId = company_product_relevance.customerId - AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') + AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') - AND cpmctymc LIKE concat(#{cpmctymc},'%') + AND cpmctymc LIKE concat(#{cpmctymc}, '%') - AND nameCode LIKE concat(#{nameCode},'%') + AND nameCode LIKE concat(#{nameCode}, '%') - AND ggxh LIKE concat('%',#{ggxh},'%') + AND ggxh LIKE concat('%', #{ggxh}, '%') and ( - nameCode LIKE concat('%',#{unionCode},'%') - or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') - or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') - ) + nameCode LIKE concat('%', #{unionCode}, '%') + or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%') + or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%') + ) and ( - thirdId LIKE concat('%',#{thrPiId},'%') - or thirdId1 LIKE concat('%',#{thrPiId},'%') - or thirdId2 LIKE concat('%',#{thrPiId},'%') - or thirdId3 LIKE concat('%',#{thrPiId},'%') - or thirdId4 LIKE concat('%',#{thrPiId},'%') - ) + thirdId LIKE concat('%', #{thrPiId}, '%') + or thirdId1 LIKE concat('%', #{thrPiId}, '%') + or thirdId2 LIKE concat('%', #{thrPiId}, '%') + or thirdId3 LIKE concat('%', #{thrPiId}, '%') + or thirdId4 LIKE concat('%', #{thrPiId}, '%') + ) AND basic_udirel.uuid = #{uuid} @@ -98,33 +147,38 @@ AND thirdId = #{thirdId} - AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%') + AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') - AND diType =#{diType} + AND diType = #{diType} AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '' ) + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' AND basic_products.originUuid is NULL - AND mainId is NULL and basic_products.originUuid ]]> '' + AND mainId is NULL + and basic_products.originUuid ]]> '' - AND thirdId1 is NULL and basic_products.flbm ]]> '' + AND thirdId1 is NULL + and basic_products.flbm ]]> '' - AND thirdId2 is NULL and basic_products.flbm ]]> '' + AND thirdId2 is NULL + and basic_products.flbm ]]> '' - AND thirdId3 is NULL and basic_products.flbm ]]> '' + AND thirdId3 is NULL + and basic_products.flbm ]]> '' - AND thirdId4 is NULL and basic_products.flbm ]]> '' + AND thirdId4 is NULL + and basic_products.flbm ]]> '' AND basic_udirel.updateTime is NULL @@ -152,7 +206,11 @@ and unitFk = #{unitFk} - AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false ) + AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) + + + + and basic_udirel.groupBuy = #{groupBuy} ORDER BY updateTime DESC @@ -185,7 +243,8 @@ - SELECT * FROM company_product_relevance + SELECT * + FROM company_product_relevance and customerId = #{customerId} @@ -219,26 +279,46 @@ and unitFk = #{unitFk} - - UPDATE company_product_relevance - customerId=#{customerId}, - name=#{name}, - tel=#{tel}, - phone=#{phone}, - create_time=#{create_time}, - update_time=#{update_time}, - auditStatus=#{auditStatus}, - productUuid=#{productUuid}, - udiRlIdFk=#{udiRlIdFk}, - unitFk=#{unitFk}, - price=#{price}, + + customerId=#{customerId}, + + + name=#{name}, + + + tel=#{tel}, + + + phone=#{phone}, + + + create_time=#{create_time}, + + + update_time=#{update_time}, + + + auditStatus=#{auditStatus}, + + + productUuid=#{productUuid}, + + + udiRlIdFk=#{udiRlIdFk}, + + + unitFk=#{unitFk}, + + + price=#{price}, + WHERE id = #{id} @@ -246,41 +326,37 @@ replace - INTO company_product_relevance(customerId,productId,enterpriseId,registrationId, - create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk,price) values - ( - #{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{create_time}, - #{update_time}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk},#{price} - ) + INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + create_time, update_time, auditStatus, productUuid, udiRlIdFk, unitFk, price) + values (#{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, #{price}) replace - INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId, - create_time,update_time,auditStatus,productUuid,udiRlIdFk,unitFk,price) values - ( - #{id}, - #{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{create_time}, - #{update_time}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk},#{price} - ) + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, + create_time, update_time, auditStatus, productUuid, udiRlIdFk, unitFk, price) + values (#{id}, + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, #{price}) @@ -295,5 +371,4 @@ FROM company_product_relevance WHERE udiRlIdFk = #{id} - - \ No newline at end of file +