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-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java

@@ -39,6 +39,11 @@ public class TableDataInfo<T> implements Serializable {
      */
     private String msg;
 
+    /**
+     * object
+     */
+    private Object object;
+
     /**
      * 分页
      *
@@ -52,6 +57,20 @@ public class TableDataInfo<T> implements Serializable {
         this.msg = "查询成功";
     }
 
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<T> list, long total, Object object) {
+        this.rows = list;
+        this.object = object;
+        this.total = total;
+        this.code = HttpStatus.HTTP_OK;
+        this.msg = "查询成功";
+    }
+
     public static <T> TableDataInfo<T> build(IPage<T> page) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);

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

@@ -5,12 +5,19 @@ 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.common.excel.ExcelUtils;
 import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
+import com.dsk.cscec.domain.vo.DCustomerListVo;
 import com.dsk.cscec.service.IDCustomerService;
+import com.dsk.jsk.domain.JskCombineSearchDto;
+import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * 组织维表(DCustomer)表控制层
  *
@@ -30,7 +37,7 @@ public class DCustomerController extends BaseController {
      * 供应商总台账筛选
      */
     @PostMapping("/all/searchList")
-    public TableDataInfo<DCustomer> allSearchList(@RequestBody DCustomerSearchBo bo,@RequestBody PageQuery query) {
+    public TableDataInfo<DCustomerListVo> allSearchList(@RequestBody DCustomerSearchBo bo,@RequestBody PageQuery query) {
         return baseService.allSearchList(bo,query);
     }
 
@@ -42,6 +49,16 @@ public class DCustomerController extends BaseController {
         return R.ok(baseService.getById(customerKey));
     }
 
+    /**
+     * 供应商信息
+     */
+    @PostMapping("/export")
+    public void export(@RequestBody DCustomerSearchBo bo, HttpServletResponse response) {
+        List<DCustomerListVo> list = baseService.exportList(bo);
+        ExcelUtils<DCustomerListVo> util = new ExcelUtils<>(DCustomerListVo.class);
+        util.exportExcel(response, list, "集团中标","", true);
+    }
+
   
 }
 

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

+package com.dsk.cscec.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsk.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author lcl
+ * @Data 2023/12/18 14:14
+ */
+@Data
+public class DCustomerListVo implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * jsk企业id
+     */
+    private Integer companyId;
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * ipm供应商id
+     */
+    private String customerId;
+    /**
+     * 税号
+     */
+    private String taxNumber;
+    /**
+     * 供应商编号
+     */
+    @Excel(name = "供应商编号",  width = 5)
+    private String customerCode;
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称",  width = 10)
+    private String customerName;
+    /**
+     * 推荐公司
+     */
+    @Excel(name = "推荐公司",  width = 10)
+    private String recommendOrg;
+    /**
+     * 注册地区域
+     */
+    @Excel(name = "注册地区域",  width = 5)
+    private String registerRegion;
+    /**
+     * 省份
+     */
+    @Excel(name = "省份",  width = 5)
+    private String registerProvince;
+    /**
+     * 城市
+     */
+    @Excel(name = "城市",  width = 5)
+    private String registerCity;
+    /**
+     * 注册资金
+     */
+    @Excel(name = "注册资金",  width = 5)
+    private Double registerCapital;
+    /**
+     * 供应商类别
+     */
+    @Excel(name = "供应商类别",  width = 5)
+    private String customerClass;
+    /**
+     * 集团专业类别
+     */
+    @Excel(name = "专业类别",  width = 5)
+    private String groupSpecialty;
+    /**
+     * 纳税人身份
+     */
+    @Excel(name = "纳税人身份",  width = 5)
+    private String paytaxType;
+    /**
+     * 纳税人税率
+     */
+    @Excel(name = "纳税人税率",  width = 5)
+    private String taxRate;
+    /**
+     * 供应商状态
+     */
+    @Excel(name = "供应商状态",  width = 5)
+    private String customerState;
+    /**
+     * 队长名称
+     */
+    @Excel(name = "劳务队长",  width = 5)
+    private String leaderName;
+    /**
+     * 劳务队长身份证号
+     */
+    @Excel(name = "劳务队长身份证号",  width = 5)
+    private String laborCaptainIdcard;
+    /**
+     * 劳务队长联系电话
+     */
+    @Excel(name = "劳务队长联系电话",  width = 5)
+    private String laborCaptainPhone;
+    /**
+     * 队伍规模人数
+     */
+    @Excel(name = "队伍规模人数",  width = 5)
+    private Double serviceTeamPersonnum;
+    /**
+     * 专业特长
+     */
+    @Excel(name = "专业特长",  width = 5)
+    private String serviceTeamSpeciality;
+    /**
+     * 施工承包范围
+     */
+    @Excel(name = "施工承包范围",  width = 5)
+    private String constructJobScope;
+    /**
+     * 资质等级
+     */
+    @Excel(name = "资质等级",  width = 5)
+    private String credential;
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人",  width = 5)
+    private String contactPerson;
+    /**
+     * 电话
+     */
+    @Excel(name = "电话",  width = 5)
+    private String contactPhone;
+    /**
+     * 准入时间
+     */
+    @Excel(name = "准入时间",  width = 5 , dateFormat = "yyyy-MM-dd")
+    private Date approveDate2;
+    /**
+     * 考评等级
+     */
+    @Excel(name = "考评等级",  width = 5)
+    private String creditLevel;
+    /**
+     * 企业合作数量
+     */
+    private Integer enterpriseCooperationCount;
+    /**
+     * 项目合作数量
+     */
+    private Integer projectCooperationCount;
+
+
+}

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

