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/SysPushController.java → dsk-admin/src/main/java/com/dsk/web/controller/system/SysPushController.java

-package com.dsk.cscec.controller;
+package com.dsk.web.controller.system;
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,14 +6,11 @@ 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.SysPush;
-import com.dsk.cscec.service.ISysPushService;
-import org.apache.ibatis.annotations.Delete;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.service.ISysPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
 /**
  * 系统推送(SysPush)表控制层
  *

dsk-common/src/main/java/com/dsk/common/constant/Constants.java

@@ -82,5 +82,7 @@ public interface Constants {
 
     String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 
+    String STATUTORY_HOLIDAY_ADDR = "https://timor.tech/api/holiday/year/";
+
 }
 

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

@@ -3,17 +3,23 @@ package com.dsk.cscec.controller;
 
 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.bo.AdvisoryBodySearchBo;
+import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
+import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
+import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import com.dsk.cscec.service.IDProjectService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 
 /**
  * 咨询机构管理控制层
@@ -46,50 +52,20 @@ public class AdvisoryBodyManageController extends BaseController {
         return baseService.queryAdvisoryBodyList(advisoryBodySearchBo, pageQuery);
     }
 
+    /**
+     * 获取合作项目明细
+     */
+    @GetMapping("/getCooperateProjectDetailList")
+    public TableDataInfo<CooperateProjectDetailSearchVo> getCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
+        return baseService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
+    }
 
-    //
-    ///**
-    // * 通过主键查询单条数据
-    // *
-    // * @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));
-    //}
+    /**
+     * 根据项目主键查询项目详情
+     */
+    @GetMapping("/getProjectDetail/{projectKey}")
+    public R<ProjectDetailVo> getProjectDetail(@NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
+        return R.ok(baseService.queryProjectDetail(projectKey));
+    }
 }
 

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

