Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java

@@ -2,6 +2,7 @@ package com.dsk.jsk.controller;
 
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.jsk.domain.JskCompanyRelationTableV1DetailPageDto;
 import com.dsk.jsk.domain.JskCompanyRelationTableV1Dto;
 import com.dsk.jsk.service.CompanyRelationTableV1Service;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,7 +47,7 @@ public class CompanyRelationTableV1Controller {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/detailPage")
-    public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
+    public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1DetailPageDto dto) throws Exception{
         return relationTableV1Service.detailPage(dto);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName JskCompanyRelationTableV1DetailPageDto
+ * @Description  查看详情
+ * @Author Dgm
+ * @Date 2023/12/11 20:37
+ * @Version
+ */
+@Data
+public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
+
+    /**
+     * 搜-关键字素
+     */
+    private String keyword;
+    /**
+     * 企业类型
+     */
+    private String companyRole;
+
+    /**
+     * 项目类型
+     */
+    private List<String> counterpartCompanyRoles;
+    /**
+     * 工程类型
+     */
+    private List<String> projectTypes;
+    /**
+     * 咨询机构业务类型
+     */
+    private List<String> businessTypes;
+
+    /**
+     * 公布日期-开始时间
+     */
+    private String beginTime;
+    /**
+     * 公布日期-结束时间
+     */
+    private String endTime;
+
+    /**
+     * 本次合作合同金额(万元)-最大金额
+     */
+    private Double maxAmount;
+    /**
+     * 本次合作合同金额(万元)-最小金额
+     */
+    private Double minAmount;
+    /**
+     * 企业Id
+     */
+    private Integer companyId;
+
+    /**
+     * 企业类型 1：业主 2：施工 3：集团
+     */
+    private Integer companyType;
+
+    /**
+     * 排序 1:金额降序 2:金额升序 3: 时间降序 4: 时间升区5: 数量降序6：数量升序
+     */
+    private Integer sort = 5;
+
+    /**
+     * 集团Id
+     */
+    private String combineId;
+
+    /**
+     * 成员Id（常合作集团成员详情）
+     */
+    private Integer memberId;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java

@@ -34,7 +34,7 @@ public class CompanyRelationTableV1Service {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
+    public TableDataInfo detailPage(JskCompanyRelationTableV1DetailPageDto dto) throws Exception {
         Map<String, Object> map = null;
         if (dto.getCompanyType().equals(3) || dto.getCompanyType().equals(4)) {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

@@ -8,6 +8,7 @@ import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.excel.ExcelUtils;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.common.utils.redis.RedisUtils;
 import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
 import com.dsk.jsk.service.EnterpriseService;
@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.*;
 
 /**
@@ -42,18 +44,25 @@ public class ExportService {
     private String EXPORT_BACK_URL;
 
     public AjaxResult aptitudeFile(MultipartFile file) throws Exception {
+        int exportCount = 1;
+        if (RedisUtils.hasKey("aptitudeFileExportCount")){
+            exportCount = RedisUtils.getCacheObject("aptitudeFileExportCount");
+            if (exportCount>=3){
+                return AjaxResult.error("每天最多导出3次");
+            }
+        }
+
         ComposeQueryDto composeQueryDto = new ComposeQueryDto();
         //识别Excel内容
         List<AptitudeVo> companyNameList = new ExcelUtils<>(AptitudeVo.class).importExcel(file.getInputStream(), 2);
         if (companyNameList.isEmpty()) {
-            throw new ServiceException("表格中不存在待导入数据!");
+            throw new ServiceException("表格中不存在待查询数据!");
         }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < companyNameList.size(); i++) {
-            if (i>499){
-                break;
+            if (i<500){
+                list.add(companyNameList.get(i).getCompanyName());
             }
-            list.add(companyNameList.get(i).getCompanyName());
         }
         composeQueryDto.setKeyword(String.join(",",list));
         SimpleDateFormat sdf =new SimpleDateFormat("yyyyMMdd");
@@ -72,6 +81,8 @@ public class ExportService {
         composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
         composeQueryDto.setExportExeclName(fileName);
         dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
+        RedisUtils.setCacheObject("aptitudeFileExportCount",exportCount);
+        RedisUtils.expire("aptitudeFileExportCount", Duration.ofHours(24));
         return AjaxResult.success();
     }
 
@@ -83,6 +94,7 @@ public class ExportService {
         //生成中
         fileRecord.setStatus(2);
         fileRecord.setRemark("集团成员列表导出");
+        fileRecord.setCreateTime(new DateTime());
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         dto.setExportUniqueCode(fileId.toString());
         //回调函数
@@ -99,6 +111,7 @@ public class ExportService {
         //生成中
         fileRecord.setStatus(2);
         fileRecord.setRemark("集团中标业绩导出");
+        fileRecord.setCreateTime(new DateTime());
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         dto.setExportUniqueCode(fileId.toString());
         //回调函数
@@ -115,6 +128,7 @@ public class ExportService {
         //生成中
         fileRecord.setStatus(2);
         fileRecord.setRemark("集团招标业绩导出");
+        fileRecord.setCreateTime(new DateTime());
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         dto.setExportUniqueCode(fileId.toString());
         //回调函数

dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue

@@ -49,8 +49,8 @@
                   <span class="color1 span">高风险 {{scope.row.highRiskCount}}</span>
                   <span class="color2 span">中风险 {{scope.row.middleRiskCount}}</span>
                   <span class="color3 span">低风险 {{scope.row.lowRiskCount}}</span>
-                  <span class="color4 span">提示 {{scope.row.promptCount}}</span>
-                  <span class="color5 span">正向 {{scope.row.positiveCount}}</span>
+                  <!--<span class="color4 span">提示 {{scope.row.promptCount}}</span>-->
+                  <!--<span class="color5 span">正向 {{scope.row.positiveCount}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column label="监控时间" width="200" align="left" prop="createTime"></el-table-column>
@@ -95,7 +95,7 @@
             </el-input>
           </div>
           <div class="companyList">
-            <div class="list">
+            <div class="list"  v-loading="loading">
               <div class="item" v-for="item in dataList">
                 <div class="item-left">
                   <img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.companyName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
@@ -209,6 +209,8 @@
         },
         companyId:'',
         downloadhref: '',//样例地址
+        // 加载状态
+        loading: false,
       }
     },
     created() {
@@ -226,6 +228,7 @@
         })
       },
       handleKeyword(){
+        this.dataList=[]
         this.addEnterprise()
       },
       changeCheckbox(item){
@@ -334,6 +337,7 @@
       },
       addEnterprise(){
         this.qyVisible=true;
+        this.loading = true
         let data={
           pageNum:1,
           pageSize:10
@@ -342,6 +346,7 @@
           data.companyName=this.companyName;
         }
         queryMonitorCompany(data).then(res => {
+          this.loading = false
           this.dataList=res.rows;
         })
       },

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -202,14 +202,6 @@
           },
         ],
         fxjb:[
-          {
-            value:'提示',
-            label:'提示'
-          },
-          {
-            value:'正向',
-            label:'正向'
-          },
           {
             value:'低风险',
             label:'低风险'

dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue

@@ -7,7 +7,7 @@
             <img src="@/assets/images/enterprise.png"/>
             <span>{{object.companyName}}</span>
           </div>
-          <p>
+          <p style="margin: 12px 0;">
             <span class="label">法定代表人：</span>
             <span class="val">{{object.corporatePerson}}</span>
             <span class="label">注册资本：</span>
@@ -54,7 +54,7 @@
           <div class="label">时间筛选</div>
           <div class="checkbox">
             <el-radio-group v-model="radio">
-              <el-radio v-for="item in radioList" :label="item.type">{{item.label}}</el-radio>
+              <el-radio v-for="item in radioList" @change="radioBtn" :label="item.type">{{item.label}}</el-radio>
             </el-radio-group>
             <el-date-picker
               v-if="radio==4"
@@ -63,6 +63,7 @@
               value-format="yyyy-MM-dd"
               unlink-panels
               size="small"
+              @change="changePicker"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -189,23 +190,15 @@
         ],
         fxjb:[
           {
-            value:'1',
-            label:'提示'
-          },
-          {
-            value:'2',
-            label:'正向'
-          },
-          {
-            value:'3',
+            value:'低风险',
             label:'低风险'
           },
           {
-            value:'4',
+            value:'中风险',
             label:'中风险'
           },
           {
-            value:'5',
+            value:'高风险',
             label:'高风险'
           },
         ],
@@ -443,6 +436,46 @@
             break;
         }
       },
+      radioBtn(val){
+        let endTime = new Date()
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        switch (val) {
+          case 1:
+            this.queryParams.condition.beginTime=this.formatDate(endTime)
+            this.queryParams.condition.endTime=this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 2:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 3))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 3:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 7))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 4:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 15))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 5:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 30))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 6:
+            this.date=[]
+            break;
+          default:
+            this.queryParams.condition.beginTime=''
+            this.queryParams.condition.endTime=''
+            this.querySubmit()
+            break;
+        }
+      },
       // 重置页数
       handleSizeChange(val) {
         this.queryParams.pageNum = 1
@@ -455,6 +488,16 @@
         this.querySubmit()
         window.scrollTo(0, 0);
       },
+      // 时间选择改变后的回调
+      changePicker(value) {
+        if(value && value.length) {
+          this.queryParams.condition.beginTime = value[0]
+          this.queryParams.condition.endTime = value[1]
+        }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
       // 时间格式化
       formatDate(timeStr) {
         let date = new Date(Number(timeStr));

dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue

@@ -26,19 +26,19 @@
                 <el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
                 class="table-item1 fixed-table" border highlight-current-row>
                 
-                    <el-table-column label="资质名称" fixed >
+                    <el-table-column :resizable="false" label="资质名称" fixed >
                         <template slot-scope="scope">
                             {{scope.row.name}}
                         </template>
                     </el-table-column>
                     
-                    <el-table-column label="等级" width="274">
+                    <el-table-column :resizable="false" label="等级" width="274">
                         <template slot-scope="scope">
                             {{scope.row.level||"--"}}
                         </template>
 
                     </el-table-column>
-                    <el-table-column label="经营范围" >
+                    <el-table-column :resizable="false" label="经营范围" >
                         <template slot-scope="scope">
                             {{scope.row.contractScope||"--"}}
                         </template>

dsk-operate-ui/src/views/supplier/components/BatchImport.vue

 <template>
-    <el-dialog title="批量查资质" custom-class="batch_import_dialog" :visible.sync="visible">
+    <el-dialog title="批量查资质" :close-on-click-modal="false" custom-class="batch_import_dialog" :visible.sync="visible">
       <div class="upload" >
         <div class="up_title">导入Excel文件，高效查询或导出企业信息；查询成功后可使用筛选项二次筛选</div>
         <div>

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -80,41 +80,41 @@
                         </div>
                         <el-table :data="item.aptitudeListude" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
                             class="table-item1 fixed-table" border highlight-current-row>
-                            <el-table-column label="证书编号" fixed width="119">
+                            <el-table-column :resizable="false" label="证书编号" fixed width="119">
                                 <template slot-scope="scope">
                                     {{scope.row.serial||"--"}}
                                 </template>
                             </el-table-column>
                             
-                            <el-table-column label="资质名称" fixed width="273">
+                            <el-table-column :resizable="false" label="资质名称" fixed width="273">
                                 <template slot-scope="scope">
                                     {{scope.row.name||"--"}}
                                 </template>
 
                             </el-table-column>
-                            <el-table-column label="承包工程范围" width="415">
+                            <el-table-column :resizable="false" label="承包工程范围" width="415">
                                 <template slot-scope="scope">
                                     {{scope.row.contractScope||"--"}}
                                 </template>
                             </el-table-column>
 
                             
-                            <el-table-column label="发证日期" width="119">
+                            <el-table-column :resizable="false" label="发证日期" width="119">
                                 <template slot-scope="scope">
                                     {{scope.row.issuTime||"--"}}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="有效期至" width="119">
+                            <el-table-column :resizable="false" label="有效期至" width="119">
                                 <template slot-scope="scope">
                                     {{scope.row.validate||"--"}}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="发证机关" width="204">
+                            <el-table-column :resizable="false" label="发证机关" width="204">
                                 <template slot-scope="scope">
                                     {{scope.row.organ||"--"}}
                                 </template>
                             </el-table-column>
-                            <el-table-column label="经营范围" width="415">
+                            <el-table-column :resizable="false" label="经营范围" width="415">
                                 <template slot-scope="scope">
                                     <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
                                         <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
@@ -125,7 +125,7 @@
                     </div>
                 </div>
                 <div class="pagination clearfix" v-show="total>0">
-                    <el-pagination background :page-size="pageSize" :current-page="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                    <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                         :total="total">
                     </el-pagination>
                 </div>
@@ -140,41 +140,41 @@
                     <span class="float_r">共有 <span style="color: #0081FF;">{{ dialogData.total }}</span> 个资质</span>
                 </div>
                 <el-table :data="dialogData.list" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'" class="table-item1 fixed-table" border highlight-current-row>
-                    <el-table-column label="证书编号" fixed width="119">
+                    <el-table-column :resizable="false" label="证书编号" fixed width="119">
                         <template slot-scope="scope">
                             {{scope.row.serial||"--"}}
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="资质名称" fixed width="273">
+                    <el-table-column :resizable="false" label="资质名称" fixed width="273">
                         <template slot-scope="scope">
                             {{scope.row.name||"--"}}
                         </template>
 
                     </el-table-column>
-                    <el-table-column label="承包工程范围" width="415">
+                    <el-table-column :resizable="false" label="承包工程范围" width="415">
                         <template slot-scope="scope">
                             {{scope.row.contractScope||"--"}}
                         </template>
                     </el-table-column>
 
 
-                    <el-table-column label="发证日期" width="119">
+                    <el-table-column :resizable="false" label="发证日期" width="119">
                         <template slot-scope="scope">
                             {{scope.row.issuTime||"--"}}
                         </template>
                     </el-table-column>
-                    <el-table-column label="有效期至" width="119">
+                    <el-table-column :resizable="false" label="有效期至" width="119">
                         <template slot-scope="scope">
                             {{scope.row.validate||"--"}}
                         </template>
                     </el-table-column>
-                    <el-table-column label="发证机关" width="204">
+                    <el-table-column :resizable="false" label="发证机关" width="204">
                         <template slot-scope="scope">
                             {{scope.row.organ||"--"}}
                         </template>
                     </el-table-column>
-                    <el-table-column label="经营范围" width="415">
+                    <el-table-column :resizable="false" label="经营范围" width="415">
                         <template slot-scope="scope">
                             <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
                                 <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
@@ -374,8 +374,14 @@ export default {
 
         },
         handleCurrentChange(pageNum) {
-            this.pageNum = pageNum;
-            this.search();
+            if(pageNum*this.pageSize>10000){
+                this.$message.warning("数据达上限")
+                this.pageNum = 10000/this.pageSize
+            }else{
+                this.pageNum = pageNum;
+            }
+            this.search()
+
         },
         handleCurrentChange1(pageNum) {
             this.pageNum1 = pageNum;

dsk-operate-ui/src/views/supplier/components/SearchResult.vue

@@ -2,25 +2,25 @@
     <div class="search_result_box">
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
                 class="table-item1 fixed-table" border highlight-current-row>
-                <el-table-column type="index" label="序号" fixed width="60">
+                <el-table-column :resizable="false" type="index" label="序号" fixed width="60">
                 <template slot-scope="scope">
                     <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
                 </template>
                 </el-table-column>
-                <el-table-column label="表格名称" >
+                <el-table-column :resizable="false" label="表格名称" >
                 <template slot-scope="scope">
                     {{scope.row.fileName||"--"}}
                 </template>
 
                 </el-table-column>
-                <el-table-column label="查询时间" width="189">
+                <el-table-column :resizable="false" label="查询时间" width="189">
                 <template slot-scope="scope">
                     {{scope.row.createTime||"--"}}
                 </template>
                 </el-table-column>
 
                 
-                <el-table-column label="操作" width="154">
+                <el-table-column :resizable="false" label="操作" width="154">
                 <template slot-scope="scope">
                     <a class="download_span" :href="scope.row.url" v-if="scope.row.url">下载</a>
                     <span v-else >--</span>