@@ -8,6 +8,7 @@ import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
+import com.dsk.cscec.domain.vo.DCustomerListVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,7 +21,7 @@ import java.util.List;
  */
 public interface DCustomerMapper extends BaseMapper<DCustomer> {
 
-    Page<DCustomer> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
+    Page<DCustomerListVo> allSearchList(IPage<DCustomerSearchBo> build, @Param("bo") DCustomerSearchBo bo);
 
     /**
      * 分类查询供应商列表

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

@@ -5,6 +5,9 @@ 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;
+import com.dsk.cscec.domain.vo.DCustomerListVo;
+
+import java.util.List;
 
 /**
  * 组织维表(DCustomer)表服务接口
@@ -14,7 +17,9 @@ import com.dsk.cscec.domain.bo.DCustomerSearchBo;
  */
 public interface IDCustomerService extends IService<DCustomer> {
 
-    TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query);
+    TableDataInfo<DCustomerListVo> allSearchList(DCustomerSearchBo bo, PageQuery query);
+
+    List<DCustomerListVo> exportList(DCustomerSearchBo bo);
 
 }
 

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

@@ -9,6 +9,7 @@ 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;
+import com.dsk.cscec.domain.vo.DCustomerListVo;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.mapper.DSubcontractMapper;
 import com.dsk.cscec.service.IDCustomerService;
@@ -39,9 +40,9 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
     private BusinessOpportunityRadarService opportunityRadarService;
 
     @Override
-    public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
+    public TableDataInfo<DCustomerListVo> allSearchList(DCustomerSearchBo bo, PageQuery query) {
         dealWithCustomerClass(bo);
-        Page<DCustomer> page = baseMapper.allSearchList(query.build(), bo);
+        Page<DCustomerListVo> page = baseMapper.allSearchList(query.build(), bo);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             page.getRecords().parallelStream().forEach(item->{
                 //企业合作数量
@@ -63,6 +64,15 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public List<DCustomerListVo> exportList(DCustomerSearchBo bo) {
+        dealWithCustomerClass(bo);
+        PageQuery query = new PageQuery();
+        query.setPageNum(1);
+        query.setPageSize(1000);
+        return baseMapper.allSearchList(query.build(), bo).getRecords();
+    }
+
     private void dealWithCustomerClass(DCustomerSearchBo bo) {
         if (!ObjectUtils.isEmpty(bo.getCustomerClass())) {
             List<String> list = new ArrayList<>();

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

@@ -107,6 +107,18 @@ public class MonitorController {
         return monitorService.companyPage(pageVo);
     }
 
+    /***
+     *@Description: 添加企业监控列表 分页
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/12/9 9:29
+     */
+    @PostMapping(value = "system/queryMonitorCompany")
+    public TableDataInfo queryMonitorCompany(@RequestBody MonitorQueryMonitorCompanyPageVo pageVo) throws Exception{
+        return monitorService.queryMonitorCompany(pageVo);
+    }
+
     /***
      *@Description: 添加监控
      *@Param:

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/dto/PushMonitorRules.java

@@ -42,12 +42,12 @@ public class PushMonitorRules implements Serializable {
     /**
      * 推送时段-起
      */
-    private Integer timePeriodStart;
+    private String timePeriodStart;
 
     /**
      * 推送时段-止
      */
-    private Integer timePeriodEnd;
+    private String timePeriodEnd;
 
     /**
      * 接收方式 手机：0 PC:1

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/ConditionVo.java

@@ -2,6 +2,8 @@ package com.dsk.monitor.domain.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @ClassName ConditionVo
  * @Description 共用条件
@@ -18,7 +20,7 @@ public class ConditionVo {
     /**
      * 条件查询企业id
      */
-    private Integer companyOrstaffId;
+    private Integer companyId;
     /**
      * 条件查询企业名称(模糊查询)
      */
@@ -26,15 +28,15 @@ public class ConditionVo {
     /**
      * 条件查询风险等级：正向，负向，中立，警示
      */
-    private String riskLevel;
+    private List<String> riskLevel;
     /**
-     * 条件查询监控维度子级名称
+     * 条件查询监控维度父级名称数组
      */
-    private String dimensionId;
+    private List<String> parentDimension;
     /**
-     * 条件查询监控维度父级名称
+     * 条件查询监控维度子级名称数组
      */
-    private String parentId;
+    private List<String> dimension;
     /**
      * 条件查询开始时间
      */
@@ -49,4 +51,9 @@ public class ConditionVo {
      */
     private Integer reportType;
 
+    /**
+     * 系统来源(ZJYJ)
+     */
+    private String sysType = "ZJYJ";
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/MonitorQueryMonitorCompanyPageVo.java

+package com.dsk.monitor.domain.vo;
+
+import com.dsk.jsk.domain.BasePage;
+import lombok.Data;
+
+/**
+ * @ClassName PushMonitorRulesVo
+ * @Description 添加企业监控列表 分页
+ * @Author Dgm
+ * @Date 2023/12/9 11:05
+ * @Version
+ */
+@Data
+public class MonitorQueryMonitorCompanyPageVo extends BasePage {
+    /**
+     * 查询条件
+     */
+    private String companyName;
+
+    /**
+     * 用户id
+     */
+    private Long userId = 7324L;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/job/PushScheduling.java

-package com.dsk.monitor.job;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsk.common.utils.DateUtils;
-import com.dsk.monitor.domain.dto.PushMonitorRules;
-import com.dsk.monitor.mapper.PushMonitorInfoMapper;
-import com.dsk.monitor.mapper.PushMonitorRulesMapper;
-import com.dsk.monitor.util.SendMessageUtil;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import javax.annotation.Resource;
-
-/**
- * @ClassName PushScheduling
- * @Description 发送短信
- * @Author Dgm
- * @Date 2023/12/9 13:51
- * @Version
- */
-public class PushScheduling {
-
-    @Resource
-    private PushMonitorInfoMapper monitorInfoMapper;
-
-    @Resource
-    private PushMonitorRulesMapper rulesMapper;
-
-    @Scheduled(cron = "0 0 5 * * * ?")
-    public void receiveModePhone() {
-        // 获取当前整点时间
-        Integer concurrentHour = DateUtils.getHour();
-        QueryWrapper queryWrapper = new QueryWrapper();
-        PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
-        // 推送时段-起
-        Integer timePeriodStart = detail.getTimePeriodStart();
-        // 推送时段-止
-        Integer timePeriodEnd = detail.getTimePeriodEnd();
-        if (concurrentHour > timePeriodStart && concurrentHour < timePeriodEnd) {
-            QueryWrapper monitorInfoWrapper = new QueryWrapper();
-            // 风险类型
-            monitorInfoWrapper.in("risk_type", detail.getRiskType());
-            // 监控维度
-            monitorInfoWrapper.in("dimension", detail.getDimension());
-            Long count = monitorInfoMapper.selectCount(monitorInfoWrapper);
-            if (count >0 ) {
-                SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
-            }
-        }
-    }
-}
+//package com.dsk.monitor.job;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.dsk.common.utils.DateUtils;
+//import com.dsk.monitor.domain.dto.PushMonitorRules;
+//import com.dsk.monitor.mapper.PushMonitorInfoMapper;
+//import com.dsk.monitor.mapper.PushMonitorRulesMapper;
+//import com.dsk.monitor.util.SendMessageUtil;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import javax.annotation.Resource;
+//
+///**
+// * @ClassName PushScheduling
+// * @Description 发送短信
+// * @Author Dgm
+// * @Date 2023/12/9 13:51
+// * @Version
+// */
+//public class PushScheduling {
+//
+//    @Resource
+//    private PushMonitorInfoMapper monitorInfoMapper;
+//
+//    @Resource
+//    private PushMonitorRulesMapper rulesMapper;
+//
+//    @Scheduled(cron = "0 0 5 * * * ?")
+//    public void receiveModePhone() {
+//        // 获取当前整点时间
+//        Integer concurrentHour = DateUtils.getHour();
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
+//        // 推送时段-起
+//        Integer timePeriodStart = detail.getTimePeriodStart();
+//        // 推送时段-止
+//        Integer timePeriodEnd = detail.getTimePeriodEnd();
+//        if (concurrentHour > timePeriodStart && concurrentHour < timePeriodEnd) {
+//            QueryWrapper monitorInfoWrapper = new QueryWrapper();
+//            // 风险类型
+//            monitorInfoWrapper.in("risk_type", detail.getRiskType());
+//            // 监控维度
+//            monitorInfoWrapper.in("dimension", detail.getDimension());
+//            Long count = monitorInfoMapper.selectCount(monitorInfoWrapper);
+//            if (count >0 ) {
+//                SendMessageUtil.sendMessage(detail.getPhones(), count.toString());
+//            }
+//        }
+//    }
+//}

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

@@ -79,6 +79,17 @@ public interface MonitorService {
     TableDataInfo companyPage(PushMonitorCompanyPageVo pageVo) throws Exception;
 
 
+    /***
+     *@Description: 企业监控列表 分页
+     *@Param: pageVo 信息
+     *@return: R
+     *@Author: Dgm
+     *@date: 2023/12/9 10:03
+     */
+    TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception;
+
+
+
     /***
      *@Description: 添加监控
      *@Param: addVo 信息

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

@@ -92,13 +92,15 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Override
     public TableDataInfo companyDynamicPage(PushMonitorDynamicPageVo pageVo) throws Exception {
-        Long userId = LoginHelper.getUserId();
+        pageVo.setPageSize(3);
+        Long userId = 1733058034734989314L;
         if (ObjectUtil.isNotEmpty(userId)) {
             pageVo.setUserId(userId);
             pageVo.getCondition().setUserId(userId);
         }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        log.info("companyDynamicPage=============================>"+map);
+        return dskOpenApiUtil.responsePageT(map);
     }
 
     @Override
@@ -123,6 +125,16 @@ public class MonitorServiceImpl implements MonitorService {
         return dskOpenApiUtil.responsePage(map);
     }
 
+    @Override
+    public TableDataInfo queryMonitorCompany(MonitorQueryMonitorCompanyPageVo pageVo) throws Exception {
+        Long userId = LoginHelper.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            pageVo.setUserId(userId);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/supplier/system/queryCancelMonitorCompany", BeanUtil.beanToMap(pageVo, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
     @Override
     public R systemAdd(PushMonitorCompanyAddVo addVo) {
         Long userId = LoginHelper.getUserId();
@@ -248,6 +260,13 @@ public class MonitorServiceImpl implements MonitorService {
         return BeanUtil.toBean(map, R.class);
     }
 
+    /***
+     *@Description: 参数处理
+     *@Param:
+     *@return: com.dsk.monitor.domain.vo.PushMonitorSystemDetailVo
+     *@Author: Dgm
+     *@date: 2023/12/15 15:43
+     */
     public PushMonitorSystemDetailVo getDetailVo(PushMonitorSystemDetailVo detailVo) {
         String value1 = null;
         String value2 = null;

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

@@ -8,6 +8,7 @@ import com.dsk.search.service.BusinessOpportunityRadarService;
 import com.dsk.search.service.ExportService;
 import com.dsk.system.domain.vo.AptitudeVo;
 import com.dsk.system.domain.vo.SysUserImportVo;
+import com.dsk.system.service.ISysUserFileRecordService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,6 +31,18 @@ public class ExportController {
 
     @Resource
     private ExportService exportService;
+    @Resource
+    private ISysUserFileRecordService sysUserFileRecordService;
+
+    /**
+     * 导出回调接口
+     * @param object
+     * @return
+     */
+    @PostMapping(value = "/backUrl")
+    public AjaxResult exportBack(@RequestBody JSONObject object) {
+        return sysUserFileRecordService.exportBack(object);
+    }
 
     /**
      * 获取导入模板
@@ -37,10 +50,8 @@ public class ExportController {
     @PostMapping("/aptitude/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         List<Object> list = new ArrayList<>();
-        AptitudeVo aptitudeVo = new AptitudeVo();
-        aptitudeVo.setCompanyName("重庆市轨道交通（集团）有限公司");
-        list.add(aptitudeVo);
-        ExcelUtil.exportTemplate(list, "企业数据", "excel/userImportTemplate.xlsx", response);
+        list.add(new AptitudeVo("重庆市轨道交通（集团）有限公司"));
+        ExcelUtil.exportTemplate(list, "企业数据", "excel/aptitudeImportTemplate.xlsx", response);
     }
 
     /*

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

@@ -4,7 +4,7 @@
         "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 id="allSearchList" resultType="com.dsk.cscec.domain.vo.DCustomerListVo">
         select
             customer_key, customer_id, 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,
@@ -61,7 +61,7 @@
         </if>
         <if test="bo.approveDateBegion != null and bo.approveDateBegion != '' ">and approve_date2 &gt;= #{bo.approveDateBegion}</if>
         <if test="bo.approveDateEnd != null and bo.approveDateEnd != '' ">and approve_date2 &lt;= #{bo.approveDateBegion} </if>
-        <if test="bo.isTeam != null"> and leader_name is <if test="bo.isTeam == 0">not</if> null </if>
+        <if test="bo.isTeam != null"> and leader_name is <if test="bo.isTeam == 1">not</if> null </if>
         order by approve_date2 desc
     </select>
 

dsk-system/src/main/java/com/dsk/system/domain/vo/AptitudeVo.java

@@ -74,4 +74,8 @@ public class AptitudeVo implements Serializable {
     @Excel(name = "经营范围")
     private String businessScope;
 
+    public AptitudeVo(String deptName) {
+        this.companyName = deptName.replace(" ", "");
+    }
+
 }

dsk-system/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java

@@ -125,6 +125,25 @@ public class DskOpenApiUtil {
         return new TableDataInfo((List<?>) list, count);
     }
 
+    /***
+     *@Description: 特殊返回
+     *@Param:
+     *@return: com.dsk.common.core.page.TableDataInfo
+     *@Author: Dgm
+     *@date: 2023/12/15 15:04
+     */
+    public TableDataInfo responsePageT(Map<String, Object> resMap) throws Exception {
+        Integer code = MapUtils.getInteger(resMap, "code", 300);
+        Map data = MapUtils.getMap(resMap, "data", null);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+        Integer count = MapUtils.getInteger(data, "totalCount", 0);
+        Object list = MapUtils.getObject(data, "list", "");
+        Object object = MapUtils.getObject(data, "obj", "");
+        return new TableDataInfo((List<?>) list, count, object);
+    }
+
     private void initApiConfig() {
         TenantHelper.ignore(() -> {
             SysConfig accessKeyId = sysConfigMapper.selectOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getTenantId, TenantConstants.DEFAULT_TENANT_ID).eq(SysConfig::getConfigKey, "dsk-Appkey"));