Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -51,4 +51,12 @@ public class CacheConstants
      * 查甲方 菜单选线
      */
     public static final String PERSONAL_LOCATION = "personal:location";
+
+    /**
+     * 查甲方 财务数据
+     */
+    public static final String DATA_FINANCIAL = "data:financial";
+
+
+
 }

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -27,7 +27,15 @@ export default {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
       if(this.$route.name=='Company'){  //企业详情
-        this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
+        if(this.$route.query.html){
+          if(this.$route.query.type){
+            this.src = `${this.domain}/enterprise/${this.$route.params.id}/${this.$route.query.html}?flag=true&type=${this.$route.query.type}&ak=${this.ak}`
+          }else{
+            this.src = `${this.domain}/enterprise/${this.$route.params.id}/${this.$route.query.html}?ak=${this.ak}`
+          }
+        }else{
+          this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
+        }
       }
       if(this.$route.name=='Personnel'){ //人员详情
         this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}`

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -614,25 +614,9 @@ export default {
   	});
   },
   mounted() {
-	window.addEventListener("scroll",this.scrolling)
     this.init();
   },
-  beforeDestroy() {
-    window.removeEventListener("scroll", this.scrolling);
-  },
   methods: {
-	scrolling() {
-		let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-		let el1 = document.getElementsByClassName("el-table")[0]
-      	let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
-		if (scrollTop>el1.offsetTop){
-			let top = scrollTop-el1.offsetTop-13
-			el.style.top = top+'px'
-		}else{
-			el.style.top = 0
-		}
-      
-    },
     domicileChange() {
     	let arr = this.$refs.address.getCheckedNodes();
     	let provinceIds = [],
@@ -1271,9 +1255,14 @@ export default {
 				z-index: 9;
 			}
 			::v-deep .el-table__fixed-header-wrapper{
+				position: sticky;
 				z-index: 9;
+				top: 56px;
+			}
+			::v-deep .el-table__fixed{
+				overflow-x: clip;
+				overflow-y: clip;
 			}
-			
 			
 		}
 		.table-item-jf1{

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -512,43 +512,43 @@
         					</template>
         					<template v-if="item.recentlyCount!=null">
         						<span class="right-title-grey">中标业绩：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/performance')" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'performance')" target="_blank"  >
         						<span class="right-title-blue" v-html="item.recentlyCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.skyCount!=null">
         						<span class="right-title-grey">四库业绩：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/performance',1)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'performance',2)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.skyCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.registeredPersonnelCount!=null">
         						<span class="right-title-grey">注册人员：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/personnel',1)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'personnel',2)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.registeredPersonnelCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.threePersonnelCount!=null">
         						<span class="right-title-grey">三类人员：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/personnel',4)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'personnel',5)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.threePersonnelCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.jskBidCount>0">
         						<span class="right-title-grey">招标公告：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/business',6)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'business',5)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.jskBidCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.customerCount>0">
         						<span class="right-title-grey">客户：</span>
-        						<router-link  :to="toEnterprise(item.jskEid,'/business',1)" target="_blank"  >
+        						<router-link  :to="toEnterprise(item.jskEid,'business',1)" target="_blank"  >
         							<span class="right-title-blue" v-html="item.customerCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.supplierCount>0">
         						<span class="right-title-grey">供应商：</span>
-        						<router-link  :to="toEnterprise(item.jskEid,'/business',2)" target="_blank"  >
+        						<router-link  :to="toEnterprise(item.jskEid,'business',2)" target="_blank"  >
         							<span class="right-title-blue" v-html="item.supplierCount"> </span>
         						</router-link>
         					</template>
@@ -2764,7 +2764,7 @@
       },
 			
 			toEnterprise(id, html,type) {
-				return '/company/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
+				return '/company/' + encodeStr(id)  + '/'+(html?'?html='+html:'')+(type?'&flag=true&type='+type:'');
 			},
 			
 			toEnterpriseDetail(id) {

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -7,7 +7,7 @@
           <div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>
           <div class="item-count">
             <span>{{recentlyYear.gdp}}</span>亿
-            <img v-if="recentlyYear.gdpGrowth > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.gdpGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsGDP" style="height: 75px;"></div>
@@ -18,7 +18,7 @@
           <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
           <div class="item-count">
             <span>{{recentlyYear.gdpGrowth}}</span>%
-            <img v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
@@ -29,7 +29,7 @@
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
           <div class="item-count">
             <span>{{recentlyYear.population}}</span>万
-            <img v-if="recentlyYear.populationGrowthRate > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.populationGrowthRate)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsRK" style="height: 75px;"></div>
@@ -40,7 +40,7 @@
           <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
           <div class="item-count">
             <span>{{recentlyYear.gbr}}</span>亿
-            <img v-if="recentlyYear.gbrGrowth > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.gbrGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsSR" style="height: 75px;"></div>
@@ -51,7 +51,7 @@
           <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
           <div class="item-count">
             <span>{{recentlyYear.govDebtBalance}}</span>亿
-            <img v-if="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsYE" style="height: 75px;"></div>

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -12,7 +12,6 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.core.redis.RedisCache;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
-import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import com.dsk.system.service.ICustomerService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -20,6 +19,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -321,7 +321,21 @@ public class EnterpriseService {
         if (body.isValidateCid()) {
             return R.ok();
         }
+        String redisKey = CacheConstants.DATA_FINANCIAL + body.getCid();
+        List cacheMap = redisCache.getCacheList(redisKey);
+        if (ObjectUtil.isNotEmpty(cacheMap)) {
+            return R.ok(cacheMap);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/financialData", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Object data = map.get("data");
+        if (ObjectUtil.isNotEmpty(data)) {
+            redisCache.setCacheList(redisKey, (List)data);
+            redisCache.expire(redisKey, 24, TimeUnit.HOURS);
+        }
         return BeanUtil.toBean(map, R.class);
     }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -15,6 +15,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -83,6 +85,23 @@ public class EconomicServiceImpl implements EconomicService {
     @Override
     public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
+        //20230721 TODO:临时代码 待删除
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Object data = map.get("data");
+        if (ObjectUtil.isNotEmpty(data)) {
+            List<Map<String, Object>> mapList = (ArrayList)data;
+            for (Map<String, Object> recentlyYearMap : mapList) {
+                Map<String, Object> recently = (Map<String, Object>)recentlyYearMap.get("recentlyYear");
+                recently.put("gdpGrowthCompare", "-10");
+                recently.put("govDebtBalanceCompare", "-10");
+                recently.put("gdpCompare", "-10");
+                recently.put("populationCompare", "-10");
+                recently.put("gbrCompare", "-10");
+            }
+        }
         return BeanUtil.toBean(map, AjaxResult.class);
     }