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

bug修改，推送nameCode不匹配

Browse Source
cert
anthonywj 2 years ago
parent 27b4acadc8
commit 290357a4cd
2 changed files with 139 additions and 108 deletions
Show Stats Download Patch File Download Diff File

65
src/main/java/com/glxp/api/service/trace/UdiTraceService.java
Unescape Escape View File

@ -162,15 +162,18 @@ public class UdiTraceService {
List<String> certNums = toCorpCreditNums.stream().distinct().collect(Collectors.toList());
for (String certNum : certNums) {
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum.trim()));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(2, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(2, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理，重新推送消息
pushMq(taskNoticeEntity, userCompanyEntity.getId());
if (userCompanyEntity != null) {
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(2, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(2, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理，重新推送消息
pushMq(taskNoticeEntity, userCompanyEntity.getId());
}
}
}
}
}
@ -190,32 +193,32 @@ public class UdiTraceService {
}
// if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
//列出需要查询推送企业
List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
if (CollUtil.isNotEmpty(traceOrderEntities)) {
List<String> toCorpCreditNums = new ArrayList<>();
for (TraceOrderEntity traceOrderEntity : traceOrderEntities) {
if (StrUtil.isNotEmpty(traceOrderEntity.getToCorpCreditNum())) {
toCorpCreditNums.add(traceOrderEntity.getToCorpCreditNum());
}
if (StrUtil.isNotEmpty(traceOrderEntity.getFromCorpCreditNum())) {
toCorpCreditNums.add(traceOrderEntity.getFromCorpCreditNum());
}
//列出需要查询推送企业
List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
if (CollUtil.isNotEmpty(traceOrderEntities)) {
List<String> toCorpCreditNums = new ArrayList<>();
for (TraceOrderEntity traceOrderEntity : traceOrderEntities) {
if (StrUtil.isNotEmpty(traceOrderEntity.getToCorpCreditNum())) {
toCorpCreditNums.add(traceOrderEntity.getToCorpCreditNum());
}
List<String> certNums = toCorpCreditNums.stream().distinct().collect(Collectors.toList());
for (String certNum : certNums) {
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理，重新推送消息
pushMq(taskNoticeEntity, userCompanyEntity.getId());
}
if (StrUtil.isNotEmpty(traceOrderEntity.getFromCorpCreditNum())) {
toCorpCreditNums.add(traceOrderEntity.getFromCorpCreditNum());
}
}
List<String> certNums = toCorpCreditNums.stream().distinct().collect(Collectors.toList());
for (String certNum : certNums) {
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理，重新推送消息
pushMq(taskNoticeEntity, userCompanyEntity.getId());
}
}
}
// }
}

182
src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml
Unescape Escape View File

