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-admin/src/main/resources/application.yml

@@ -207,6 +207,8 @@ tenant:
     - cb_project_other
     - s_materiel_project
     - labor_leader_customer_risk
+    - f_supplier_limited_relieve
+    - d_customer_class
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

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

+package com.dsk.cscec.controller;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.cscec.domain.vo.DCustomerClassTreeVo;
+import com.dsk.cscec.service.DCustomerClassService;
+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;
+
+/**
+ * (DCustomerClass)表控制层
+ *
+ * @author sxk
+ * @since 2024-06-19 17:03:19
+ */
+@RestController
+@RequestMapping("dCustomerClass")
+public class DCustomerClassController extends BaseController {
+    @Resource
+    private DCustomerClassService baseService;
+
+    /**
+     * 查询物资类别树
+     */
+    @GetMapping("/queryMaterialClassTree")
+    public R<List<DCustomerClassTreeVo>> queryMaterialClassTree() {
+        return R.ok(baseService.queryMaterialClassTree());
+    }
+}
+

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

+package com.dsk.cscec.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (DCustomerClass)实体类
+ *
+ * @author sxk
+ * @since 2024-06-19 17:03:19
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DCustomerClass implements Serializable {
+    private static final long serialVersionUID = 623070004380284125L;
+    /**
+     * 类别ID
+     */
+    private String customerClassId;
+    /**
+     * 类别编码
+     */
+    private Long customerClassCode;
+    /**
+     * 类别名称
+     */
+    private String customerClassName;
+    /**
+     * 类别名称编码1
+     */
+    private String customerClassCode1;
+    /**
+     * 类别名称1
+     */
+    private String customerClassName1;
+    /**
+     * 类别名称编码2
+     */
+    private String customerClassCode2;
+    /**
+     * 类别名称2
+     */
+    private String customerClassName2;
+    /**
+     * 类别名称编码3
+     */
+    private String customerClassCode3;
+    /**
+     * 类别名称3
+     */
+    private String customerClassName3;
+    /**
+     * 层级编号
+     */
+    private Long levelNo;
+    /**
+     * 是否叶子结点
+     */
+    private String isleaf;
+    /**
+     * 是否有效
+     */
+    private String isvalid;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 父级ID
+     */
+    private String parentId;
+    /**
+     * 加载时间
+     */
+    private Date loadTime;
+}

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

+package com.dsk.cscec.domain;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 供应商解除限制信息表(FSupplierLimitedRelieve)实体类
+ *
+ * @author sxk
+ * @since 2024-06-18 11:51:00
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FSupplierLimitedRelieve extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = -98358830181337808L;
+
+    private String fid;
+    /**
+     * 版本
+     */
+    private Long version;
+    /**
+     * 单据编号
+     */
+    private String frecordno;
+    /**
+     * 子企业
+     */
+    private String fjobunitname;
+    /**
+     * 子企业id
+     */
+    private String fjobunitid;
+    /**
+     * 供应商名称
+     */
+    private String fsuppliername;
+    /**
+     * 供应商统一社会信用代码
+     */
+    private String funifiedsocialcreditcode;
+    /**
+     * 限用情形
+     */
+    private String flimitsituation;
+    /**
+     * 禁用情形
+     */
+    private String fdisablesituation;
+    /**
+     * 限用/禁用状态
+     */
+    private String fstate;
+    /**
+     * 解除前状态
+     */
+    private String fbeforestate;
+    /**
+     * 限用日期
+     */
+    private Date flimitdate;
+    /**
+     * 解除限用理由
+     */
+    private String frelievereason;
+    /**
+     * 附件
+     */
+    private String fattachment;
+    /**
+     * 备注
+     */
+    private String fremarks;
+    /**
+     * 流程状态
+     */
+    private String fbizstate;
+    /**
+     * 流程状态名称
+     */
+    private String fbizstatename;
+    /**
+     * 数据类型
+     */
+    private String fdatatype;
+    /**
+     * 时间戳
+     */
+    private Date fts;
+    /**
+     * 创建时间
+     */
+    private Date fcreatetime;
+    /**
+     * 创建人fullid
+     */
+    private String fcreatepsnfid;
+    /**
+     * 创建人fullname
+     */
+    private String fcreatepsnfname;
+    /**
+     * 是否为局名义被诉案件
+     */
+    private String fisgroupcase;
+
+    private String fcategoryname;
+    /**
+     * 劳务分包id
+     */
+    private String flaowufbid;
+    /**
+     * 专业分包id
+     */
+    private String fzhuanyefbid;
+    /**
+     * 分供id
+     */
+    private String ffgid;
+    /**
+     * 租赁id
+     */
+    private String fzlid;
+
+    private String flimitstate;
+    /**
+     * 数据加载时间
+     */
+    private Date loadTime;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/DCustomerClassTreeVo.java