@@ -34,5 +34,13 @@ public class DimAreaController extends BaseController {
     public R<List<RegionVo>> allArea(){
         return R.ok(baseService.allArea());
     }
+
+    /**
+     * 获取地区树(不含区域)
+     */
+    @GetMapping("/all/withoutRegion")
+    public R<List<RegionVo>> allAreaWithoutRegion(){
+        return R.ok(baseService.allAreaWithoutRegion());
+    }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/SysAdvisoryBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBody.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SysAdvisoryBody implements Serializable {
+public class AdvisoryBody implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -62,10 +63,14 @@ public class SysAdvisoryBody implements Serializable {
      * 项目负责人联系电话
      */
     private String projectLeaderPhone;
+    /**
+     * 结算金额(万元)
+     */
+    private BigDecimal settleAmount;
     /**
      * 结算开始时间
      */
-    private Date settleStarTime;
+    private Date settleStartTime;
     /**
      * 结算完成时间
      */

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author sxk
+ * @date 2023.12.14
+ * @time 14:17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CooperateProjectDetailSearchBo {
+    /**
+     * 咨询机构ID
+     */
+    private Long advisoryBodyId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 省
+     */
+    private List<String> provinceName;
+    /**
+     * 市
+     */
+    private List<String> cityName;
+    /**
+     * 项目承接类型
+     */
+    private List<String> isinvestproject;
+
+    /**
+     * 工程基础大类
+     */
+    private List<String> projectType1;
+
+    /**
+     * 工程类别明细
+     */
+    private List<String> projectType;
+}

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

 package com.dsk.cscec.domain.bo;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -34,11 +35,13 @@ public class ProjectSearchBo {
     /**
      * 项目创建开始时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date projectStartTime;
 
     /**
      * 项目创建结束时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date projectEndTime;
 
     /**

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

 package com.dsk.cscec.domain.vo;
 
-import com.dsk.cscec.domain.SysAdvisoryBody;
+import com.dsk.cscec.domain.AdvisoryBody;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class AdvisoryBodySearchVo extends SysAdvisoryBody {
+public class AdvisoryBodySearchVo extends AdvisoryBody {
     /**
      * 最近一次合作时间
      */

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

+package com.dsk.cscec.domain.vo;
+
+import com.dsk.cscec.domain.AdvisoryBody;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2023.12.14
+ * @time 13:45
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CooperateProjectDetailSearchVo {
+    /**
+     * 项目主键
+     */
+    private Long projectKey;
+
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目编码
+     */
+    private String projectCode;
+
+    /**
+     * 省市
+     */
+    private String provinceName;
+
+    /**
+     * 市区
+     */
+    private String cityName;
+
+    /**
+     * 项目承接类型
+     */
+    private String isinvestproject;
+
+    /**
+     * 工程基础大类
+     */
+    private String projectType1;
+
+    /**
+     * 工程类别明细
+     */
+    private String projectType;
+
+    /**
+     * 合同金额
+     */
+    private BigDecimal contractOrigValue;
+
+    /**
+     * 结算天数(天)
+     */
+    private Long settlementDays;
+
+    /**
+     * 业主单位
+     */
+    private String ownerName;
+
+    /**
+     * 项目承接单位
+     */
+    private String contractOrgName;
+
+    /**
+     * 咨询机构(咨询机构表)
+     */
+    private AdvisoryBody advisoryBody;
+
+    /**
+     * 创建时间(合同生效日期)
+     */
+    private Date contractSignDate;
+}

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

+package com.dsk.cscec.domain.vo;
+
+import com.dsk.cscec.domain.DProject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author sxk
+ * @date 2023.12.14
+ * @time 16:18
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProjectDetailVo extends DProject {
+    /**
+     * 咨询机构名称
+     */
+    private String advisoryBodyName;
+}

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

 package com.dsk.cscec.domain.vo;
 
-import com.dsk.cscec.domain.SysAdvisoryBody;
+import com.dsk.cscec.domain.AdvisoryBody;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -75,10 +75,10 @@ public class ProjectSearchVo {
     /**
      * 咨询机构(咨询机构表)
      */
-    private SysAdvisoryBody advisoryBody;
+    private AdvisoryBody advisoryBody;
 
     /**
-     * 创建时间
+     * 创建时间(合同生效日期)
      */
-    private Date loadTime;
+    private Date contractSignDate;
 }

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

@@ -5,6 +5,7 @@ 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.DProject;
+import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +20,10 @@ public interface DProjectMapper extends BaseMapper<DProject> {
      * 获取所有项目列表数据
      */
     Page<ProjectSearchVo> selectPageProjectList(@Param("page") Page<ProjectSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> queryWrapper);
+
+    /**
+     * 获取合作项目明细
+     */
+    Page<CooperateProjectDetailSearchVo> selectPageCooperateProjectDetailList(@Param("page") Page<CooperateProjectDetailSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> Wrapper);
 }
 

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.SysAdvisoryBody;
+import com.dsk.cscec.domain.AdvisoryBody;
 import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,7 +16,7 @@ import java.util.Date;
  * @author sxk
  * @since 2023-12-12 10:12:04
  */
-public interface SysAdvisoryBodyMapper extends BaseMapper<SysAdvisoryBody> {
+public interface SysAdvisoryBodyMapper extends BaseMapper<AdvisoryBody> {
     /**
      * 查询最近一次合作时间
      */
@@ -25,6 +25,6 @@ public interface SysAdvisoryBodyMapper extends BaseMapper<SysAdvisoryBody> {
     /**
      * 获取所有企业列表(咨询机构)数据
      */
-    Page<AdvisoryBodySearchVo> selectPageAdvisoryBodyList(@Param("page") Page<AdvisoryBodySearchVo> page, @Param(Constants.WRAPPER) Wrapper<SysAdvisoryBody> queryWrapper);
+    Page<AdvisoryBodySearchVo> selectPageAdvisoryBodyList(@Param("page") Page<AdvisoryBodySearchVo> page, @Param(Constants.WRAPPER) Wrapper<AdvisoryBody> queryWrapper);
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/SysAdvisoryBodyService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/AdvisoryBodyService.java

 package com.dsk.cscec.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsk.cscec.domain.SysAdvisoryBody;
+import com.dsk.cscec.domain.AdvisoryBody;
 
 /**
  * 咨询机构(SysAdvisoryBody)表服务接口
@@ -9,7 +9,7 @@ import com.dsk.cscec.domain.SysAdvisoryBody;
  * @author sxk
  * @since 2023-12-12 10:12:09
  */
-public interface SysAdvisoryBodyService extends IService<SysAdvisoryBody> {
+public interface AdvisoryBodyService extends IService<AdvisoryBody> {
 
 }
 

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

@@ -5,8 +5,11 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
+import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
+import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
+import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 
 /**
@@ -33,5 +36,22 @@ public interface IDProjectService extends IService<DProject> {
      * @return 所有数据
      */
     TableDataInfo<AdvisoryBodySearchVo> queryAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery);
+
+    /**
+     * 获取合作项目明细
+     *
+     * @param cooperateProjectDetailSearchBo 查询实体
+     * @param pageQuery                      分页对象
+     * @return 所有数据
+     */
+    TableDataInfo<CooperateProjectDetailSearchVo> queryCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery);
+
+    /**
+     * 根据项目主键查询项目详情
+     *
+     * @param projectKey 项目主键
+     * @return 项目详情
+     */
+    ProjectDetailVo queryProjectDetail(Long projectKey);
 }
 

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

@@ -17,5 +17,7 @@ public interface IDimAreaService extends IService<DimArea> {
 
     List<RegionVo> allArea();
 
+    List<RegionVo> allAreaWithoutRegion();
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/SysAdvisoryBodyServiceImpl.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java

@@ -2,8 +2,8 @@ package com.dsk.cscec.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.cscec.mapper.SysAdvisoryBodyMapper;
-import com.dsk.cscec.domain.SysAdvisoryBody;
-import com.dsk.cscec.service.SysAdvisoryBodyService;
+import com.dsk.cscec.domain.AdvisoryBody;
+import com.dsk.cscec.service.AdvisoryBodyService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-12 10:12:09
  */
 @Service("sysAdvisoryBodyService")
-public class SysAdvisoryBodyServiceImpl extends ServiceImpl<SysAdvisoryBodyMapper, SysAdvisoryBody> implements SysAdvisoryBodyService {
+public class AdvisoryBodyServiceImpl extends ServiceImpl<SysAdvisoryBodyMapper, AdvisoryBody> implements AdvisoryBodyService {
 
 }
 

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

@@ -3,17 +3,13 @@ package com.dsk.cscec.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsk.common.constant.CacheNames;
-import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.entity.SysDictData;
+import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
 import com.dsk.cscec.mapper.DimAreaMapper;
-import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.service.IDimAreaService;
-import com.dsk.system.service.ISysDictDataService;
 import com.dsk.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -79,5 +75,46 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
         }
         return vos;
     }
+
+    @Override
+    public List<RegionVo> allAreaWithoutRegion() {
+        List<RegionVo> vos = new ArrayList<>();
+        //区域
+        List<SysDictData> sysDictData = sysDictTypeService.selectDictDataByType(AREA_TYPE);
+        if(CollectionUtils.isNotEmpty(sysDictData)){
+            for (SysDictData data : sysDictData) {
+                //省
+                List<Object> provinces = baseMapper.selectObjs(Wrappers.<DimArea>lambdaQuery()
+                        .select(DimArea::getAreaName2)
+                        .eq(DimArea::getAreaName1, data.getDictValue())
+                        .ne(DimArea::getAreaName2, data.getDictValue())
+                        .groupBy(DimArea::getAreaName2));
+
+                if(CollectionUtils.isNotEmpty(provinces)){
+                    for (Object province : provinces) {
+                        RegionVo provinceVo = new RegionVo();
+                        provinceVo.setValue(String.valueOf(province));
+                        List<RegionVo> cityVos = new ArrayList<>();
+                        //市
+                        List<Object> citys = baseMapper.selectObjs(Wrappers.<DimArea>lambdaQuery()
+                                .select(DimArea::getAreaName3)
+                                .eq(DimArea::getAreaName2, provinceVo.getValue())
+                                .ne(DimArea::getAreaName3, provinceVo.getValue())
+                                .groupBy(DimArea::getAreaName3));
+                        if(CollectionUtils.isNotEmpty(citys)){
+                            for (Object city : citys) {
+                                RegionVo cityVo = new RegionVo();
+                                cityVo.setValue(String.valueOf(city));
+                                cityVos.add(cityVo);
+                            }
+                        }
+                        provinceVo.setChildren(cityVos);
+                        vos.add(provinceVo);
+                    }
+                }
+            }
+        }
+        return vos;
+    }
 }
 

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

@@ -21,10 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @Author lc
@@ -66,8 +64,10 @@ public class ExportService {
         composeQueryDto.setExportUniqueCode(fileId.toString());
         //回调函数
         composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
-        composeQueryDto.setExportExeclName("资质批量导出.xlsx");
-        dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", BeanUtil.beanToMap(composeQueryDto,false,false));
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyyMMdd");
+        String dayformat = sdf.format(new Date());
+        composeQueryDto.setExportExeclName("供应商资质批量查询"+dayformat+".xlsx");
+        dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
         return AjaxResult.success();
     }
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/SysAdvisoryBodyMapper.xml → dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml

@@ -11,7 +11,7 @@
 
     <select id="selectPageAdvisoryBodyList" resultType="com.dsk.cscec.domain.vo.AdvisoryBodySearchVo">
         select advisory_body_id,
-               project_id,
+               project_key,
                advisory_body_name,
                legal_person,
                legal_person_phone,
@@ -19,7 +19,7 @@
                project_leader,
                project_leader_major,
                project_leader_phone,
-               settle_star_time,
+               settle_start_time,
                settle_finish_time,
                is_final_judge_unit
         from sys_advisory_body ${ew.getCustomSqlSegment}

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

@@ -4,7 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.DProjectMapper">
 
-
     <select id="selectPageProjectList" resultType="com.dsk.cscec.domain.vo.ProjectSearchVo">
         select p.project_key,
                p.project_id,
@@ -17,7 +16,26 @@
                p.contract_orig_value,
                p.owner_name,
                p.contract_org_name,
-               p.load_time
+               p.contract_sign_date
+        from d_project p
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectPageCooperateProjectDetailList"
+            resultType="com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo">
+        select p.project_key,
+               p.project_id,
+               p.project_name,
+               p.project_code,
+               p.province_name,
+               p.city_name,
+               p.isinvestproject,
+               p.project_type1,
+               p.project_type,
+               p.contract_orig_value,
+               p.owner_name,
+               p.contract_org_name,
+               p.contract_sign_date
         from d_project p
             ${ew.getCustomSqlSegment}
     </select>

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/SysPush.java → dsk-system/src/main/java/com/dsk/system/domain/SysPush.java

-package com.dsk.cscec.domain;
+package com.dsk.system.domain;
 
 import java.util.Date;
 import java.io.Serializable;
@@ -42,6 +42,6 @@ public class SysPush implements Serializable {
 
     private Date createTime;
 
-    private String tanentId;
+    private String tenantId;
 }
 

dsk-system/src/main/java/com/dsk/system/domain/SysStatutoryHoliday.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @Author lcl
+ * @Data 2023/12/14 15:23
+ */
+@Data
+@TableName("sys_statutory_holiday")
+public class SysStatutoryHoliday {
+
+    @TableId("id")
+    private Long id;
+    /**
+     * 是否假日 0：否 1：是
+     */
+    private Integer isHoliday;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 日期
+     */
+    private String date;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/SysPushMapper.java → dsk-system/src/main/java/com/dsk/system/mapper/SysPushMapper.java

-package com.dsk.cscec.mapper;
+package com.dsk.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.SysPush;
+import com.dsk.system.domain.SysPush;
 
 /**
  * 系统推送(SysPush)表数据库访问层

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ISysPushService.java → dsk-system/src/main/java/com/dsk/system/service/ISysPushService.java

-package com.dsk.cscec.service;
+package com.dsk.system.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.SysPush;
+import com.dsk.system.domain.SysPush;
 
 /**
  * 系统推送(SysPush)表服务接口

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/SysPushServiceImpl.java → dsk-system/src/main/java/com/dsk/system/service/impl/SysPushServiceImpl.java

-package com.dsk.cscec.service.impl;
+package com.dsk.system.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.common.exception.ServiceException;
-import com.dsk.cscec.mapper.SysPushMapper;
-import com.dsk.cscec.domain.SysPush;
-import com.dsk.cscec.service.ISysPushService;
+import com.dsk.system.mapper.SysPushMapper;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.service.ISysPushService;
 import jodd.bean.BeanException;
 import org.springframework.stereotype.Service;