@ -57,7 +57,7 @@
left join user_company uc on bur.companyIdFk = uc.id
<where>
<if test="companyIdFk != '' and companyIdFk != null">
AND companyIdFk=#{companyIdFk}
AND companyIdFk = #{companyIdFk}
</if>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -93,11 +93,21 @@
<if test="unionCode != '' and unionCode != null">
AND nameCode LIKE concat(#{unionCode}, '%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode = #{nameCode}
</if>
<if test="unionFilterStr != '' and unionFilterStr != null">
or p.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
or p.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
or p.ggxh LIKE concat('%', #{unionFilterStr}, '%')
or p.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
or p.cpmctymc LIKE concat('%', #{unionFilterStr}
, '%')
or p.ylqxzcrbarmc LIKE concat('%'
, #{unionFilterStr}
, '%')
or p.ggxh LIKE concat('%'
, #{unionFilterStr}
, '%')
or p.zczbhhzbapzbh LIKE concat('%'
, #{unionFilterStr}
, '%')
</if>
<if test="unionCode != '' and unionCode != null">
AND nameCode = #{unionCode}
@ -108,60 +118,62 @@
<select id="filterBasicList" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.BasicUdiRelResponse">
select bur.*,sm.*,sc.*,
uc.companyName,
nameCode,
packRatio,
packLevel,
bhxjsl,
bhzxxsbzsl,
zxxsbzbhsydysl,
bhxjcpbm,
sjcpbm,
bzcj,
thirdProductNo,
thirdProductName,
addType,
deviceRecordKey,
isUseDy,
cpmctymc,
cplb,
flbm,
ggxh,
qxlb,
tyshxydm,
ylqxzcrbarmc,
zczbhhzbapzbh,
ylqxzcrbarywmc,
sydycpbs,
versionNumber,
diType,
scbssfbhph,
scbssfbhxlh,
scbssfbhscrq,
scbssfbhsxrq,
ybbm,
spmc,
cphhhbh,
cpms,
cpbsbmtxmc,
cplx,
hchzsb,
sfwblztlcp,
cgzmraqxgxx,
sfbjwycxsy,
zdcfsycs,
sfwwjbz,
syqsfxyjxmj,
qtxxdwzlj,
mjfs,
p.measname,
p.manufactory
select bur.*,
sm.*,
sc.*,
uc.companyName,
nameCode,
packRatio,
packLevel,
bhxjsl,
bhzxxsbzsl,
zxxsbzbhsydysl,
bhxjcpbm,
sjcpbm,
bzcj,
thirdProductNo,
thirdProductName,
addType,
deviceRecordKey,
isUseDy,
cpmctymc,
cplb,
flbm,
ggxh,
qxlb,
tyshxydm,
ylqxzcrbarmc,
zczbhhzbapzbh,
ylqxzcrbarywmc,
sydycpbs,
versionNumber,
diType,
scbssfbhph,
scbssfbhxlh,
scbssfbhscrq,
scbssfbhsxrq,
ybbm,
spmc,
cphhhbh,
cpms,
cpbsbmtxmc,
cplx,
hchzsb,
sfwblztlcp,
cgzmraqxgxx,
sfbjwycxsy,
zdcfsycs,
sfwwjbz,
syqsfxyjxmj,
qtxxdwzlj,
mjfs,
p.measname,
p.manufactory
FROM basic_udi_rel bur
left JOIN basic_udi_product p on bur.uuid = p.uuid
left join user_company uc on bur.companyIdFk = uc.id
left join sup_manufacturer sm on uc.id=sm.manufacturerId
left join sup_company sc on sm.customerId=sc.customerId
left JOIN basic_udi_product p on bur.uuid = p.uuid
left join user_company uc on bur.companyIdFk = uc.id
left join sup_manufacturer sm on uc.id = sm.manufacturerId
left join sup_company sc on sm.customerId = sc.customerId
<where>
<if test="companyIdFk != '' and companyIdFk != null">
AND bur.companyIdFk = #{companyIdFk}
@ -175,50 +187,66 @@
<select id="filterCompanyList" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.BasicUdiRelResponse">
SELECT sup_manufacturer.* ,user_company.companyName as supName
<if test="productStatus!=null">
,(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as failCout,
(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as passCout
SELECT sup_manufacturer.*,
user_company.companyName as supName
<if test="productStatus != null">
,
(SELECT count(*)
FROM sup_product
WHERE sup_manufacturer.customerId = sup_product.customerId
AND sup_product.auditStatus != 0
AND sup_product.auditStatus != 1
AND sup_product.auditStatus != 4
AND sup_manufacturer.manufacturerId = sup_product.manufacturerIdFk) as failCout,
(SELECT count(*)
FROM sup_product
WHERE sup_manufacturer.customerId = sup_product.customerId
AND (sup_product.auditStatus = 1 OR sup_product.auditStatus = 4)
AND sup_manufacturer.manufacturerId = sup_product.manufacturerIdFk) as passCout
</if>
FROM sup_manufacturer
inner join user_company on sup_manufacturer.customerId = user_company.customerId
inner join user_company on sup_manufacturer.customerId = user_company.customerId
<where>
<if test="id != null and id != '' and type==null">
<if test="id != null and id != '' and type == null">
and id = #{id}
</if>
<if test="manufacturerId != null and manufacturerId != ''">
and manufacturerId = #{manufacturerId}
</if>
<if test="companyName != null and companyName != ''">
and sup_manufacturer.companyName like concat('%',#{companyName},'%')
and sup_manufacturer.companyName like concat('%', #{companyName}, '%')
</if>
<if test="creditCode != null and creditCode != ''">
and creditCode like concat('%',#{creditCode},'%')
and creditCode like concat('%', #{creditCode}, '%')
</if>
<if test="placeArea != null and placeArea != ''">
and placeArea like concat('%',#{placeArea},'%')
and placeArea like concat('%', #{placeArea}, '%')
</if>
<if test="customerId != null and customerId != ''">
and sup_manufacturer.customerId = #{customerId}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
<if test="auditStatus != null and auditStatus != 20 and auditStatus != 21 and auditStatus != 22">
and sup_manufacturer.auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus=5 or
sup_manufacturer.auditStatus=2)
<if test="auditStatus == 20">
and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus = 5 or
sup_manufacturer.auditStatus = 2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ sup_manufacturer.auditStatus <> 0 ]]>
<if test="auditStatus == 21">
and <![CDATA[ sup_manufacturer.auditStatus <> 0
]]>
</if>
<if test="auditStatus ==22">
and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
<if test="auditStatus == 22">
and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus = 4)
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(sup_manufacturer.updateTime, '%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(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S') >=
DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="type != null">
and id != #{id}

Write Preview
Loading…
Cancel
Save