diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e2c3bf72..0e39a46e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -396,10 +396,10 @@ public class IoCodeTempController extends BaseController { } //是否校验产品属性 :1:校验;2.无需校验 - if(bussinessTypeEntity.getVailProductAttributes() == 1 ){ + if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { Integer purType = udiInfoEntity.getPurType(); //1:普通入账产品;2.预验收产品。3:寄售产品 int actionType = bussinessTypeEntity.getActionType(); //1:带票(正常);2.预验收。3:寄售 - if (purType != actionType){ + if (purType != actionType) { //包装友好提示 String msg = ""; switch (actionType) { @@ -425,7 +425,7 @@ public class IoCodeTempController extends BaseController { msg2 = "寄售产品"; break; } - return ResultVOUtils.error(500, "单据只允许录入" + msg +",当前录入产品为"+msg2+",请检查后重试!"); + return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试!"); } } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index 0f2b75c2..8da8ffb8 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -65,12 +65,11 @@ public class SpsSyncBasicController { udiProductEntity.setRemark(udiProductEntity.getNameCode()); udiProductEntity.setNameCode(udiRelevanceEntity.getMainId()); udiProductService.updateUdiInfoByUuid(udiProductEntity); - ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); + ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.selectOne(new QueryWrapper().eq("code", udiProductEntity.getRemark()).last("limit 1")); thrProductsAddDiEntity.setCode(udiProductEntity.getNameCode()); thrProductsAddDiEntity.setRemark(udiProductEntity.getRemark()); thrProductsAddDiEntity.setStatus(2); - thrProductsAddDiDao.update(thrProductsAddDiEntity, new QueryWrapper().eq("code", udiProductEntity.getRemark())); - + thrProductsAddDiDao.updateById(thrProductsAddDiEntity); CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId() + ""); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index c3eaf824..2dbca623 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -118,7 +118,7 @@ public class UdiProductServiceImpl implements UdiProductService { //医保编码解析 String catalogcode = udiProductEntity.getCatalogcode(); - if (catalogcode.length() >= 7){ + if (catalogcode.length() >= 7) { Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); @@ -150,7 +150,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiProductEntity.setUpdateTime(new Date()); //医保编码解析 String catalogcode = udiProductEntity.getCatalogcode(); - if (catalogcode.length() >= 7){ + if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); @@ -166,7 +166,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiProductEntity.setUpdateTime(new Date()); //医保编码解析 String catalogcode = udiProductEntity.getCatalogcode(); - if (catalogcode.length() >= 7){ + if (catalogcode.length() >= 7) { Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 5231c1d3..d54ae07c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -1,5 +1,7 @@ package com.glxp.api.service.purchase.impl; +import cn.hutool.core.exceptions.ExceptionUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,6 +23,7 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.DateUtil; import com.glxp.api.util.IntUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -218,13 +221,14 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { List list = new CopyOnWriteArrayList<>(supCertList); list.forEach(supCertEntity -> { SupCertRemindMsgEntity msgEntity = getSupCertNearRemindMsg(supCertEntity, type); - if (null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() > new Date().getTime()) { - try { - saveMsg(msgEntity); - } catch (Exception e) { - e.printStackTrace(); - } +// if (null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() > new Date().getTime()) { + try { + saveMsg(msgEntity); + } catch (Exception e) { + e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); } +// } }); } @@ -240,14 +244,15 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { list.forEach(supCertEntity -> { //判断证书是否超出失效期 SupCertRemindMsgEntity msgEntity = getSupCertRemindMsg(supCertEntity, type); - if (null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() > new Date().getTime()) { - //生成,更新预警信息 - try { - saveMsg(msgEntity); - } catch (Exception e) { - e.printStackTrace(); - } +// if (null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() > new Date().getTime()) { + //生成,更新预警信息 + try { + saveMsg(msgEntity); + } catch (Exception e) { + log.error(ExceptionUtils.getStackTrace(e)); } +// } + supCertEntity.setAuditStatus(6); supCertService.revokeSupCert(supCertEntity); }); } @@ -306,11 +311,10 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { msgEntity = new SupCertRemindMsgEntity(); msgEntity.setIdFk(idFk); //设置关联主键 msgEntity.setType(type); //类型 - msgEntity.setWarnType(1); msgEntity.setCode(supCertEntity.getCode()); //证书编码 msgEntity.setCreateTime(new Date()); } - + msgEntity.setWarnType(1); msgEntity.setVailDate(supCertEntity.getVailDate()); msgEntity.setExpireDate(supCertEntity.getExpireDate()); msgEntity.setMsg(msg); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a2bd2805..f0db8fbc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: