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

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

@@ -25,16 +25,12 @@ public class RegionalEnterprisesController {
     @Autowired
     private RegionalEnterprisesService regionalEnterprisesService;
 
-    @PostMapping("regional/page")
+    @PostMapping("/regional/page")
     public AjaxResult page(@RequestBody JSONObject object) throws Exception{
         ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        compose.getPage().setPage(compose.getPageNum());
-        compose.getPage().setLimit(compose.getPageSize());
-        compose.getPage().setField(compose.getField());
-        compose.getPage().setOrder(compose.getOrder());
         if (PageQueryLimit.pageLimit(compose.getPage())){
             return AjaxResult.error("翻页已达到上限");
         }
-        return regionalEnterprisesService.enterprisePage(compose);
+        return regionalEnterprisesService.enterprisePage(object);
     }
 }

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

 package com.dsk.jsk.service.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.jsk.domain.bo.ComposeQueryDto;
 
 /**
  * @ClassName EconomicService
@@ -19,5 +19,5 @@ public interface RegionalEnterprisesService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult enterprisePage(ComposeQueryDto compose) throws Exception;
+    AjaxResult enterprisePage(JSONObject object) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.dsk.jsk.service.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.DskOpenApiUtil;
@@ -29,8 +30,8 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult enterprisePage(ComposeQueryDto pageDto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(pageDto, false, false));
+    public AjaxResult enterprisePage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(object, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (code.equals(HttpStatus.OK.value())) {
             Map data = MapUtils.getMap(map, "data", null);

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

@@ -162,7 +162,7 @@ public class BusinessOpportunityRadarService {
     }
 
     public AjaxResult bxproPage(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/subscription/bxproPage", object);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/subscription/yqBxproPage", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-operate-ui/src/api/system/user.js

@@ -133,3 +133,12 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+// 用户文件记录列表
+export function fileList(data) {
+  return request({
+    url: '/user/file/record/list',
+    method: 'get',
+    params:data
+  })
+}

dsk-operate-ui/src/views/system/user/index.vue

@@ -673,7 +673,6 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.userName = this.form.phonenumber
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
               if(response.code == 200){
@@ -687,6 +686,7 @@ export default {
               }
             });
           } else {
+            this.form.userName = this.form.phonenumber
             addUser(this.form).then(response => {
               if(response.code == 200){
                 this.$modal.msgSuccess("新增成功");

dsk-operate-ui/src/views/system/user/profile/index.vue

@@ -53,6 +53,38 @@
             </el-tab-pane>
           </el-tabs>
         </el-card>
+        <el-card style="margin-top: 16px" v-if="tableDataTotal > 0">
+          <div slot="header" class="clearfix">
+            <span>数据导出</span>
+          </div>
+          <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+          <div class="table-item">
+            <el-table
+              class="fixed-table"
+              :data="tableData"
+              element-loading-text="Loading"
+              v-horizontal-scroll="'hover'"
+              max-height="640px"
+              border
+              highlight-current-row
+              v-if="tableDataTotal > 0 && !isSkeleton"
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">{{ (params.pageNum - 1 )* params.pageSize + scope.$index + 1 }}</template>
+              </el-table-column>
+              <el-table-column label="导出表格名称" align="left" prop="fileName"></el-table-column>
+              <el-table-column label="导出时间" align="left" prop="createTime"></el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope" align="left">
+                  <div class="wordprimary" style="text-align: left" @click="getFile(scope.row.url)">下载表格</div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="pagination-box" v-if="tableDataTotal>params.pageSize">
+            <el-pagination background :current-page="params.pageNum" :page-size="params.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+          </div>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -62,21 +94,27 @@
 import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
+import { getUserProfile,fileList } from "@/api/system/user";
+import skeleton from '@/views/project/projectList/component/skeleton'
 
 export default {
   name: "Profile",
-  components: { userAvatar, userInfo, resetPwd },
+  components: { userAvatar, userInfo, resetPwd,skeleton },
   data() {
     return {
       user: {},
       roleGroup: {},
       postGroup: {},
-      activeTab: "userinfo"
+      activeTab: "userinfo",
+      isSkeleton:true,
+      tableData:[],
+      tableDataTotal:0,
+      params:{pageNum:1,pageSize:10},
     };
   },
   created() {
     this.getUser();
+    this.fileList()
   },
   methods: {
     getUser() {
@@ -85,6 +123,30 @@ export default {
         this.roleGroup = response.data.roleGroup;
         this.postGroup = response.data.postGroup;
       });
+    },
+    fileList(){
+      fileList(this.params).then(res=>{
+        if(res.code == 200){
+          this.tableData = res.rows
+          this.tableDataTotal = res.total
+        }else{
+          this.tableData = []
+          this.tableDataTotal = 0
+        }
+        this.isSkeleton = false
+      })
+    },
+    handleCurrentChange(val){
+      this.params.pageNum = val
+      this.fileList()
+    },
+    handleSizeChange(val){
+      this.params.pageNum = 1
+      this.params.pageSize = val
+      this.fileList()
+    },
+    getFile(url){
+      window.open(url)
     }
   }
 };