+package com.dsk.cscec.domain.vo;
+
+import com.dsk.cscec.domain.DCustomerClass;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author sxk
+ * @date 2024.06.19
+ * @time 17:28
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DCustomerClassTreeVo extends DCustomerClass {
+    /**
+     * 子集
+     */
+    private List<DCustomerClassTreeVo> children = new ArrayList<>();
+}

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.DCustomerClass;
+
+/**
+ * (DCustomerClass)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-06-19 17:03:19
+ */
+public interface DCustomerClassMapper extends BaseMapper<DCustomerClass> {
+
+}
+

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

@@ -32,4 +32,9 @@ public interface DProjectMapper extends BaseMapper<DProject> {
      * 获取合作项目明细
      */
     Page<CooperateProjectDetailSearchVo> selectPageCooperateProjectDetailList(@Param("page") Page<CooperateProjectDetailSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> Wrapper);
+
+    /**
+     * 获取业主单位列表
+     */
+    List<String> getOwnerNameList(@Param("contractOrgId") String contractOrgId);
 }
\ No newline at end of file

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

 package com.dsk.cscec.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.cscec.domain.FSupplierLimited;
 import com.dsk.cscec.domain.vo.SupplierLimitedSearchVo;
-import com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -22,9 +20,9 @@ public interface FSupplierLimitedMapper extends BaseMapper<FSupplierLimited> {
      */
     Page<SupplierLimitedSearchVo> selectPageSupplierLimitedList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) Wrapper<FSupplierLimited> wrapper);
 
-    /**
-     * 获取解除限用禁用名单
-     */
-    Page<SupplierUnlimitedSearchVo> selectPageSupplierUnlimitedList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) QueryWrapper<FSupplierLimited> wrapper);
+    ///**
+    // * 获取解除限用禁用名单
+    // */
+    //Page<SupplierUnlimitedSearchVo> selectPageSupplierUnlimitedList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) QueryWrapper<FSupplierLimited> wrapper);
 }
 

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.cscec.domain.FSupplierLimited;
+import com.dsk.cscec.domain.FSupplierLimitedRelieve;
+import com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 供应商解除限制信息表(FSupplierLimitedRelieve)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-06-18 11:51:00
+ */
+public interface FSupplierLimitedRelieveMapper extends BaseMapper<FSupplierLimitedRelieve> {
+    /**
+     * 获取解除限用禁用名单
+     */
+    Page<SupplierUnlimitedSearchVo> selectPageSupplierUnlimitedList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) QueryWrapper<FSupplierLimited> wrapper);
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.DCustomerClass;
+import com.dsk.cscec.domain.vo.DCustomerClassTreeVo;
+
+import java.util.List;
+
+/**
+ * (DCustomerClass)表服务接口
+ *
+ * @author sxk
+ * @since 2024-06-19 17:03:19
+ */
+public interface DCustomerClassService extends IService<DCustomerClass> {
+    /**
+     * 查询物资类别树
+     */
+    List<DCustomerClassTreeVo> queryMaterialClassTree();
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.FSupplierLimitedRelieve;
+
+/**
+ * 供应商解除限制信息表(FSupplierLimitedRelieve)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-18 11:51:01
+ */
+public interface FSupplierLimitedRelieveService extends IService<FSupplierLimitedRelieve> {
+
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.DCustomerClass;
+import com.dsk.cscec.domain.vo.DCustomerClassTreeVo;
+import com.dsk.cscec.mapper.DCustomerClassMapper;
+import com.dsk.cscec.service.DCustomerClassService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * (DCustomerClass)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-06-19 17:03:19
+ */
+@Service("dCustomerClassService")
+public class DCustomerClassServiceImpl extends ServiceImpl<DCustomerClassMapper, DCustomerClass> implements DCustomerClassService {
+    @Resource
+    private DCustomerClassMapper baseMapper;
+
+    /**
+     * 查询物资类别树
+     */
+    @Override
+    public List<DCustomerClassTreeVo> queryMaterialClassTree() {
+        List<DCustomerClassTreeVo> finalTree = new ArrayList<>();
+        //构建树
+        List<DCustomerClass> originList = baseMapper.selectList(null);
+        originList.forEach(item -> {
+            //筛选分供资源分类并添加根节点
+            if ("分供资源分类".equals(item.getCustomerClassName()) &&
+                    item.getLevelNo() == 0 &&
+                    "Y".equals(item.getIsvalid())) {
+                DCustomerClassTreeVo rootVo = BeanUtil.toBean(item, DCustomerClassTreeVo.class);
+                finalTree.add(rootVo);
+                //递归添加物资类别子节点
+                this.addChild(rootVo, BeanUtil.copyToList(originList, DCustomerClassTreeVo.class));
+            }
+        });
+        return finalTree;
+    }
+
+    /**
+     * 递归添加物资类别子节点
+     */
+    private void addChild(DCustomerClassTreeVo parent, List<DCustomerClassTreeVo> tree) {
+        tree.forEach(item -> {
+            if (item.getParentId().equals(parent.getCustomerClassId())) {
+                parent.getChildren().add(item);
+                addChild(item, tree);
+            }
+        });
+    }
+}
+

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.FSupplierLimitedRelieveMapper;
+import com.dsk.cscec.domain.FSupplierLimitedRelieve;
+import com.dsk.cscec.service.FSupplierLimitedRelieveService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商解除限制信息表(FSupplierLimitedRelieve)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-18 11:51:01
+ */
+@Service("fSupplierLimitedRelieveService")
+public class FSupplierLimitedRelieveServiceImpl extends ServiceImpl<FSupplierLimitedRelieveMapper, FSupplierLimitedRelieve> implements FSupplierLimitedRelieveService {
+
+}
+

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

@@ -15,13 +15,16 @@ import com.dsk.cscec.domain.bo.SupplierUnlimitedSearchBo;
 import com.dsk.cscec.domain.vo.SupplierLimitedSearchVo;
 import com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo;
 import com.dsk.cscec.mapper.FSupplierLimitedMapper;
+import com.dsk.cscec.mapper.FSupplierLimitedRelieveMapper;
 import com.dsk.cscec.service.FSupplierLimitedService;
 import com.dsk.system.utils.DskOpenApiUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 供应商限制信息表(FSupplierLimited)表服务实现类
@@ -34,6 +37,8 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
     @Resource
     private FSupplierLimitedMapper baseMapper;
     @Resource
+    private FSupplierLimitedRelieveMapper relieveMapper;
+    @Resource
     private DskOpenApiUtil dskOpenApiUtil;
 
     /**
@@ -101,18 +106,18 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
         QueryWrapper<FSupplierLimited> wrapper = Wrappers.query();
         wrapper
                 //申请单位
-                .like(StringUtils.isNotBlank(searchBo.getApplyUnit()), "fsl.fjobunitname", searchBo.getApplyUnit())
+                .like(StringUtils.isNotBlank(searchBo.getApplyUnit()), "fslr.fjobunitname", searchBo.getApplyUnit())
                 //解除限用/禁用时间
                 .between(ObjectUtils.isNotNull(searchBo.getUnlimitedStartTime()) && ObjectUtils.isNotNull(searchBo.getUnlimitedEndTime()),
-                        "fsl.fts",
+                        "fslr.fts",
                         searchBo.getUnlimitedStartTime(),
                         searchBo.getUnlimitedEndTime())
                 //筛选解除限用禁用名单数据
-                .eq("fsl.fdatatype", SupplierLimitedManageQueryConstants.UNLIMITED_DATA_TYPE)
+                .eq("fslr.fdatatype", SupplierLimitedManageQueryConstants.UNLIMITED_DATA_TYPE)
                 //根据解除限用/禁用时间倒序排序
-                .orderByDesc("fsl.fts");
+                .orderByDesc("fslr.fts");
 
-        Page<SupplierUnlimitedSearchVo> page = baseMapper.selectPageSupplierUnlimitedList(pageQuery.build(), wrapper);
+        Page<SupplierUnlimitedSearchVo> page = relieveMapper.selectPageSupplierUnlimitedList(pageQuery.build(), wrapper);
 
         for (SupplierUnlimitedSearchVo searchVo : page.getRecords()) {
             Map<String, Object> params = new HashMap<>();

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/controlelr/MonitorUserController.java

@@ -167,15 +167,15 @@ public class MonitorUserController {
     public R systemDetail(@RequestBody PushMonitorSystemDetailVo detailVo){
         return monitorService.systemDetail(detailVo);
     }
-//
-//    /**
-//     * 监控列表添加默认业主单位
-//     * @Author: lc
-//     * @return
-//     */
-//    @PostMapping(value = "/add/default")
-//    public R addDefaultCompany() {
-//        return monitorService.addDefaultCompany();
-//    }
+
+    /**
+     * 监控列表添加默认业主单位
+     * @Author: lc
+     * @return
+     */
+    @PostMapping(value = "/add/default")
+    public R addDefaultCompany() {
+        return monitorService.addDefaultCompany();
+    }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorUserServiceImpl.java

@@ -8,7 +8,9 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.redis.RedisUtils;
+import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.mapper.DCustomerMapper;
+import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.monitor.domain.dto.PushMonitorRules;
 import com.dsk.monitor.domain.vo.*;
 import com.dsk.monitor.mapper.PushMonitorInfoMapper;
@@ -51,6 +53,9 @@ public class MonitorUserServiceImpl implements MonitorUserService {
     @Resource
     private DCustomerMapper customerMapper;
 
+    @Resource
+    private DProjectMapper projectMapper;
+
     @Autowired
     private BusinessOpportunityRadarService opportunityRadarService;
 
@@ -317,11 +322,12 @@ public class MonitorUserServiceImpl implements MonitorUserService {
         List<Integer> idList = new ArrayList<>();
 
         //如果没有上一次的企业id数据则直接返回
-        if (RedisUtils.hasKey("monitorCompanyList")) {
-            log.info("添加默认企业监控：企业id从缓存中取");
-            idList = RedisUtils.getCacheList("monitorCompanyList");
+        if (RedisUtils.hasKey("monitorUserCompanyList")) {
+            log.info("添加默认业主单位企业监控：企业id从缓存中取");
+            idList = RedisUtils.getCacheList("monitorUserCompanyList");
         } else {
-            List<String> list = customerMapper.allSearchCompanyNameList();
+            //获取业主公司名称
+            List<String> list = projectMapper.getOwnerNameList(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
             for (String companyName : list) {
                 //循环匹配 得到能关联上的企业id
                 Map<String, Object> map = opportunityRadarService.enterpriseByName(companyName);
@@ -331,24 +337,22 @@ public class MonitorUserServiceImpl implements MonitorUserService {
                     idList.add(companyId);
                 }
             }
-            RedisUtils.setCacheList("monitorCompanyList", idList);
+            RedisUtils.setCacheList("monitorUserCompanyList", idList);
             //设置过期时间两天
-            RedisUtils.expire("monitorCompanyList", 172800);
+            RedisUtils.expire("monitorUserCompanyList", 172800);
         }
         //去除重复企业id
         idList = idList.stream().distinct().collect(Collectors.toList());
         log.info("获取供应商企业id数量：" + idList.size());
 
         PushMonitorCompanyAddVo addVo = new PushMonitorCompanyAddVo();
-        Long userId = LoginHelper.getUserId();
-        if (ObjectUtil.isNotEmpty(userId)) {
-            addVo.setUserId(userId);
-        }
+        Long userId = 123456789L;
+        addVo.setUserId(userId);
         addVo.setSystemCode("ZJYJ");
         int size = idList.size();
         if (size <= 200) {
             addVo.setCid(idList);
-            log.info("中建一局用户添加默认监控企业！");
+            log.info("中建一局用户添加默认业主单位监控企业！");
             Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
         } else {
             //循环次数
@@ -362,10 +366,10 @@ public class MonitorUserServiceImpl implements MonitorUserService {
                     newList = idList.subList(i * 200, (i + 1) * 200);
                 }
                 addVo.setCid(newList);
-                log.info("中建一局用户添加默认监控企业------->循环添加：" + i * 200 + "----" + (i + 1) * 200);
+                log.info("中建一局用户添加默认业主监控企业------->循环添加：" + i * 200 + "----" + (i + 1) * 200);
                 Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/addDefaultCompany", BeanUtil.beanToMap(addVo, false, false));
             }
         }
-        return R.ok("默认企业添加中，请稍候");
+        return R.ok("默认业主监控企业添加中，请稍候");
     }
 }

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

@@ -45,4 +45,12 @@
         from d_project p
             ${ew.getCustomSqlSegment}
     </select>
+
+    <select id="getOwnerNameList" resultType="java.lang.String">
+        SELECT owner_name
+        FROM d_project dp
+        WHERE contract_org_id =#{contractOrgId}
+        group BY owner_name
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -16,18 +16,18 @@
             ${ew.getCustomSqlSegment}
     </select>
 
-    <select id="selectPageSupplierUnlimitedList" resultType="com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo">
-        select fsl.fid,
-               fsl.frecordno,
-               fsl.fsuppliername,
-               fsl.funifiedsocialcreditcode,
-               fsl.frelievereason,
-               fsl.fjobunitname,
-               fsl.fbeforestate,
-               fsl.flimitdate,
-               fsl.fts
-        from f_supplier_limited fsl
-            ${ew.getCustomSqlSegment}
-    </select>
+<!--    <select id="selectPageSupplierUnlimitedList" resultType="com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo">-->
+<!--        select fsl.fid,-->
+<!--               fsl.frecordno,-->
+<!--               fsl.fsuppliername,-->
+<!--               fsl.funifiedsocialcreditcode,-->
+<!--               fsl.frelievereason,-->
+<!--               fsl.fjobunitname,-->
+<!--               fsl.fbeforestate,-->
+<!--               fsl.flimitdate,-->
+<!--               fsl.fts-->
+<!--        from f_supplier_limited fsl-->
+<!--            ${ew.getCustomSqlSegment}-->
+<!--    </select>-->
 </mapper>
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/FSupplierLimitedRelieveMapper.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.FSupplierLimitedRelieveMapper">
+    <select id="selectPageSupplierUnlimitedList" resultType="com.dsk.cscec.domain.vo.SupplierUnlimitedSearchVo">
+        select fslr.fid,
+               fslr.frecordno,
+               fslr.fsuppliername,
+               fslr.funifiedsocialcreditcode,
+               fslr.frelievereason,
+               fslr.fjobunitname,
+               fslr.fbeforestate,
+               fslr.flimitdate,
+               fslr.fts
+        from f_supplier_limited_relieve fslr
+            ${ew.getCustomSqlSegment}
+    </select>
+</mapper>
+

dsk-operate-ui/src/api/supplier/supplier.js

@@ -32,6 +32,13 @@ export function bizDictData() {
     method: 'get',
   });
 }
+//查询物资类别树
+export function queryMaterialClassTree() {
+  return request({
+    url: '/dCustomerClass/queryMaterialClassTree',
+    method: 'get',
+  });
+}
 //供应商管理分类列表
 export function custmerInfolist(param) {
   return request({

dsk-operate-ui/src/router/index.js

@@ -127,8 +127,8 @@ export const constantRoutes = [
       {
         path: '/owner/MonitoringReportDetails/:id',
         component: () => import('@/views/owner/MonitoringReportDetails'),
-        name: 'MonitoringDynamics',
-        meta: { title: '监控报告详情', noCache: false },
+        name: 'ownerMonitoringReportDetails',
+        meta: { title: '业主监控报告详情', noCache: false },
       }
     ]
   },

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

@@ -201,7 +201,7 @@
   import {changeTime} from "@/assets/js/common.js"
   import skeleton from '../component/skeleton'
   export default {
-    name: 'MonitoringDynamics',
+    name: 'ownerMonitoringReportDetails',
     components: {
       InfoTable,skeleton
     },

dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue

@@ -12,7 +12,7 @@
             <el-col :span="8">
             <el-form-item label="解除限用时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -136,11 +136,11 @@
         formdata:{
           unlimitedStartTime:'',
           unlimitedEndTime:'',
-          times:[],
           applyUnit:'',
           pageSize:50,
           pageNum:1,
         },
+        times:'',
         tableData:[],
         isSkeleton:true,
         total:0,
@@ -157,14 +157,15 @@
       searchList(){
         this.isSkeleton = true
         let formdata = JSON.parse(JSON.stringify(this.formdata))
-        if(formdata.times != [] &&formdata.times.length>1){
-          formdata.unlimitedStartTime = formdata.times[0]
-          formdata.unlimitedEndTime = formdata.times[1]
+        if(this.times){
+          if(this.times.length>1){
+            formdata.unlimitedStartTime = this.times[0]
+            formdata.unlimitedEndTime = this.times[1]
+          }
         }else{
           formdata.unlimitedStartTime = ''
           formdata.unlimitedEndTime = ''
         }
-        delete formdata.times
         getSupplierUnlimitedList(formdata).then(res=>{
           this.isSkeleton = false
           if(res.code == 200) {
@@ -182,11 +183,11 @@
         this.formdata={
           unlimitedStartTime:'',
           unlimitedEndTime:'',
-          times:[],
           applyUnit:'',
           pageSize:50,
           pageNum:1,
         }
+        this.times=[]
         this.searchList()
       },
       handleCurrentChange(val){

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

@@ -165,7 +165,7 @@
               {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="供应类别" min-width="85" :resizable="false">
+          <el-table-column label="供应类别" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.groupSpecialty||"--"}}
             </template>
@@ -293,7 +293,7 @@
   import '@/assets/styles/public.scss'
   import '@/assets/styles/supplierlist.scss'
   import skeleton from '@/views/project/projectList/component/skeleton'
-  import { areaAll, bizDictData, custmerInfolist,exportCustomerList } from '@/api/supplier/supplier'
+  import { areaAll, bizDictData, custmerInfolist,exportCustomerList,queryMaterialClassTree } from '@/api/supplier/supplier'
   import { getDicts } from '@/api/system/dict/data'
   import {queryConditionFiltering} from '@/utils/index'
   export default {
@@ -318,7 +318,8 @@
         groupprops:{
           checkStrictly:false,
           multiple:true,
-          value:'id',
+          value:'customerClassId',
+          label:'customerClassName'
         },
         formdata:{
           customerClass:'分供',
@@ -377,12 +378,29 @@
         // this.dataRegion()
         //专业类别
         bizDictData().then(res=>{
-          this.groupSpecialty = res.data
+          // console.log(res.data,"||||||")
+          // this.groupSpecialty = res.data
         })
         // 地区树
         areaAll().then(res=>{
           this.addressList = res.data
         })
+        // 物资类别
+        queryMaterialClassTree().then(res=>{
+          // console.log(this.filteredArray(res.data))
+          this.groupSpecialty = this.filteredArray(res.data)
+        })
+      },
+      filteredArray(arr) {
+        let _that=this;
+        return arr.map((item) => {
+          if(item.children?.length){
+            _that.filteredArray(item.children)
+          }else {
+            delete item.children
+          }
+          return item
+        })
       },
       clears(){
         this.formdata = {