From ed84f3f11bb5dcdccb9f46edf8e117b38cea85bb Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 19 Jun 2024 14:08:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E5=AE=A1=E6=89=B9QS=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=9Bopt:=20?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=9Bfix=EF=BC=9A=E5=AE=A2=E6=88=B7=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../properties/QiShengDsProperties.java | 22 +++++++++++++++++++ .../modules/base/ErpDataBaseService.java | 18 +++++++-------- .../service/impl/BmsSupplierServiceImpl.java | 20 +++++++---------- .../tbs/controller/TbsActivityController.java | 18 +++++++++++++++ .../serve/modules/tbs/entity/TbsActivity.java | 1 + 5 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java diff --git a/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java b/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java new file mode 100644 index 00000000..e1cd4145 --- /dev/null +++ b/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java @@ -0,0 +1,22 @@ +package com.qs.serve.common.config.properties; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author YenHex + * @since 2024/6/18 + */ +@Getter +@Setter +@Component +@ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.qisheng") +public class QiShengDsProperties { + + private String url; + private String username; + private String password; + +} diff --git a/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java b/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java index 80b0999a..e96802d5 100644 --- a/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java +++ b/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.base; import cn.hutool.crypto.digest.DigestUtil; +import com.qs.serve.common.config.properties.QiShengDsProperties; import com.qs.serve.common.util.HttpUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -18,15 +20,8 @@ import java.net.URLEncoder; @Service public class ErpDataBaseService { - @Value("${spring.datasource.dynamic.datasource.qisheng.url}") - private String erpJslGroupDbUrl; - - @Value("${spring.datasource.dynamic.datasource.qisheng.username}") - private String erpJslGroupDbUsername; - - @Value("${spring.datasource.dynamic.datasource.qisheng.password}") - private String erpJslGroupDbPassword; - + @Autowired + private QiShengDsProperties qiShengDsProperties; public static String erpJslGroupDbConnectionUrl; @@ -36,7 +31,10 @@ public class ErpDataBaseService { @PostConstruct public void initErpJslGroupDbConnectionUrl() { - erpJslGroupDbConnectionUrl = this.erpJslGroupDbUrl + ";user=" + this.erpJslGroupDbUsername + ";password=" + this.erpJslGroupDbPassword; + log.warn("数据库加载... ErpJslGroupDbConnectionUrl:{}",erpJslGroupDbConnectionUrl); + erpJslGroupDbConnectionUrl = qiShengDsProperties.getUrl() + + ";user=" + qiShengDsProperties.getUsername() + + ";password=" + qiShengDsProperties.getPassword(); } } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java index b93f370f..94add03f 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java @@ -237,9 +237,9 @@ public class BmsSupplierServiceImpl extends ServiceImpl childList = region2Service.listChild(regionId); @@ -291,8 +289,6 @@ public class BmsSupplierServiceImpl extends ServiceImpl> getList(TbsActivitySo param){ TbsActivity entity = CopierUtil.copy(param,new TbsActivity()); + TbsCostApply costApply = null; + if(entity.getCostApplyId()!=null){ + costApply = costApplyService.getById(entity.getCostApplyId()); + } LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); TbsActivityUtil.buildOverdue(lqw,param.getOverdueState()); List list = tbsActivityService.list(lqw); @@ -123,6 +127,20 @@ public class TbsActivityController { activity.setSubjectCenterList(activitySubjects); tbsCostApplyPart1Service.buildDetailVo(activity); activity.initWarningDay(overflowDays); + if(costApply!=null){ + //修改预期状态显示 + if(costApply.getChargeState().equals(5) + ||costApply.getChargeState().equals(6) + ||costApply.getChargeState().equals(8)){ + activity.setActivityState(5); + activity.setOverdueState(0); + activity.setOverdueWarningDays(0L); + }else if(!costApply.getChargeState().equals(2)){ + activity.setOverdueState(0); + activity.setOverdueWarningDays(0L); + } + + } } return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index b1d9fbbb..aac5600d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -326,6 +326,7 @@ public class TbsActivity implements Serializable { } }else { overdueState = 0; + overdueWarningDays = 0L; } //调为正数 overdueWarningDays = -overdueWarningDays;