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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -77,12 +77,15 @@ public class BusinessFileController extends BaseController {
      * @return
      */
     @PostMapping("/upload")
-    public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file, HttpServletRequest request){
+    public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
         try {
+            //获取文件名
+            String filename = file.getOriginalFilename();
+            //TODO 校验是否上传同名文件
             String businessFileName = request.getHeader("FilePath");
-        // 上传文件路径
-        String filePath = RuoYiConfig.getUploadPath()+businessFileName+"/";
-        // 上传并返回文件全路径
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath() + businessFileName + "/";
+            // 上传并返回文件全路径
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
             AjaxResult ajax = AjaxResult.success();

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java

@@ -114,4 +114,16 @@ public class RegionalEconomicDataController {
         return economicService.regionalCompare(dto);
     }
 
+    /***
+     *@Description: 地区经济-对比
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/multipleCompare")
+    public AjaxResult regionalMultipleCompare(@RequestBody OpRegionalEconomicRegionalCompareDto compareDto) {
+        return economicService.regionalMultipleCompare(compareDto);
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessContacts.java

 package com.dsk.common.core.domain.entity;
 
-import java.util.Date;
-
-import com.dsk.common.core.domain.BaseEntity;
-import com.dsk.common.utils.CheckUtils;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.dsk.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import javax.validation.constraints.Pattern;
+import java.util.Date;
 
 /**
  * 项目联系人对象 business_contacts
@@ -17,7 +13,7 @@ import javax.validation.constraints.Pattern;
  * @author lxl
  * @date 2023-05-17
  */
-public class BusinessContacts extends BaseEntity
+public class BusinessContacts
 {
     private static final long serialVersionUID = 1L;
 
@@ -52,10 +48,21 @@ public class BusinessContacts extends BaseEntity
     @Excel(name = "维护人员")
     private String accendant;
 
+    /** 性别(1.男 2.女 0.未知) */
+    @Excel(name = "性别")
+    private Integer sex;
+
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date creatTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+
 
     public void setId(Integer id)
     {
@@ -129,14 +136,29 @@ public class BusinessContacts extends BaseEntity
     {
         return accendant;
     }
-    public void setCreatTime(Date creatTime)
-    {
-        this.creatTime = creatTime;
+
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public Date getCreatTime()
-    {
-        return creatTime;
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
     }
 
     @Override
@@ -150,8 +172,9 @@ public class BusinessContacts extends BaseEntity
             .append("position", getPosition())
             .append("phone", getPhone())
             .append("accendant", getAccendant())
-            .append("creatTime", getCreatTime())
+            .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
+            .append("sex", getSex())
             .toString();
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

 package com.dsk.common.core.domain.entity;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.dsk.common.annotation.Excel;
 import com.dsk.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.dsk.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 项目详情对象 business_info
  *

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataStatisticsRegionalDto.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @ClassName OpRegionalEconomicDataV1Dto
- * @Description 专项债-项目类别统计
+ * @Description 地区经济
  * @Author Dgm
  * @Date 2023/5/23 14:05
  * @Version

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicRegionalCompareDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicRegionalCompareDto
+ * @Description 地区经济-对比
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicRegionalCompareDto {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    private List<OpRegionalEconomicDataStatisticsRegionalDto> compareList;
+}

dsk-common/src/main/java/com/dsk/common/utils/CheckUtils.java

@@ -8,7 +8,8 @@ import java.util.regex.Pattern;
  */
 public class CheckUtils {
 
-    public static final String REG_Moblie = "^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-7]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\\d{8}$";
+    public static final String REG_Moblie = "^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-7]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\\d{8}$";//手机号
+    public static final String REG_Landline = "(\\(\\d{3,4}\\)|\\d{3,4}-|\\s)?\\d{8}";//座机号
 
     public static final String REG_EMAIL = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+";
 
@@ -35,10 +36,42 @@ public class CheckUtils {
         if (phone == null){
             return false;
         }else {
-            Pattern p = Pattern.compile(REG_Moblie);
-            Matcher m = p.matcher(phone);
-            return m.matches();
+            Pattern mobilePattern = Pattern.compile(REG_Moblie);
+            Pattern landlinePattern = Pattern.compile(REG_Landline);
+            Matcher mobileMatcher = mobilePattern.matcher(phone);
+            Matcher landlineMatcher = landlinePattern.matcher(phone);
+            return mobileMatcher.matches() || landlineMatcher.matches();
         }
 
     }
+
+    /**
+     * Double小数点前的位数
+     * @param number
+     * @return
+     */
+    public static int checkIntegerPlaces(Double number) {
+        String strNumber = Double.toString(Math.abs(number));
+        int integerPlaces = strNumber.indexOf('.');
+        if (integerPlaces == -1) {
+            return strNumber.length();
+        } else {
+            return integerPlaces;
+        }
+    }
+
+    /**
+     * Double小数点后的位数
+     * @param number
+     * @return
+     */
+    public static int checkDecimalPlaces(Double number) {
+        String strNumber = Double.toString(Math.abs(number));
+        int decimalPlaces = 0;
+        int index = strNumber.indexOf('.');
+        if (index != -1) {
+            decimalPlaces = strNumber.length() - index - 1;
+        }
+        return decimalPlaces;
+    }
 }

dsk-operate-ui/src/assets/styles/index.scss

@@ -343,6 +343,11 @@ ul, li {
         }
       }
     }
+    .el-table__fixed{
+      tr:nth-child(2n){
+        background-color: #F8FBFF;
+      }
+    }
   }
 }
 

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -168,11 +168,18 @@ export default {
 ::v-deep .el-table--border .el-table__cell {
    border-right: 1px solid #E6EAF1;
 }
-::v-deep .el-table__body tr.hover-row.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped>td,::v-deep .el-table__body tr.hover-row>td{
-  background-color:#DCEBFF;
+::v-deep .el-table__body tr.hover-row.current-row>td,
+::v-deep .el-table__body tr.hover-row.el-table__row--striped.current-row>td,
+::v-deep .el-table__body tr.hover-row.el-table__row--striped>td,
+::v-deep .el-table__body tr.hover-row>td{
+  background-color:#DCEBFF !important;
   .more{
     background: #DCEBFF;
   }
 }
 
+::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
+  background-color: #DCEBFF;
+}
+
 </style>

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

@@ -6,7 +6,7 @@
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item prop="year">
             <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择">
-              <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
+              <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" @click.native='handleSelect(item.year)'/>
             </el-select>
           </el-form-item>
         </el-form>
@@ -92,6 +92,7 @@
           :prop="item"
           :label="item"
           width="16.7%"
+          :formatter="formatStatus"
         >
         </el-table-column>
       </el-table>
@@ -104,9 +105,7 @@
   import { regionalCompare,getYears } from '@/api/macro/macro'
 export default {
   name: 'comparison',
-  props:{
-    dataQuery:{}
-  },
+  props:['dataQuery','provinceId'],
   data() {
     return {
       queryParams: {
@@ -155,6 +154,10 @@ export default {
           prop: 'industryTotalValue',
           label: '工业总产值（亿元）',
         },
+        {
+          prop: 'fixedInvestment',
+          label: '固定资产投资（亿元）',
+        },
         {
           prop: 'realEstateInvestment',
           label: '房地产开发投资（亿元）',
@@ -287,17 +290,30 @@ export default {
       regionData:[]
     }
   },
+  watch: {
+    provinceId(newValue, oldValue){
+      console.log(newValue)
+    }
+  },
   created() {
     this.dataRegion();
-    console.log(this.dataQuery)
     // this.getData();
     getYears({}).then(res => {
       this.yearOptions=res.data.reverse();
       this.queryParams.year = this.yearOptions[0].year;
       if(this.dataQuery.pId){
-        const params = { year: this.queryParams.year,type:3,provinceId:this.dataQuery.provinceId }
+        const params = { year: this.queryParams.year,type:3}
+        if(this.provinceId.length >= 0){
+          params.provinceId=this.provinceId[0]
+        }
+        if(this.provinceId.length >= 1){
+          params.cityId=this.provinceId[1]
+        }
+        if(this.provinceId.length >= 2){
+          params.areaId=this.provinceId[2]
+        }
         this.value1Flag=true
-        this.addressValue1=this.dataQuery.province
+        this.addressValue1=this.dataQuery.province.join('-')
         this.getData(params,1)
       }
     })
@@ -318,8 +334,10 @@ export default {
         params.id=this.dataQuery.id
       }
       regionalCompare(params).then(res => {
-        this.tableData.splice(index-1,1,res.data)
-        this.$forceUpdate();
+        if(res.data){
+          this.tableData.splice(index-1,1,res.data)
+          this.$forceUpdate();
+        }
       })
     },
     //地区
@@ -377,7 +395,7 @@ export default {
     },
     handleVisibleChange(flag,index){
       if(!flag){
-        if(this.value1 || this.value2 || this.value3 || this.value4 || this.value5){
+        if((index === 1 && this.value1) || (index === 2 && this.value2) || (index === 3 && this.value3) || (index === 4 && this.value4) || (index === 5 && this.value5)){
           switch (index) {
             case 1:
               this.value1Flag=true
@@ -523,11 +541,16 @@ export default {
 
       this.$forceUpdate();
     },
+    handleSelect(val){
+      const params = { year: this.queryParams.year,type:3 }
+
+    },
     formatStatus: function(row, column, cellValue) {
       if(row.title === '经济'||row.title === '财政'||row.title === '债务'){
         return cellValue
       }else {
-        return cellValue? cellValue : '-'
+        // return cellValue? cellValue : '-'
+        return cellValue
       }
     },
     rowStyle(row){

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

@@ -24,16 +24,18 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          height="440"
           border
+          height="440px"
           highlight-current-row
+          :summary-method="getSummaries"
+          show-summary
         >
           <el-table-column label="序号" width="60" align="left">
-            <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+            <template slot-scope="scope">{{ scope.$index + 2 }}</template>
           </el-table-column>
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
-            <el-table-column prop="money" label="金额（亿元）"> </el-table-column>
+            <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
             <el-table-column prop="rate" label="占比"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
@@ -51,12 +53,7 @@
   import { bidGroupCountByProjectType,bidMoneyGroupByProjectType,getYears } from '@/api/macro/macro'
 export default {
   name: 'industrialStructure',
-  props:{
-    dataQuery: {
-      type: Object,
-      default: {}
-    },
-  },
+  props:['dataQuery','provinceId'],
   data() {
     return {
       queryParams: {
@@ -71,6 +68,11 @@ export default {
       twoYear:'',
     }
   },
+  watch: {
+    provinceId(newValue, oldValue){
+      this.getData()
+    }
+  },
   created() {
     getYears({}).then(res => {
       this.yearOptions=res.data.reverse();
@@ -92,7 +94,16 @@ export default {
       endTime=mydate.getFullYear()-1+'-12-31';
       this.oneYear=mydate.getFullYear()-1+'年';
       this.twoYear=mydate.getFullYear()-2+'年';
-      let params={startDate:startTime,endDate:endTime,province:this.dataQuery.provinceId}
+      let params={startDate:startTime,endDate:endTime}
+      if(this.provinceId.length >= 0){
+        params.province=this.provinceId[0]
+      }
+      if(this.provinceId.length >= 1){
+        params.city=this.provinceId[1]
+      }
+      if(this.provinceId.length >= 2){
+        params.county=this.provinceId[2]
+      }
       bidMoneyGroupByProjectType(params).then(res => {
         let list=res.data[1].type
         for (let i=0; i<res.data[0].type.length; i++){
@@ -170,13 +181,54 @@ export default {
         ]
       }
       myChart.setOption(option);
+      window.addEventListener("resize", function () {
+        myChart.resize();//图表跟随页面大小变化宽度
+      });
     },
     handleMessage(){
       this.$message({
         message: '功能正在开发中',
         type: 'warning'
       });
-    }
+    },
+    getSummaries(param){
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '1';
+          return;
+        }
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+        if (index === 3) {
+          sums[index] = '100';
+          return;
+        }
+        if (index === 5) {
+          sums[index] = '100';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return Number(Number(prev) + Number(curr)).toFixed(3)
+          } else {
+            return prev;
+          }
+        }, 0);
+
+        // if (index === 1) {
+        //   sums[index] = Number(sums[index]).toFixed(0);
+        //   return;
+        // }
+      });
+      console.log(sums)
+      return sums;
+    },
 
   }
 }
@@ -211,6 +263,17 @@ export default {
       }
       .content-right{
         width: 50%;
+        ::v-deep .el-table{
+          display: flex;
+          flex-direction: column;
+          .el-table__body-wrapper {
+            order: 1;
+          }
+          .el-table__fixed-footer-wrapper {
+            z-index: 0;
+            top: 46px;
+          }
+        }
       }
     }
   }

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

@@ -24,10 +24,14 @@
           highlight-current-row
           @sort-change="sortChange"
         >
-          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus">
+          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus" fixed>
+            <!--<template slot-scope="scope">-->
+              <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
+            <!--</template>-->
             <template slot-scope="scope">
-              {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
+              <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
             </template>
+
           </el-table-column>
           <el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="gdpGrowth" label="GDP增速" sortable width="100" :formatter="formatStatus"/>
@@ -39,8 +43,8 @@
           <el-table-column prop="govFundIncome" label="政府性基金收入（亿元）" sortable width="180" :formatter="formatStatus"/>
           <el-table-column prop="govDebtBalance" label="地方政府债务余额（亿元）" sortable width="180" :formatter="formatStatus"/>
           <el-table-column prop="uipInterestBearingDebt" label="城投平台有息债务（亿元）" sortable width="180" :formatter="formatStatus"/>
-          <el-table-column prop="fiscalSelfSufficiencyRate" label="财政自给率" sortable width="120":formatter="formatStatus"/>
-          <el-table-column prop="govDebtRateWild" label="债务率-宽口径" sortable width="130" :formatter="formatStatus"/>
+          <el-table-column prop="fiscalSelfSufficiencyRate" label="财政自给率（%）" sortable width="120":formatter="formatStatus"/>
+          <el-table-column prop="govDebtRateWild" label="债务率-宽口径（%）" sortable :formatter="formatStatus"/>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -55,12 +59,7 @@
   import { nationalPage,getYears } from '@/api/macro/macro'
 export default {
   name: 'localEconomy',
-  props:{
-    dataQuery: {
-      type: Object,
-      default: {}
-    },
-  },
+  props:['dataQuery','provinceId'],
   data() {
     return {
       queryParams: {
@@ -72,7 +71,17 @@ export default {
       tableLoading: false,
       pageIndex: 1,
       pageSize: 10,
-      tableDataTotal: 0
+      tableDataTotal: 0,
+    }
+  },
+  watch: {
+    dataQuery: {
+      handler(newValue, oldValue) {
+      },
+      deep: true
+    },
+    provinceId(newValue, oldValue){
+      this.getData()
     }
   },
   created() {
@@ -91,7 +100,16 @@ export default {
         params.order=this.queryParams.order
       }
 
-      params.provinceIds=[this.dataQuery.provinceId]
+      if(this.provinceId.length >= 0){
+        params.provinceIds=[this.provinceId[0]]
+      }
+      if(this.provinceId.length >= 1){
+        params.cityId=[this.provinceId[1]]
+      }
+      if(this.provinceId.length >= 2){
+        params.areaId=[this.provinceId[2]]
+      }
+      // params.provinceIds=[this.dataQuery.provinceId]
       nationalPage(params).then(res => {
         this.tableData = res.data.list
         this.tableDataTotal = res.data.totalCount

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

@@ -22,7 +22,7 @@
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
-          <div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth-nextYearMap.gdpGrowth}}%</span></div>
+          <div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth).toFixed(2).toString()}}%</span></div>
           <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{(this.recentlyYear.gdpGrowth-this.nextYearMap.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
         </div>
         <div class="item">
@@ -106,12 +106,7 @@
   import { regional,regionalList,location } from '@/api/macro/macro'
 export default {
   name: 'regionalEconomy',
-  props:{
-    dataQuery: {
-      type: Object,
-      default: {}
-    },
-  },
+  props:['dataQuery','provinceId'],
   data() {
     return {
       tableData: [],
@@ -286,7 +281,7 @@ export default {
   created() {
     this.getData()
     this.$nextTick(()=>{
-
+      // console.log(this.dataQuery)
     })
   },
   computed: {
@@ -297,6 +292,19 @@ export default {
       return this.headers.map(item => {
         return this.tableData.reduce((pre, cur, index) => Object.assign(pre, {['value' + index]: cur[item.prop]}), {'title': item.label,});
       });
+    },
+    // provinceId() {
+    //   return this.dataQuery.provinceId
+    // }
+  },
+  watch: {
+    dataQuery: {
+      handler(newValue, oldValue) {
+      },
+      deep: true
+    },
+    provinceId(newValue, oldValue){
+      this.getData()
     }
   },
   methods: {
@@ -305,8 +313,14 @@ export default {
       if(this.dataQuery.id){
         params.id=this.dataQuery.id
       }
-      if(this.dataQuery.provinceId){
-        params.provinceId=this.dataQuery.provinceId
+      if(this.provinceId.length >= 0){
+        params.provinceId=this.provinceId[0]
+      }
+      if(this.provinceId.length >= 1){
+        params.cityId=this.provinceId[1]
+      }
+      if(this.provinceId.length >= 2){
+        params.areaId=this.provinceId[2]
       }
       regional(params).then(res => {
         this.recentlyYear=res.data[0].recentlyYear;
@@ -386,6 +400,9 @@ export default {
         ]
       }
       myChart.setOption(option);
+      window.addEventListener("resize", function () {
+        myChart.resize();//图表跟随页面大小变化宽度
+      });
     },
     initChart1(){
       let myChartZS = echarts.init(document.getElementById("echartsZS"))
@@ -445,6 +462,9 @@ export default {
         ]
       }
       myChartZS.setOption(option);
+      window.addEventListener("resize", function () {
+        myChartZS.resize();//图表跟随页面大小变化宽度
+      });
     },
     initChart2(){
       let myChartRK = echarts.init(document.getElementById("echartsRK"))
@@ -504,6 +524,9 @@ export default {
         ]
       }
       myChartRK.setOption(option);
+      window.addEventListener("resize", function () {
+        myChartRK.resize();//图表跟随页面大小变化宽度
+      });
     },
     initChart3(){
       let myChartSR = echarts.init(document.getElementById("echartsSR"))
@@ -563,6 +586,9 @@ export default {
         ]
       }
       myChartSR.setOption(option);
+      window.addEventListener("resize", function () {
+        myChartSR.resize();//图表跟随页面大小变化宽度
+      });
     },
     initChart4(){
       let myChartYE = echarts.init(document.getElementById("echartsYE"))
@@ -622,6 +648,9 @@ export default {
         ]
       }
       myChartYE.setOption(option);
+      window.addEventListener("resize", function () {
+        myChartYE.resize();//图表跟随页面大小变化宽度
+      });
     },
     formatStatus: function(row, column, cellValue) {
       if(row.title === '经济'||row.title === '财政'||row.title === '债务'){

dsk-operate-ui/src/views/macro/economies/index.vue

@@ -10,13 +10,22 @@
       <div class="location">
         <span><i class="el-icon-location"></i>{{province}}</span>
         <el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd'
-                     @input="addressListbtn"  v-model="address" :options="addressList" :props="props" collapse-tags></el-cascader>
+                     @change="addressListbtn"  v-model="address" :options="addressList" :props="props" collapse-tags></el-cascader>
+        <!--<el-select v-model="provinceId" class="cascader-region">-->
+          <!--<el-option-->
+            <!--v-for="(item,index) in addressList"-->
+            <!--:key="index"-->
+            <!--:label="item.label"-->
+            <!--:value="item.id"-->
+            <!--@click.native="addressListbtn(item.label,item.id)"-->
+          <!--&gt;</el-option>-->
+        <!--</el-select>-->
       </div>
     </div>
-    <RegionalEconomy v-if="activeName === 'first' && province" :dataQuery="dataQuery"></RegionalEconomy>
-    <LocalEconomy v-if="activeName === 'second' && province" :dataQuery="dataQuery"></LocalEconomy>
-    <IndustrialStructure v-if="activeName === 'third' && province" :dataQuery="dataQuery"></IndustrialStructure>
-    <Comparison v-if="activeName === 'four' && province" :dataQuery="dataQuery"></Comparison>
+    <RegionalEconomy v-if="activeName === 'first' && province" :dataQuery="dataQuery" :provinceId="provinceId"></RegionalEconomy>
+    <LocalEconomy v-if="activeName === 'second' && province" :dataQuery="dataQuery" :provinceId="provinceId"></LocalEconomy>
+    <IndustrialStructure v-if="activeName === 'third' && province" :dataQuery="dataQuery" :provinceId="provinceId"></IndustrialStructure>
+    <Comparison v-if="activeName === 'four' && province" :dataQuery="dataQuery" :provinceId="provinceId"></Comparison>
   </div>
 </template>
 
@@ -46,17 +55,20 @@ export default {
         checkStrictly: true
       },
       addressList: [],
-      address:''
+      address:'',
+      provinceId:[]
     }
   },
   created() {
     this.dataQuery=this.$route.query;
-    location({provinceId:'500000'}).then(res => {
-      this.province=res.data.currentProvince.regionName;
-      this.provinceId=res.data.currentProvince.id;
+    location({}).then(res => {
+      this.province=res.data.province;
       if(!this.dataQuery.provinceId){
-        this.dataQuery.provinceId=this.provinceId
-        this.dataQuery.province=this.province
+        this.dataQuery.provinceId=res.data.provinceId
+        this.dataQuery.province=this.province;
+        this.provinceId.push(res.data.provinceId)
+      }else {
+        this.provinceId.push(this.dataQuery.provinceId)
       }
     })
     if(this.dataQuery.activeName){
@@ -71,7 +83,6 @@ export default {
   },
   methods: {
     handleClick(key,item) {
-      console.log(item)
       if(key === 'four'){
         this.activeName='four'
       }
@@ -99,7 +110,7 @@ export default {
               "value": dataRegion[i].parentId,
               "children": []
             });
-          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+          }else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
             for (let j = 0; j < str.length; j++) {
               if (str[j].id == dataRegion[i].parentId) {
                 str[j].children.push({
@@ -111,7 +122,7 @@ export default {
                 });
               }
             }
-          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+          }else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
             for (let j = 0; j < str.length; j++) {
               for (let k = 0; k < str[j].children.length; k++) {
                 if (str[j].children[k].id == dataRegion[i].parentId) {
@@ -131,9 +142,19 @@ export default {
       this.addressList = str;
     },
     addressListbtn() {
-      let nodesObj  = this.$refs.address.getCheckedNodes();
-      console.log(nodesObj )
-      console.log(this.address)
+      let nodesObj = this.$refs.address.getCheckedNodes()[0];
+      // console.log(nodesObj)
+      this.province=nodesObj.pathLabels[nodesObj.pathLabels.length-1];
+      this.provinceId=nodesObj.path;
+      this.dataQuery.province=nodesObj.pathLabels;
+      // this.dataQuery.provinceId=nodesObj.path[nodesObj.path.length-1];
+
+
+      // console.log(this.dataQuery)
+      // this.province=label;
+      // this.provinceId=id;
+      // this.dataQuery.provinceId=id;
+      // this.dataQuery.province=label;
     }
   }
 }

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -18,8 +18,8 @@
           placeholder="资质资格"
           collapse-tags
           clearable></el-cascader>
-        <el-input placeholder="输入企业名称关键词" v-model="queryParams.ename">
-          <el-button slot="append" @click="querySubmit()">搜索</el-button>
+        <el-input placeholder="输入企业名称关键词" v-model="queryParams.ename" clearable @clear="handleSearch()">
+          <el-button slot="append" @click="handleSearch()">搜索</el-button>
         </el-input>
         <span class="total">共{{tableDataTotal}}条</span>
       </div>
@@ -30,7 +30,9 @@
           element-loading-text="Loading"
           border
           fit
+          @sort-change="sortChange"
           highlight-current-row
+          v-if="tableDataTotal > 0"
         >
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
@@ -41,22 +43,27 @@
               <span v-else v-html="scope.row.name" ></span>
             </template>
           </el-table-column>
-          <el-table-column label="注册地址" prop="domicile" width="150"/>
-          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable width="100"/>
-          <el-table-column label="专业人员" prop="persionCount" sortable width="100"/>
-          <el-table-column label="中标业绩" prop="recentlyCount" sortable width="100"/>
-          <el-table-column label="最大中标金额（万元）" prop="cgfs" sortable width="160"/>
-          <el-table-column label="中标总金额（万元）" prop="cgfs" sortable width="160"/>
-          <el-table-column label="四库业绩" prop="skyCount" sortable width="100"/>
-          <el-table-column label="公路业绩" prop="cgfs" sortable width="100"/>
-          <el-table-column label="水利业绩" prop="cgfs" sortable width="100"/>
-          <el-table-column label="常合作业主" prop="cgfs" width="130"/>
-          <el-table-column label="客户（个）" prop="customerCount" sortable width="100"/>
-          <el-table-column label="供应商（个）" prop="supplierCount" sortable width="130" />
-          <el-table-column label="常合作供应商" prop="supplierCount" width="120"/>
+          <el-table-column label="注册地址" prop="domicile" width="150" :formatter="formatStatus"/>
+          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="专业人员" prop="persionCount" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="中标业绩" prop="recentlyCount" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
+          <el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>
+          <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
+          <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
+          <el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>
         </el-table>
+        <div class="empty" v-if="tableDataTotal === 0">
+          <img class="img" src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+        </div>
       </div>
-      <div class="pagination-box">
+      <div class="pagination-box" v-if="tableDataTotal>pageSize">
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
@@ -95,7 +102,7 @@ export default {
       tableLoading: false,
       pageIndex: 1,
       pageSize: 10,
-      tableDataTotal: 1,
+      tableDataTotal: null,
       aptitudeCodeList:[],
       aptitudeType:'',
       province:'',
@@ -175,8 +182,8 @@ export default {
         arr.push(codeStr[i][codeStr[i].length - 1])
       }
       this.aptitudeType=arr.join(',')
-      console.log(this.aptitudeType)
       this.$refs.aptitudeCode.toggleDropDownVisible(false)
+      this.pageIndex=1;
       this.querySubmit()
     },
     handleClick(){
@@ -188,7 +195,31 @@ export default {
       }
       this.pageIndex=1;
       this.querySubmit()
-    }
+    },
+    handleSearch(){
+      this.pageIndex=1;
+      this.querySubmit()
+    },
+    formatStatus: function(row, column, cellValue) {
+      return cellValue? cellValue : '-'
+    },
+    sortChange({ column, prop, order }){
+      if(prop === 'aptitudeCountNew'){
+        this.queryParams.field ='aptitudeCountNew'
+      }else {
+        this.queryParams.field = prop
+      }
+      if(column.order === "ascending"){
+        this.queryParams.order = 'asc'
+      }else if(column.order === "descending"){
+        this.queryParams.order = 'desc'
+      }else {
+        this.queryParams.order=''
+        this.queryParams.field=''
+      }
+      this.pageIndex = 1;
+      this.querySubmit()
+    },
   }
 }
 </script>
@@ -281,6 +312,27 @@ export default {
       }
       .table-item{
         margin-top: 14px;
+        .empty{
+          margin: 0 auto;
+          height: 600px;
+          text-align: center;
+          border-top: 1px solid #EFEFEF;
+          .img{
+            width: 108px;
+            height: 108px;
+            margin-bottom: 24px;
+            margin-top: 150px;
+          }
+          .p1{
+            color: #333333;
+            font-size: 16px;
+          }
+          .p2{
+            color: #999999;
+            font-size: 14px;
+            margin-top: 8px;
+          }
+        }
       }
     }
   }

dsk-operate-ui/src/views/macro/financing/index.vue

@@ -13,7 +13,7 @@
             border
             :summary-method="getSummaries"
             show-summary
-            height="360"
+            height="400"
             fit
             @sort-change="sortChange"
             highlight-current-row
@@ -170,13 +170,15 @@ export default {
           orient: 'horizontal',
           bottom: 0,
           data: data,
+          itemHeight:8,
+          itemWidth:12,
           pageButtonPosition: 'end',
         },
         series: [
           {
             type: 'pie',
             radius: '55%',
-            center: ['50%', '40%'],
+            center: ['50%', '50%'],
             data: data,
             emphasis: {
               itemStyle: {
@@ -318,6 +320,11 @@ export default {
     }
     .table-item{
       margin-top: 22px;
+      ::v-deep .el-table{
+        td.el-table__cell{
+          border-bottom: 0;
+        }
+      }
     }
   }
 </style>

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -6,7 +6,7 @@
           <span class="common-title">全国经济大全</span>
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
-              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="handleSearch">
+              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch">
                 <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
               </el-select>
             </el-form-item>
@@ -37,6 +37,7 @@
           border
           fit
           highlight-current-row
+          v-if="tableDataTotal > 0"
         >
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
@@ -55,9 +56,9 @@
           <el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
           <el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
           <el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
-          <el-table-column label="一般公共预算收入 (亿元)" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
+          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
-          <el-table-column label="一般公共预算收入：税收收入" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
+          <el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
           <el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
           <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="right"></el-table-column>
@@ -94,11 +95,16 @@
           <el-table-column label="社会消费品零售总额（亿元）" prop="trscg" :formatter="formatStatus" width="160" align="right"></el-table-column>
           <el-table-column label="城镇居民人均可支配收入（元）" prop="urbanPcdi" :formatter="formatStatus" width="160" align="right"></el-table-column>
         </el-table>
+        <div class="empty" v-if="tableDataTotal === 0">
+          <img class="img" src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+        </div>
       </div>
       <!--<template slot-scope="scope">-->
         <!--<router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>-->
       <!--</template>-->
-      <div class="pagination-box">
+      <div class="pagination-box" v-if="tableDataTotal>pageSize">
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
       <economies-detail ref="economiesDetail" />
@@ -132,7 +138,7 @@
         tableLoading: false,
         pageIndex: 1,
         pageSize: 10,
-        tableDataTotal: 0,
+        tableDataTotal: null,
       }
     },
     created() {
@@ -310,6 +316,9 @@
         .el-form{
           margin-left: 24px;
         }
+        .form-content-width{
+          width: 110px;
+        }
         ::v-deep .el-cascader{
           .el-cascader__tags{
             flex-wrap: inherit;
@@ -324,7 +333,34 @@
       background: #ffffff;
       padding: 16px;
       margin-top: 12px;
+      /*height: calc(100vh - 300px);*/
       .table-item{
+        position: relative;
+        .empty{
+          /*position: absolute;*/
+          /*top: 50%;*/
+          /*left: 50%;*/
+          /*transform: translate(-50%,-50%);*/
+          margin: 0 auto;
+          height: 600px;
+          text-align: center;
+          border-top: 1px solid #EFEFEF;
+          .img{
+            width: 108px;
+            height: 108px;
+            margin-bottom: 24px;
+            margin-top: 150px;
+          }
+          .p1{
+            color: #333333;
+            font-size: 16px;
+          }
+          .p2{
+            color: #999999;
+            font-size: 14px;
+            margin-top: 8px;
+          }
+        }
         ::v-deep .el-table{
           th{
             font-size: 12px !important;
@@ -333,18 +369,12 @@
           .el-table__fixed-header-wrapper th{
             background: #F0F3FA;
           }
+          td.el-table__cell{
+            border-bottom: 0;
+          }
           .caret-wrapper{
             width: 10px;
-            /*<!--position: absolute;-->*/
-            /*<!--right: 12px;-->*/
-            /*<!--top: -3px;-->*/
           }
-          /*.sort-caret{*/
-          /*position: initial;*/
-          /*}*/
-          /*.ascending{*/
-          /*margin-bottom: 3px;*/
-          /*}*/
         }
       }
     }

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -80,10 +80,10 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对近{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
-        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近{{year}}年全国公开的招标项目，未公开的不含在内</p>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{year}}年全国公开的招标项目，未公开的不含在内</p>
       </div>
       <div class="main2">
         <div class="selectYear">

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -299,7 +299,7 @@ export default {
       areaGroupByProvince().then(res => {
         this.zbData=res.data;
         //定义一个变量 保存数据 因为sort方法排序会改变原数组 使用JSON方法深拷贝 将原数值暂存
-        let dataArr = JSON.parse(JSON.stringify(res.data))
+        // let dataArr = JSON.parse(JSON.stringify(res.data))
         let arr=res.data.sort((old,New)=>{
           return  New.count - old.count
         })
@@ -309,7 +309,7 @@ export default {
         }
         this.rankList=data;
         //将原数组数据赋值回去  保持数据不变
-        this.zbData = JSON.parse(JSON.stringify(dataArr))
+        // this.zbData = JSON.parse(JSON.stringify(dataArr))
         this.initChart2()
       })
     },
@@ -377,7 +377,7 @@ export default {
       let option ={
         legend: {
           x:'right',
-          padding:[0,120,0,0],
+          padding:[0,30,0,0],
         },
         tooltip: {
           trigger: 'axis',

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -87,7 +87,7 @@
             </div>
           </div>
         </div>
-        <el-input class="search-input" placeholder="输入企业名称关键词" v-model="queryParams.keyword">
+        <el-input class="search-input" placeholder="输入企业名称关键词" v-model="queryParams.keyword" clearable @clear="handleKeyword()">
           <template slot="prepend"><i class="el-icon-search"></i></template>
           <el-button slot="append" @click="handleKeyword">搜索</el-button>
         </el-input>
@@ -141,6 +141,7 @@
       </div>
       <div class="table-item">
         <el-table
+          v-if="tableDataTotal > 0"
           v-loading="tableLoading"
           :data="tableData"
           element-loading-text="Loading"
@@ -161,7 +162,7 @@
           </el-table-column>
           <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">
+              <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId}}" tag="a" class="a-link">
                 {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
               </router-link>
               <!--<span v-else>-</span>-->
@@ -227,8 +228,13 @@
           <el-table-column prop="developmentZone" label="所属开发区" :formatter="formatStatus" width="160" />
           <!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
         </el-table>
+        <div class="empty" v-if="tableDataTotal === 0">
+          <img class="img" src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+        </div>
       </div>
-      <div class="pagination-box">
+      <div class="pagination-box" v-if="tableDataTotal>pageSize">
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
@@ -259,7 +265,7 @@ export default {
       tableLoading: false,
       pageIndex: 1,
       pageSize: 10,
-      tableDataTotal: 120,
+      tableDataTotal: null,
       selected:[],
       xzdjCalss:'',
       props: {
@@ -651,7 +657,7 @@ export default {
         }
         ::v-deep .search-input{
           /*::v-deep .el-input{*/
-            width: 250px;
+            width: 260px;
             height: 32px;
             .el-input-group__prepend:first-child{
               padding: 0;
@@ -681,6 +687,27 @@ export default {
       }
       .table-item{
         margin-top: 22px;
+        .empty{
+          margin: 0 auto;
+          height: 550px;
+          text-align: center;
+          border-top: 1px solid #EFEFEF;
+          .img{
+            width: 108px;
+            height: 108px;
+            margin-bottom: 24px;
+            margin-top: 150px;
+          }
+          .p1{
+            color: #333333;
+            font-size: 16px;
+          }
+          .p2{
+            color: #999999;
+            font-size: 14px;
+            margin-top: 8px;
+          }
+        }
       }
       .companyName{
         width: 200px;

dsk-system/src/main/java/com/dsk/system/domain/BusinessAddDto.java

 package com.dsk.system.domain;
 
-import com.dsk.common.utils.StringUtils;
 import lombok.Data;
 
 /**
@@ -34,7 +33,7 @@ public class BusinessAddDto {
     /**
      * 投资估算
      */
-    private String investmentAmount;
+    private Double investmentAmount;
 
     /**
      * 项目阶段
@@ -59,8 +58,4 @@ public class BusinessAddDto {
      * 客户id
      */
     private String customerId;
-
-    public Double getInvestmentAmount() {
-        return StringUtils.isEmpty(investmentAmount) ? null :Double.parseDouble(investmentAmount);
-    }
 }

dsk-system/src/main/java/com/dsk/system/service/EconomicService.java

@@ -79,4 +79,13 @@ public interface EconomicService {
      */
     AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto);
 
+    /***
+     *@Description: 地区经济-对比
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult regionalMultipleCompare (OpRegionalEconomicRegionalCompareDto dto);
+
 }

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

 package com.dsk.system.service.impl;
 
-import java.util.List;
-
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.entity.BusinessContacts;
+import com.dsk.common.core.domain.model.LoginUser;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.CheckUtils;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.mapper.BusinessContactsMapper;
 import com.dsk.system.service.IBusinessContactsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 项目联系人Service业务层处理
  *
@@ -58,7 +61,11 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
     @Transactional
     public int insertBusinessContacts(BusinessContacts businessContacts)
     {
-        if(!CheckUtils.isPhone(businessContacts.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+        if(!CheckUtils.isPhone(businessContacts.getPhone())) throw new BaseException("500","请输入正确的电话号码");
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isEmpty(loginUser)) throw new BaseException("请登录");
+        //维护人员为当前登录用户
+        businessContacts.setAccendant(loginUser.getUsername());
         return businessContactsMapper.insertBusinessContacts(businessContacts);
     }
 
@@ -72,7 +79,7 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
     @Transactional
     public int updateBusinessContacts(BusinessContacts businessContacts)
     {
-        if(!CheckUtils.isPhone(businessContacts.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+        if(!CheckUtils.isPhone(businessContacts.getPhone())) throw new BaseException("500","请输入正确的电话号码");
         businessContacts.setUpdateTime(DateUtils.getNowDate());
         return businessContactsMapper.updateBusinessContacts(businessContacts);
     }

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

@@ -179,6 +179,13 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         //新增前查询是否已存在
         int count = businessInfoMapper.isRepetitionProjectName(dto.getProjectName(), dto.getUserId());
         if (count > 0) return AjaxResult.error("项目名称已存在");
+        //判断资金Double类型的位数
+        if (dto.getInvestmentAmount() != null) {
+            int front = CheckUtils.checkIntegerPlaces(dto.getInvestmentAmount());
+            int later = CheckUtils.checkDecimalPlaces(dto.getInvestmentAmount());
+            if (front > 9) return AjaxResult.error("小数点前最多支持9位");
+            if (later > 6) return AjaxResult.error("小数点后最多支持6位");
+        }
         //新增项目主信息
         BusinessInfo businessInfo = new BusinessInfo();
         BeanUtil.copyProperties(dto, businessInfo);
@@ -205,9 +212,16 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Override
     @Transactional
     public int updateBusinessInfo(BusinessInfo businessInfo) {
+        //判断资金Double类型的位数
+        if (businessInfo.getInvestmentAmount() != null) {
+            int front = CheckUtils.checkIntegerPlaces(businessInfo.getInvestmentAmount());
+            int later = CheckUtils.checkDecimalPlaces(businessInfo.getInvestmentAmount());
+            if (front > 9) throw new BaseException("500", "小数点前最多支持9位");
+            if (later > 6) throw new BaseException("500", "小数点后最多支持6位");
+        }
         if (StringUtils.isNotEmpty(businessInfo.getConstructionPhone()) && StringUtils.isNotEmpty(businessInfo.getSupervisorPhone())) {
             if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone()))
-                throw new BaseException("500", "请输入正确的手机号码");
+                throw new BaseException("500", "请输入正确的电话号码");
         }
         businessInfo.setUpdateTime(DateUtils.getNowDate());
         return businessInfoMapper.updateBusinessInfo(businessInfo);

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

 package com.dsk.system.service.impl;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
-import com.dsk.common.exception.base.BaseException;
-import com.dsk.common.utils.CheckUtils;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.mapper.BusinessRelateCompanyMapper;
@@ -16,6 +10,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 项目关联单位Service业务层处理
@@ -63,7 +59,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Transactional
     public int insertBusinessRelateCompany(BusinessRelateCompany businessRelateCompany)
     {
-//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码");
         businessRelateCompany.setCreateTime(DateUtils.getNowDate());
         return businessRelateCompanyMapper.insertBusinessRelateCompany(businessRelateCompany);
     }
@@ -78,7 +74,7 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
     @Transactional
     public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany)
     {
-//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的手机号码");
+//        if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码");
         businessRelateCompany.setUpdateTime(DateUtils.getNowDate());
         return businessRelateCompanyMapper.updateBusinessRelateCompany(businessRelateCompany);
     }

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

@@ -51,16 +51,17 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
-        List<CustomerListVo> vos = baseMapper.selectList(dto);
-        vos.parallelStream().forEach(vo -> {
-            //合作项目
-            vo.setCooperationProject(businessInfoService.selectCountByStatusAndCustomerId(2, vo.getCustomerId()));
-            //跟进项目
-            vo.setFollowProject(businessInfoService.selectCountByStatusAndCustomerId(1, vo.getCustomerId()));
-            //储备项目
-            vo.setReserveProject(businessInfoService.selectCountByStatusAndCustomerId(0, vo.getCustomerId()));
-        });
-        return vos;
+//        List<CustomerListVo> vos = baseMapper.selectList(dto);
+//        vos.parallelStream().forEach(vo -> {
+//            //合作项目
+//            vo.setCooperationProject(businessInfoService.selectCountByStatusAndCustomerId(2, vo.getCustomerId()));
+//            //跟进项目
+//            vo.setFollowProject(businessInfoService.selectCountByStatusAndCustomerId(1, vo.getCustomerId()));
+//            //储备项目
+//            vo.setReserveProject(businessInfoService.selectCountByStatusAndCustomerId(0, vo.getCustomerId()));
+//        });
+//        return vos;
+        return baseMapper.selectList(dto);
     }
 
     @Override

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

@@ -70,4 +70,10 @@ public class EconomicServiceImpl implements EconomicService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult regionalMultipleCompare(OpRegionalEconomicRegionalCompareDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/multipleCompare",  BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
 }

dsk-system/src/main/resources/mapper/business/BusinessContactsMapper.xml

@@ -12,8 +12,9 @@
         <result property="office" column="office"/>
         <result property="position" column="position"/>
         <result property="phone" column="phone"/>
+        <result property="sex" column="sex"/>
         <result property="accendant" column="accendant"/>
-        <result property="creatTime" column="creat_time"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
@@ -26,7 +27,8 @@
                position,
                phone,
                accendant,
-               creat_time,
+               sex,
+               create_time,
                update_time
         from business_contacts
     </sql>
@@ -41,9 +43,10 @@
             <if test="position != null  and position != ''">and position = #{position}</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="accendant != null  and accendant != ''">and accendant = #{accendant}</if>
-            <if test="creatTime != null ">and creat_time = #{creatTime}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="sex != null ">and sex = #{sex}</if>
         </where>
-        order by creat_time desc
+        order by update_time desc,id desc
     </select>
 
     <select id="selectBusinessContactsById" parameterType="Long" resultMap="BusinessContactsResult">
@@ -61,8 +64,9 @@
             <if test="position != null">position,</if>
             <if test="phone != null">phone,</if>
             <if test="accendant != null">accendant,</if>
-            <if test="creatTime != null">creat_time,</if>
+            <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="sex != null">sex,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="businessId != null">#{businessId},</if>
@@ -72,8 +76,9 @@
             <if test="position != null">#{position},</if>
             <if test="phone != null">#{phone},</if>
             <if test="accendant != null">#{accendant},</if>
-            <if test="creatTime != null">#{creatTime},</if>
+            <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="sex != null">#{sex},</if>
         </trim>
     </insert>
 
@@ -87,8 +92,9 @@
             <if test="position != null">position = #{position},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="accendant != null">accendant = #{accendant},</if>
-            <if test="creatTime != null">creat_time = #{creatTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="sex != null">sex = #{sex},</if>
         </trim>
         where id = #{id}
     </update>

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -356,7 +356,7 @@
             <if test="constructionPhone != null">construction_phone = #{constructionPhone},</if>
             <if test="supervisorUnit != null">supervisor_unit = #{supervisorUnit},</if>
             <if test="supervisorPrincipal != null">supervisor_principal = #{supervisorPrincipal},</if>
-            <if test="supervisorPhone != null">evaluation_bid_council = #{supervisorPhone},</if>
+            <if test="supervisorPhone != null">supervisor_phone = #{supervisorPhone},</if>
         </trim>
         where id = #{id}
     </update>

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -10,7 +10,7 @@
         ct.performance_characteristic, ct.other_ms_characteistic, ct.create_id, ct.create_time, ct.update_id, ct.update_time
     </sql>
 
-    <select id="selectList" resultType="com.dsk.system.domain.customer.vo.CustomerListVo">
+    <select id="selectList1" resultType="com.dsk.system.domain.customer.vo.CustomerListVo">
         select
              u.nick_name followUser,
              <include refid="Base_Bean"></include>
@@ -21,6 +21,26 @@
         <if test="dto.companyName != null and dto.companyName != '' "> and ct.company_name like concat('%',#{dto.companyName},'%')</if>
     </select>
 
+    <select id="selectList" resultType="com.dsk.system.domain.customer.vo.CustomerListVo">
+        select
+            u.nick_name followUser, bi1.num reserveProject, bi2.num followProject, bi3.num cooperationProject,
+            <include refid="Base_Bean"></include>
+        from customer ct
+        join customer_user ctu on ct.customer_id = ctu.customer_id
+        join sys_user u on ctu.user_id = u.user_id
+        left join (
+            select count(status) num,customer_id from business_info where `status` = 0 group by customer_id
+        ) bi1 on bi1.customer_id = ct.customer_id
+        left join (
+            select count(status) num,customer_id from business_info where `status` = 1 group by customer_id
+        ) bi2 on bi2.customer_id = ct.customer_id
+        left join (
+            select count(status) num,customer_id from business_info where `status` = 2 group by customer_id
+        ) bi3 on bi3.customer_id = ct.customer_id
+        where ctu.user_id = #{dto.userId}
+        <if test="dto.companyName != null and dto.companyName != '' "> and ct.company_name like concat('%',#{dto.companyName},'%')</if>
+    </select>
+
     <select id="selectUserList" resultType="com.dsk.system.domain.customer.Customer">
         select
             ct.customer_id, ct.company_name