查询等相关bug修改

cert
anthonywj 2 years ago
parent 039b137ddd
commit 830b985865

@ -121,5 +121,4 @@ public class userPersonController {
} }
} }

@ -36,8 +36,11 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
if (filterUserComapanyRequest == null) { if (filterUserComapanyRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if (filterUserComapanyRequest.getPage() != null) {
int offset = (filterUserComapanyRequest.getPage() - 1) * filterUserComapanyRequest.getLimit(); int offset = (filterUserComapanyRequest.getPage() - 1) * filterUserComapanyRequest.getLimit();
PageHelper.offsetPage(offset, filterUserComapanyRequest.getLimit()); PageHelper.offsetPage(offset, filterUserComapanyRequest.getLimit());
}
List<UserCompanyEntity> data = userCompanyMapper.filterCompanyName(filterUserComapanyRequest); List<UserCompanyEntity> data = userCompanyMapper.filterCompanyName(filterUserComapanyRequest);
return data; return data;
} }

@ -19,7 +19,7 @@ public class TraceProductDetailService extends ServiceImpl<TraceRecordDetailMapp
public TraceProductDetailEntity findUniqueByCode(Integer traceType, String udiCode) { public TraceProductDetailEntity findUniqueByCode(Integer traceType, String udiCode) {
List<TraceProductDetailEntity> traceRecordDetailEntities = traceRecordDetailMapper.selectList(new QueryWrapper<TraceProductDetailEntity>() List<TraceProductDetailEntity> traceRecordDetailEntities = traceRecordDetailMapper.selectList(new QueryWrapper<TraceProductDetailEntity>()
.eq("traceType", traceType) .eq("traceType", traceType)
.eq("udiCode", udiCode).last("limit 1")); .likeLeft("udiCode", udiCode).last("limit 1"));
if (CollUtil.isNotEmpty(traceRecordDetailEntities)) if (CollUtil.isNotEmpty(traceRecordDetailEntities))
return traceRecordDetailEntities.get(0); return traceRecordDetailEntities.get(0);
else return null; else return null;

@ -189,7 +189,7 @@ public class UdiTraceService {
pushMq(inoutTaskNotity, companyId); pushMq(inoutTaskNotity, companyId);
} }
if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成 // if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
//列出需要查询推送企业 //列出需要查询推送企业
List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId()); List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
if (CollUtil.isNotEmpty(traceOrderEntities)) { if (CollUtil.isNotEmpty(traceOrderEntities)) {
@ -207,16 +207,16 @@ public class UdiTraceService {
UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum)); UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId()); TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
if (taskNoticeEntity == null) { if (taskNoticeEntity == null) {
taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId); taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, userCompanyEntity.getId());
pushDelayExpireTask(taskNoticeEntity); pushDelayExpireTask(taskNoticeEntity);
pushMq(taskNoticeEntity, companyId); pushMq(taskNoticeEntity, userCompanyEntity.getId());
} else if (taskNoticeEntity.getStatus() == 4) { } else if (taskNoticeEntity.getStatus() == 4) {
//任务超时未处理,重新推送消息 //任务超时未处理,重新推送消息
pushMq(taskNoticeEntity, companyId); pushMq(taskNoticeEntity, userCompanyEntity.getId());
}
} }
} }
} }
// }
} }

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: dev active: pro
jmx: jmx:
enabled: false enabled: false
servlet: servlet:

@ -90,6 +90,9 @@
DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]> ]]>
</if> </if>
<if test="unionCode != '' and unionCode != null">
AND nameCode LIKE concat(#{unionCode}, '%')
</if>
<if test="unionFilterStr != '' and unionFilterStr != null"> <if test="unionFilterStr != '' and unionFilterStr != null">
or p.cpmctymc LIKE concat('%', #{unionFilterStr}, '%') or p.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
or p.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%') or p.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')

Loading…
Cancel
Save