UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

集采相关问题修改

Browse Source
busUser
anthonywj 2 years ago
parent 6a613dbb8d
commit 1741926b77
4 changed files with 191 additions and 113 deletions
Show Stats Download Patch File Download Diff File

1
api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -48,4 +48,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String corpId;
private String billType;
private Boolean groupBuy;
}

1
api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java
Unescape Escape View File

@ -62,4 +62,5 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String supId;
private Boolean groupBuy;
}

3
api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java
Unescape Escape View File

@ -83,4 +83,7 @@ public class CompanyProductRelevanceResponse {
private String basicPrductRemak7;
private String basicPrductRemak8;
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
}

299
api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -2,23 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao">
<select id="filterCompanyProductRelevance"
parameterType="com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
select * from company_product_relevance
select *
from company_product_relevance
<where>
<if test="customerId != '' and customerId!=null">
<if test="customerId != '' and customerId != null">
and customerId = #{customerId}
</if>
<if test="udiRlIdFk != '' and udiRlIdFk!=null">
<if test="udiRlIdFk != '' and udiRlIdFk != null">
and udiRlIdFk = #{udiRlIdFk}
</if>
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
ORDER BY id DESC
@ -27,70 +29,118 @@
<select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.res.info.CompanyProductRelevanceResponse">
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,
basic_corp.name companyName,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price
,basic_products.spmc, basic_products.cpdls
,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,
basic_corp.name companyName,
basic_udirel.mainId,
basic_udirel.mainName,
basic_udirel.isAdavence,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
company_product_relevance.price
,
basic_products.spmc,
basic_products.cpdls
,
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
left JOIN basic_corp on basic_corp.erpId = 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
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc},'%')
AND cpmctymc LIKE concat(#{cpmctymc}, '%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%')
AND nameCode LIKE concat(#{nameCode}, '%')
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%',#{ggxh},'%')
AND ggxh LIKE concat('%', #{ggxh}, '%')
</if>
<if test="unionCode != '' and unionCode != null">
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}, '%')
)
</if>
<if test="thrPiId != '' and thrPiId != null">
and (
basic_udirel.thirdId LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId1 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId2 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId3 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId4 LIKE concat('%',#{thrPiId},'%')
)
basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%')
)
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
@ -99,33 +149,39 @@
AND basic_udirel.thirdId = #{thirdId}
</if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%')
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if>
<if test="diType != '' and diType != null">
AND diType =#{diType}
AND diType = #{diType}
</if>
<if test="filterType != null and filterType == 1">
AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or basic_udirel.thirdId2 <![CDATA[<>]]> '' or
basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '' )
AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or
basic_udirel.thirdId2 <![CDATA[<>]]> '' or
basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND basic_udirel.thirdId is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND basic_udirel.thirdId is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND basic_udirel.thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND basic_udirel.thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND basic_udirel.thirdId2 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND basic_udirel.thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND basic_udirel.thirdId3 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND basic_udirel.thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND basic_udirel.thirdId4 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND basic_udirel.thirdId4 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 10">
AND basic_udirel.updateTime is NULL
@ -140,9 +196,6 @@
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
<if test="companyName != '' and companyName != null">
AND customer_info.companyName = #{companyName}
</if>
<if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}
</if>
@ -153,11 +206,14 @@
and unitFk = #{unitFk}
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false )
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if>
<if test="companyName != '' and companyName != null">
AND basic_corp.name = #{companyName}
</if>
<if test="groupBuy != null">
and basic_udirel.groupBuy = #{groupBuy}
</if>
</where>
ORDER BY basic_udirel.updateTime DESC
</select>
@ -189,7 +245,8 @@
<select id="findCompanyProductRelevanceByProductUuid"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT * FROM company_product_relevance
SELECT *
FROM company_product_relevance
<where>
<if test="customerId != null and customerId != ''">
and customerId = #{customerId}
@ -209,7 +266,8 @@
<select id="getCompanyProductRelevance"
parameterType="com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest"
resultType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
SELECT * FROM company_product_relevance
SELECT *
FROM company_product_relevance
<where>
<if test="customerId != null and customerId != ''">
and customerId = #{customerId}
@ -223,26 +281,46 @@
<if test="unitFk != null and unitFk != ''">
and unitFk = #{unitFk}
</if>
</where>
</select>
<update id="updateCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
UPDATE company_product_relevance
<set>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="productId != null">name=#{name},</if>
<if test="enterpriseId != null">tel=#{tel},</if>
<if test="registrationId != null">phone=#{phone},</if>
<if test="create_time != null">create_time=#{create_time},</if>
<if test="update_time != null">update_time=#{update_time},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="productUuid != null">productUuid=#{productUuid},</if>
<if test="udiRlIdFk != null">udiRlIdFk=#{udiRlIdFk},</if>
<if test="unitFk != null">unitFk=#{unitFk},</if>
<if test="price != null">price=#{price},</if>
<if test="customerId != null">
customerId=#{customerId},
</if>
<if test="productId != null">
name=#{name},
</if>
<if test="enterpriseId != null">
tel=#{tel},
</if>
<if test="registrationId != null">
phone=#{phone},
</if>
<if test="create_time != null">
create_time=#{create_time},
</if>
<if test="update_time != null">
update_time=#{update_time},
</if>
<if test="auditStatus != null">
auditStatus=#{auditStatus},
</if>
<if test="productUuid != null">
productUuid=#{productUuid},
</if>
<if test="udiRlIdFk != null">
udiRlIdFk=#{udiRlIdFk},
</if>
<if test="unitFk != null">
unitFk=#{unitFk},
</if>
<if test="price != null">
price=#{price},
</if>
</set>
WHERE id = #{id}
</update>
@ -250,41 +328,37 @@
<insert id="insertCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
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})
</insert>
<insert id="importCompanyProductRelevance"
parameterType="com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity">
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})
</insert>
<delete id="deleteById" parameterType="Map">
@ -299,5 +373,4 @@
FROM company_product_relevance
WHERE udiRlIdFk = #{id}
</delete>
</mapper>
</mapper>

Write Preview
Loading…
Cancel
Save