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/cscec/controller/DCustomerController.java

 package com.dsk.cscec.controller;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.service.IDCustomerService;
+import com.dsk.system.domain.SysDept;
+import com.dsk.system.domain.vo.SysDeptVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 组织维表(DCustomer)表控制层
@@ -14,14 +26,22 @@ import javax.annotation.Resource;
  * @author lcl
  * @since 2023-12-08 14:57:22
  */
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/customer")
 public class DCustomerController extends BaseController {
     /**
      * 服务对象
      */
-    @Resource
-    private IDCustomerService baseService;
+    private final IDCustomerService baseService;
+
+    /**
+     * 供应商总台账筛选
+     */
+    @GetMapping("/all/searchList")
+    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+        return baseService.allSearchList(bo,query);
+    }
 
   
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DProjectController.java

+package com.dsk.cscec.controller;
+
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.cscec.service.IDProjectService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目维表(DProject)表控制层
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:46
+ */
+@RestController
+@RequestMapping("dProject")
+public class DProjectController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private IDProjectService IDProjectService;
+
+    ///**
+    // * 分页查询所有数据
+    // *
+    // * @param page 分页对象
+    // * @param dProject 查询实体
+    // * @return 所有数据
+    // */
+    //@GetMapping
+    //public R selectAll(Page<DProject> page, DProject dProject) {
+    //    return success(this.dProjectService.page(page, new QueryWrapper<>(dProject)));
+    //}
+    //
+    ///**
+    // * 通过主键查询单条数据
+    // *
+    // * @param id 主键
+    // * @return 单条数据
+    // */
+    //@GetMapping("{id}")
+    //public R selectOne(@PathVariable Serializable id) {
+    //    return success(this.dProjectService.getById(id));
+    //}
+    //
+    ///**
+    // * 新增数据
+    // *
+    // * @param dProject 实体对象
+    // * @return 新增结果
+    // */
+    //@PostMapping
+    //public R insert(@RequestBody DProject dProject) {
+    //    return success(this.dProjectService.save(dProject));
+    //}
+    //
+    ///**
+    // * 修改数据
+    // *
+    // * @param dProject 实体对象
+    // * @return 修改结果
+    // */
+    //@PutMapping
+    //public R update(@RequestBody DProject dProject) {
+    //    return success(this.dProjectService.updateById(dProject));
+    //}
+    //
+    ///**
+    // * 删除数据
+    // *
+    // * @param idList 主键结合
+    // * @return 删除结果
+    // */
+    //@DeleteMapping
+    //public R delete(@RequestParam("idList") List<Long> idList) {
+    //    return success(this.dProjectService.removeByIds(idList));
+    //}
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/DCustomerSearchBo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @Author lcl
+ * @Data 2023/12/8 16:07
+ */
+@Data
+public class DCustomerSearchBo {
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 区域
+     */
+    private String[] region;
+    /**
+     * 省
+     */
+    private String[] province;
+    /**
+     * 市
+     */
+    private String[] city;
+    /**
+     * 供应商类别
+     */
+    private String[] customerClass;
+    /**
+     * 供应商状态
+     */
+    private String[] customerState;
+    /**
+     * 评价等级
+     */
+    private String[] creditLevel;
+    /**
+     * 资质等级
+     */
+    private String[] credential;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DCustomerMapper.java

@@ -2,7 +2,13 @@ package com.dsk.cscec.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 组织维表(DCustomer)表数据库访问层
@@ -12,5 +18,7 @@ import com.dsk.cscec.domain.DCustomer;
  */
 public interface DCustomerMapper extends BaseMapper<DCustomer> {
 
+    Page<DCustomer> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.DProject;
+
+/**
+ * 项目维表(DProject)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:46
+ */
+public interface DProjectMapper extends BaseMapper<DProject> {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.java

 package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 
 /**
  * 组织维表(DCustomer)表服务接口
@@ -11,5 +14,7 @@ import com.dsk.cscec.domain.DCustomer;
  */
 public interface IDCustomerService extends IService<DCustomer> {
 
+    TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query);
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.DProject;
+
+/**
+ * 项目维表(DProject)表服务接口
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:51
+ */
+public interface IDProjectService extends IService<DProject> {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

 package com.dsk.cscec.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.service.IDCustomerService;
@@ -15,5 +18,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService {
 
+    @Override
+    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+        return TableDataInfo.build(baseMapper.allSearchList(query.build(),bo));
+    }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.DProjectMapper;
+import com.dsk.cscec.domain.DProject;
+import com.dsk.cscec.service.IDProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目维表(DProject)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-12-10 15:34:51
+ */
+@Service("dProjectService")
+public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> implements IDProjectService {
+
+}
+

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml

@@ -4,5 +4,15 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.DCustomerMapper">
 
+    <select id="allSearchList" resultType="com.dsk.cscec.domain.DCustomer">
+        select
+            customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business, paytax_type, tax_rate,
+            customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality, construct_job_scope, credential,
+            register_capital, contact_person, contact_phone, approve_date2, credit_level
+        from d_customer
+        where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
+        <if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
+         order by approve_date2 desc
+    </select>
 
 </mapper>
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.DProjectMapper">
+
+
+
+</mapper>
\ No newline at end of file

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -21,7 +21,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -270,6 +271,7 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'laborSubcontracting',
     components:{skeleton},
@@ -277,6 +279,12 @@
       return{
         encodeStr,
         formdata:{},
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         options: [
           {
             value: 'zhinan',
@@ -488,10 +496,25 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
       handleCurrentChange(){
 
+      },
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
       },
       setHeaderRow() {
         return "owner-table-list-header";

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -29,7 +29,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.user" placeholder="请选择">
@@ -303,12 +304,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'laborSubcontractingTeam',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -521,8 +529,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -21,7 +21,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -302,12 +303,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'ledger',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -541,8 +549,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -21,7 +21,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -270,12 +271,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'professionalSubcontracting',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -488,8 +496,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

@@ -22,7 +22,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -266,12 +267,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'rentalServices',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -484,8 +492,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -21,7 +21,8 @@
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="options"></el-cascader>
+                :options="addressList" :collapse-tags="true"
+                :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
@@ -265,12 +266,19 @@
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import dataRegion from '@/assets/json/provinceTree'
   export default {
     name: 'supplySubcontracting',
     components:{skeleton},
     data(){
       return{
         encodeStr,
+        addressList:[],
+        provienceprops:{
+          checkStrictly:true,
+          multiple:true,
+          value:'id',
+        },
         formdata:{},
         options: [
           {
@@ -483,8 +491,23 @@
       }
     },
     created() {
+      this.dataRegion()
     },
     methods:{
+      //地区
+      async dataRegion() {
+        let addrs = JSON.parse(JSON.stringify(dataRegion))
+        addrs.forEach(item=>{
+          if (item.children) {
+            (item.children).forEach(i => {
+              if (i.children) {
+                delete i.children
+              }
+            })
+          }
+        })
+        this.addressList = addrs;
+      },
       handleCurrentChange(){
 
       },