fix: 修复辅助审批QS数据源；opt: 活动状态显示调整；fix：客户保存修复区域数据

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;
+
+}

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}")
+    @Autowired
-    private String erpJslGroupDbUrl;
+    private QiShengDsProperties qiShengDsProperties;
-
-    @Value("${spring.datasource.dynamic.datasource.qisheng.username}")
-    private String erpJslGroupDbUsername;
-
-    @Value("${spring.datasource.dynamic.datasource.qisheng.password}")
-    private String erpJslGroupDbPassword;
-
 
     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();
     }
 
 }

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -237,9 +237,9 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
      */
     private void initRegion(BmsSupplier supplier,String regionId){
         supplier.setRegionFirst("0");
-        supplier.setRegionSecond("");
+        supplier.setRegionSecond("0");
-        supplier.setRegionThird("");
+        supplier.setRegionThird("0");
-        supplier.setRegionFourthly("");
+        supplier.setRegionFourthly("0");
         supplier.setRegionLast("0");
         if(regionId==null||regionId.equals("0")){
             return;
@@ -254,8 +254,6 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         for (int i = 0; i < regionIds.length; i++) {
             if(i==0){
                 supplier.setRegionFirst(regionIds[i]);
-                supplier.setRegionSecond(regionIds[i]);
-                supplier.setRegionThird(regionIds[i]);
             }else if(i==1){
                 supplier.setRegionSecond(regionIds[i]);
             }else if(i==2){
@@ -273,12 +271,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
      * @param regionId
      */
     private void initRegion2(BmsSupplier supplier,String regionId){
-        if(regionId==null||regionId.equals("0")){
         supplier.setRegion2First("0");
-            supplier.setRegion2Second("");
+        supplier.setRegion2Second("0");
-            supplier.setRegion2Third("");
+        supplier.setRegion2Third("0");
-            supplier.setRegion2Fourthly("");
+        supplier.setRegion2Fourthly("0");
         supplier.setRegion2Last("0");
+        if(regionId==null||regionId.equals("0")){
             return;
         }
         List<BmsRegion2> childList = region2Service.listChild(regionId);
@@ -291,8 +289,6 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         for (int i = 0; i < regionIds.length; i++) {
             if(i==0){
                 supplier.setRegion2First(regionIds[i]);
-                supplier.setRegion2Second(regionIds[i]);
-                supplier.setRegion2Third(regionIds[i]);
             }else if(i==1){
                 supplier.setRegion2Second(regionIds[i]);
             }else if(i==2){

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -106,6 +106,10 @@ public class TbsActivityController {
     @PreAuthorize("hasRole('tbs:activity:query')")
     public R<List<TbsActivity>> getList(TbsActivitySo param){
         TbsActivity entity = CopierUtil.copy(param,new TbsActivity());
+        TbsCostApply costApply = null;
+        if(entity.getCostApplyId()!=null){
+            costApply = costApplyService.getById(entity.getCostApplyId());
+        }
         LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>(entity);
         TbsActivityUtil.buildOverdue(lqw,param.getOverdueState());
         List<TbsActivity> 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);
     }

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;