物资字典代码迁移，新增国家库同步到外网查询
anthonywj
2 years ago
parent
a0d6f3cc06
commit
bd7fd9691a
@ -0,0 +1,86 @@
|
|||||||
|
package com.glxp.api.res.basic;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class CompanyProductRelevanceResponse {
|
||||||
|
|
||||||
|
private int id;
|
||||||
|
private Integer rlId;
|
||||||
|
private String thirdId;
|
||||||
|
private String thirdName;
|
||||||
|
private String uuid;
|
||||||
|
private String originUuid;
|
||||||
|
private String nameCode;
|
||||||
|
private String packLevel;
|
||||||
|
private String packRatio;
|
||||||
|
private Integer bhxjsl;
|
||||||
|
private Integer bhzxxsbzsl;
|
||||||
|
private Integer zxxsbzbhsydysl;
|
||||||
|
private String bhxjcpbm;
|
||||||
|
private String sjcpbm; //
|
||||||
|
private String bzcj;
|
||||||
|
private String deviceRecordKey;
|
||||||
|
private int isUseDy;
|
||||||
|
private String cpmctymc;
|
||||||
|
private String cplb;
|
||||||
|
private String flbm;
|
||||||
|
private String ggxh;
|
||||||
|
private String qxlb;
|
||||||
|
private String tyshxydm;
|
||||||
|
private String ylqxzcrbarmc;
|
||||||
|
private String zczbhhzbapzbh;
|
||||||
|
private String ylqxzcrbarywmc;
|
||||||
|
private String sydycpbs;
|
||||||
|
private int versionNumber;
|
||||||
|
private int diType;
|
||||||
|
|
||||||
|
private String thirdId1;
|
||||||
|
private String thirdId2;
|
||||||
|
private String thirdId3;
|
||||||
|
private String thirdId4;
|
||||||
|
private String thirdName1;
|
||||||
|
private String thirdName2;
|
||||||
|
private String thirdName3;
|
||||||
|
private String thirdName4;
|
||||||
|
|
||||||
|
private String ybbm;
|
||||||
|
private String sptm;
|
||||||
|
private String manufactory;
|
||||||
|
private String measname;
|
||||||
|
private Boolean isDisable;
|
||||||
|
private long customerId;
|
||||||
|
|
||||||
|
private String auditStatus;
|
||||||
|
private Boolean isLock;
|
||||||
|
private Integer lockStatus;
|
||||||
|
private String companyName;
|
||||||
|
private String mainId;
|
||||||
|
private String mainName;
|
||||||
|
private Boolean isAdavence;
|
||||||
|
|
||||||
|
private String scbssfbhph;
|
||||||
|
private String scbssfbhxlh;
|
||||||
|
private String scbssfbhscrq;
|
||||||
|
private String scbssfbhsxrq;
|
||||||
|
private String cpms;
|
||||||
|
private String supName;
|
||||||
|
private boolean allowNoBatch;
|
||||||
|
private boolean allowNoExpire;
|
||||||
|
private boolean allowNoProduct;
|
||||||
|
private boolean allowNoSerial;
|
||||||
|
private String spmc;
|
||||||
|
private Integer productType;
|
||||||
|
private String price;
|
||||||
|
|
||||||
|
//产品代理商
|
||||||
|
private String cpdls;
|
||||||
|
private String basicPrductRemak1;
|
||||||
|
private String basicPrductRemak2;
|
||||||
|
private String basicPrductRemak3;
|
||||||
|
private String basicPrductRemak4;
|
||||||
|
private String basicPrductRemak5;
|
||||||
|
private String basicPrductRemak6;
|
||||||
|
private String basicPrductRemak7;
|
||||||
|
private String basicPrductRemak8;
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
package com.glxp.api.service.basic;
|
||||||
|
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
|
||||||
|
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||||
|
import com.glxp.api.res.basic.CompanyProductRelevanceResponse;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface CompanyProductRelevanceService extends IService<CompanyProductRelevanceEntity> {
|
||||||
|
|
||||||
|
List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
|
||||||
|
|
||||||
|
boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
|
||||||
|
|
||||||
|
boolean deleteById(String id);
|
||||||
|
|
||||||
|
boolean deleteByRlId(String id);
|
||||||
|
|
||||||
|
boolean isExitByRelId(String relId);
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package com.glxp.api.service.basic.impl;
|
||||||
|
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
|
||||||
|
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
|
||||||
|
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||||
|
import com.glxp.api.res.basic.CompanyProductRelevanceResponse;
|
||||||
|
import com.glxp.api.service.basic.CompanyProductRelevanceService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProductRelevanceDao, CompanyProductRelevanceEntity>
|
||||||
|
implements CompanyProductRelevanceService {
|
||||||
|
@Resource
|
||||||
|
CompanyProductRelevanceDao companyProductRelevanceDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest) {
|
||||||
|
if (basicInstrumentMaintainRequest == null) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
if (basicInstrumentMaintainRequest.getPage() != null) {
|
||||||
|
int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit();
|
||||||
|
PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit());
|
||||||
|
}
|
||||||
|
|
||||||
|
List<CompanyProductRelevanceResponse> data = companyProductRelevanceDao.filterUdiGp(basicInstrumentMaintainRequest);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
|
||||||
|
return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteById(String id) {
|
||||||
|
return companyProductRelevanceDao.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteByRlId(String id) {
|
||||||
|
return companyProductRelevanceDao.deleteByRlId(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isExitByRelId(String relId) {
|
||||||
|
return companyProductRelevanceDao.exists(new QueryWrapper<CompanyProductRelevanceEntity>().eq("udiRlIdFk", relId));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,226 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
|
|
||||||
|
<mapper namespace="com.glxp.api.dao.basic.CompanyProductRelevanceDao">
|
||||||
|
<insert id="insertCompanyProductRelevance"
|
||||||
|
parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity">
|
||||||
|
replace
|
||||||
|
INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
|
||||||
|
createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
|
||||||
|
price)
|
||||||
|
values (#{customerId},
|
||||||
|
#{productId},
|
||||||
|
#{enterpriseId},
|
||||||
|
#{registrationId},
|
||||||
|
#{createTime},
|
||||||
|
#{updateTime},
|
||||||
|
#{auditStatus},
|
||||||
|
#{productUuid},
|
||||||
|
#{udiRlIdFk},
|
||||||
|
#{unitFk}, #{price})
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
|
||||||
|
<insert id="importCompanyProductRelevance"
|
||||||
|
parameterType="com.glxp.api.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})
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
<delete id="deleteById" parameterType="Map">
|
||||||
|
DELETE
|
||||||
|
FROM company_product_relevance
|
||||||
|
WHERE id = #{id}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
|
||||||
|
<delete id="deleteByRlId" parameterType="Map">
|
||||||
|
DELETE
|
||||||
|
FROM company_product_relevance
|
||||||
|
WHERE udiRlIdFk = #{id}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<select id="filterUdiGp" parameterType="com.glxp.api.req.basic.CompanyProductRelevanceRequest"
|
||||||
|
resultType="com.glxp.api.res.basic.CompanyProductRelevanceResponse">
|
||||||
|
SELECT company_product_relevance.id,
|
||||||
|
company_product_relevance.customerId,
|
||||||
|
company_product_relevance.auditStatus,
|
||||||
|
basic_udirel.thirdId,
|
||||||
|
basic_udirel.id rlId,
|
||||||
|
basic_udirel.isUseDy,
|
||||||
|
basic_udirel.isLock,
|
||||||
|
basic_udirel.thirdId1,
|
||||||
|
basic_udirel.thirdId2,
|
||||||
|
basic_udirel.thirdId3,
|
||||||
|
basic_udirel.thirdId4,
|
||||||
|
basic_udirel.lockStatus,
|
||||||
|
basic_products.allowNoBatch,
|
||||||
|
basic_products.allowNoExpire,
|
||||||
|
basic_products.allowNoProduct,
|
||||||
|
basic_products.allowNoSerial,
|
||||||
|
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_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.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
|
||||||
|
<where>
|
||||||
|
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
|
||||||
|
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="cpmctymc != '' and cpmctymc != null">
|
||||||
|
AND cpmctymc LIKE concat(#{cpmctymc}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="nameCode != '' and nameCode != null">
|
||||||
|
AND nameCode LIKE concat(#{nameCode}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="ggxh != '' and ggxh != null">
|
||||||
|
AND ggxh LIKE concat('%', #{ggxh}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="unionCode != '' and unionCode != null">
|
||||||
|
and (
|
||||||
|
nameCode LIKE concat('%', #{unionCode}, '%')
|
||||||
|
or basic_products.ybbm LIKE concat('%', #{unionCode}, '%')
|
||||||
|
or basic_products.sptm LIKE concat('%', #{unionCode}, '%')
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
<if test="thrPiId != '' and thrPiId != null">
|
||||||
|
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}, '%')
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
<if test="uuid != '' and uuid != null">
|
||||||
|
AND basic_udirel.uuid = #{uuid}
|
||||||
|
</if>
|
||||||
|
<if test="thirdId != '' and thirdId != null">
|
||||||
|
AND thirdId = #{thirdId}
|
||||||
|
</if>
|
||||||
|
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
|
||||||
|
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="diType != '' and diType != null">
|
||||||
|
AND diType = #{diType}
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 1">
|
||||||
|
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
|
||||||
|
thirdId3 <![CDATA[<>]]> '' or 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 mainId is NULL
|
||||||
|
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 4">
|
||||||
|
AND thirdId1 is NULL
|
||||||
|
and basic_products.flbm <![CDATA[<>]]> ''
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 5">
|
||||||
|
AND thirdId2 is NULL
|
||||||
|
and basic_products.flbm <![CDATA[<>]]> ''
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 6">
|
||||||
|
AND thirdId3 is NULL
|
||||||
|
and basic_products.flbm <![CDATA[<>]]> ''
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 7">
|
||||||
|
AND thirdId4 is NULL
|
||||||
|
and basic_products.flbm <![CDATA[<>]]> ''
|
||||||
|
</if>
|
||||||
|
<if test="filterType != null and filterType == 10">
|
||||||
|
AND basic_udirel.updateTime is NULL
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="customerId != '' and customerId != null">
|
||||||
|
AND company_product_relevance.customerId = #{customerId}
|
||||||
|
</if>
|
||||||
|
<if test="auditStatus != '' and auditStatus != null">
|
||||||
|
AND company_product_relevance.auditStatus = #{auditStatus}
|
||||||
|
</if>
|
||||||
|
<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>
|
||||||
|
<if test="isAdavence != '' and isAdavence != null">
|
||||||
|
AND basic_udirel.isAdavence = #{isAdavence}
|
||||||
|
</if>
|
||||||
|
<if test="unitFk != null and unitFk != ''">
|
||||||
|
and unitFk = #{unitFk}
|
||||||
|
</if>
|
||||||
|
<if test="originUuid != null and originUuid != ''">
|
||||||
|
and originUuid = #{originUuid}
|
||||||
|
</if>
|
||||||
|
<if test="isDisable == false">
|
||||||
|
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
ORDER BY company_product_relevance.updateTime DESC
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue