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

.gitignore

+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+application-pro.yml
+application-dev.yml
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+
+**nacos/logs/
+**nacos/bin/logs/
+**nacos/bin/work/
+**nacos/data/derby-data/log/
+**nacos/data/derby-data/tmp/
+**nacos/data/derby-data/seg0/
+*.dat
+*.heartBeat.txt
+
+
+/dsk-open
+/catalina.base_IS_UNDEFINED
+/*.rar

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

+package com.dsk.web.controller.customer;
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.system.service.ICustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 客户相关
+ *
+ * @author lcl
+ * @create 2023/5/16
+ */
+@RestController
+@RequestMapping("/customer")
+public class CustomerController extends BaseController {
+
+    @Autowired
+    private ICustomerService baseService;
+
+}

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerDecisionChainController.java

+package com.dsk.web.controller.customer;
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.domain.CustomerDecisionChain;
+import com.dsk.system.domain.dto.CustomerDecisionChainSearchDto;
+import com.dsk.system.service.ICustomerDecisionChainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 客户决策链条
+ * @author lcl
+ * @create 2023/5/16
+ */
+@RestController
+@RequestMapping("/customer/decision/chain")
+public class CustomerDecisionChainController extends BaseController {
+
+    @Autowired
+    private ICustomerDecisionChainService baseService;
+
+    /**
+     * 获取客户决策链条列表
+     */
+    @PreAuthorize("@ss.hasPermi('customer:decision:chain:list')")
+    @GetMapping("/list")
+    public TableDataInfo selectPageList(CustomerDecisionChainSearchDto dto){
+        startPage();
+        return getDataTable(baseService.selectList(dto));
+    }
+
+    /**
+     * 添加客户决策链条
+     */
+    @PreAuthorize("@ss.hasPermi('customer:decision:chain:add')")
+    @PostMapping()
+    public AjaxResult add(CustomerDecisionChain customerDecisionChain){
+        return AjaxResult.success(baseService.insert(customerDecisionChain));
+    }
+
+    /**
+     * 编辑客户决策链条
+     */
+    @PreAuthorize("@ss.hasPermi('customer:decision:chain:edit')")
+    @PutMapping()
+    public AjaxResult edit(CustomerDecisionChain customerDecisionChain){
+        return AjaxResult.success(baseService.update(customerDecisionChain));
+    }
+
+    /**
+     * 删除客户决策链条
+     */
+    @PreAuthorize("@ss.hasPermi('customer:decision:chain:del')")
+    @DeleteMapping("/{id}")
+    public AjaxResult del(@PathVariable("id") Long id){
+        return AjaxResult.success(baseService.deleteById(id));
+    }
+
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/MarketAnalysisController.java

+package com.dsk.web.controller.search;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 央企市场分析-统计
+ * @author Administrator
+ *
+ */
+@RequestMapping("/marketAnalysis")
+@RestController
+public class MarketAnalysisController {
+
+
+    @Resource
+    MarketAnalysisService marketAnalysisService;
+
+    /*
+     * 各省份备案企业数量
+     */
+    @RequestMapping("/areaGroupByProvince")
+    public AjaxResult areaGroupByProvince() {
+
+        return marketAnalysisService.areaGroupByProvince();
+    }
+
+    /*
+     * 资质等级按照行业、等级类型分组
+     */
+    @RequestMapping("/certGroupByMajorAndLevel")
+    public AjaxResult certGroupByMajorAndLevel() {
+
+        return marketAnalysisService.certGroupByMajorAndLevel();
+    }
+
+
+    /*
+     * 资质等级按照大类、省份、等级类型分组
+     */
+    @RequestMapping("/certGroupByCategoryProvinceLevel")
+    public AjaxResult certGroupByCategoryProvinceLevel() {
+
+        return marketAnalysisService.certGroupByMajorProvinceLevel();
+    }
+
+    /*
+     * 中标数量按省份分组
+     */
+    @RequestMapping("/countGroupByProvince")
+    public AjaxResult countGroupByProvince(@RequestBody ComposeQueryDto compose) {
+        return marketAnalysisService.countGroupByProvince(compose);
+    }
+
+    /*
+     * 中标数量按月份分组
+     */
+    @RequestMapping("/countGroupByMonth")
+    public AjaxResult countGroupByMonth(@RequestBody ComposeQueryDto compose) {
+        return marketAnalysisService.countGroupByMonth(compose);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java

+package com.dsk.web.controller.search.service;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisService
+ * @Date 2023/5/15 16:39
+ **/
+public interface MarketAnalysisService {
+
+    AjaxResult areaGroupByProvince();
+
+    AjaxResult certGroupByMajorAndLevel();
+
+    AjaxResult certGroupByMajorProvinceLevel();
+
+    AjaxResult countGroupByProvince(ComposeQueryDto compose);
+
+    AjaxResult countGroupByMonth(ComposeQueryDto compose);
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

+package com.dsk.web.controller.search.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.common.utils.http.HttpUtils;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class MarketAnalysisServiceImpl implements MarketAnalysisService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+    @Override
+    public AjaxResult areaGroupByProvince() {
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/areaGroupByProvince", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult certGroupByMajorAndLevel() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult certGroupByMajorProvinceLevel()  {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

dsk-admin/src/main/resources/application-dev.yml

@@ -158,14 +158,107 @@ token:
     # 令牌有效期（默认30分钟）
     expireTime: 30
 
-# MyBatis配置
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.dsk.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+
+#mybatis:
+#    # 搜索指定包别名
+#    typeAliasesPackage: com.dsk.**.domain
+#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#    mapperLocations: classpath*:mapper/**/*Mapper.xml
+#    # 加载全局的配置文件
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatisPlus配置
+# https://baomidou.com/config/
+mybatis-plus:
+  # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
+  # 例如 com.**.**.mapper
+  mapperPackage: com.dsk.**.mapper
+  # 对应的 XML 文件位置
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.dsk.**.domain
+  # 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
+  #typeAliasesSuperType: Class<?>
+  # 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler
+  #typeHandlersPackage: null
+  # 如果配置了该属性，会将路径下的枚举类进行注入，让实体类字段能够简单快捷的使用枚举属性
+  #typeEnumsPackage: null
+  # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
+  checkConfigLocation: false
+  # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
+  # SIMPLE：该执行器类型不做特殊的事情，为每个语句的执行创建一个新的预处理语句（PreparedStatement）
+  # REUSE：该执行器类型会复用预处理语句（PreparedStatement）
+  # BATCH：该执行器类型会批量执行所有的更新语句
+  executorType: SIMPLE
+  configuration:
+    # 自动驼峰命名规则（camel case）映射
+    # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
+    mapUnderscoreToCamelCase: true
+    # 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
+    # org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
+    # org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引
+    # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 枚举类需要实现IEnum接口或字段标记@EnumValue注解.
+    defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
+    # 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
+    aggressiveLazyLoading: true
+    # MyBatis 自动映射策略
+    # NONE：不启用自动映射
+    # PARTIAL：只对非嵌套的 resultMap 进行自动映射
+    # FULL：对所有的 resultMap 都进行自动映射
+    autoMappingBehavior: PARTIAL
+    # MyBatis 自动映射时未知列或未知属性处理策
+    # NONE：不做任何处理 (默认值)
+    # WARNING：以日志的形式打印相关警告信息
+    # FAILING：当作映射失败处理，并抛出异常和详细信息
+    autoMappingUnknownColumnBehavior: NONE
+    # Mybatis一级缓存，默认为 SESSION
+    # SESSION session级别缓存，同一个session相同查询语句不会再次查询数据库
+    # STATEMENT 关闭一级缓存
+    localCacheScope: SESSION
+    # 开启Mybatis二级缓存，默认为 true
+    cacheEnabled: false
+    # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
+    # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
+    # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+  global-config:
+    # 是否打印 Logo banner
+    banner: true
+    # 是否初始化 SqlRunner
+    enableSqlRunner: false
+    dbConfig:
+      # 主键类型
+      # AUTO 数据库ID自增
+      # NONE 空
+      # INPUT 用户输入ID
+      # ASSIGN_ID 全局唯一ID
+      # ASSIGN_UUID 全局唯一ID UUID
+      idType: AUTO
+      # 表名前缀
+      tablePrefix: null
+      # 字段 format,例: %s,(对主键无效)
+      columnFormat: null
+      # 表名是否使用驼峰转下划线命名,只对表名生效
+      tableUnderline: true
+      # 大写命名,对表名和字段名均生效
+      capitalMode: false
+      # 全局的entity的逻辑删除字段属性名
+      logicDeleteField: null
+      # 逻辑已删除值
+      logicDeleteValue: 2
+      # 逻辑未删除值
+      logicNotDeleteValue: 0
+      # 字段验证策略之 insert,在 insert 的时候的字段验证策略
+      # IGNORED 忽略判断
+      # NOT_NULL 非NULL判断
+      # NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断)
+      # DEFAULT 默认的,一般只用于注解里
+      # NEVER 不加入 SQL
+      insertStrategy: NOT_NULL
+      # 字段验证策略之 update,在 update 的时候的字段验证策略
+      updateStrategy: NOT_NULL
+      # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
+      where-strategy: NOT_NULL
 
 # PageHelper分页插件
 pagehelper:

dsk-common/pom.xml

@@ -113,6 +113,15 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
         <!-- hutool工具类 -->
         <dependency>
             <groupId>cn.hutool</groupId>

dsk-common/src/main/java/com/dsk/common/dtos/AchievementQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class AchievementQueryDto {
+
+	/**
+	 * 业绩所需参数
+	 */
+//	//中标面积
+//	Double tenderArea;
+//	//许可面积
+//	Double licenceArea;
+//	//竣工面积
+//	Double completionArea;
+	//招投标面积
+	Double startTenderArea;
+	Double endTenderArea;
+	//施工许可面积
+	Double startLicenceArea;
+	Double endLicenceArea;
+	//竣工验收面积
+	Double startCheckArea;
+	Double endCheckArea;
+	//竣工验收备案面积
+	Double startCompletionArea;
+	Double endCompletionArea;
+	//总面积
+	Double startTotalArea;
+	Double endTotalArea;
+	//面积体现节点
+	String areaStr;
+	//项目面积同时具备、任意均可 and/or
+	String areaQueryType;
+	//许可金额
+	Double licenceMoney;
+	//中标金额
+	Double startTenderMoney;
+	Double endTenderMoney;
+	//合同金额
+	Double startContractMoney;
+	Double endContractMoney;
+	//施工许可金额
+	Double startLicenceMoney;
+	Double endLicenceMoney;
+	//竣工验收实际造价
+	Double startCompletionMoney;
+	Double endCompletionMoney;
+	//竣工备案实际造价
+	Double startCheckMoney;
+	Double endCheckMoney;
+	//总投资
+	Double startInvest;
+	Double endInvest;
+	//项目金额同时具备、任意均可
+	String moneyQueryType;
+	//金额和面积同时具备、任意均可
+	String moneyAndAreaQueryType;
+	//业绩时间同时具备、任意均可
+	String timeQueryType;
+
+	String eid;
+
+	String buildCorpName;
+
+	String personName;
+
+	String ename;
+	// 项目来源 0=本地 1=四库一平台
+	Integer source;
+	
+	Double startMoney;
+	
+	Double endMoney;
+	//金额体现节点
+	String moneyStr;
+	// 关键词(包含)
+	List<KeywordDto> keywords;
+	// 关键词(不包含)
+	String keywordNot;
+	// 关键词(不包含)查询类型 project项目名称  scale建设规模  projectOrScale项目名称或建设规模
+	String keywordNotType;
+	// 业绩类型
+	String achievementType;
+
+	//单项查询 关键词包含
+	String singleKeywordIn;
+	//单项查询 关键词不包含
+	String singleKeywordOut;
+	//单项查询 关键词包含体现节点
+	String singleKeywordInNode;
+	//单项查询 关键词不包含体现节点
+	String singleKeywordOutNode;
+	//是否截图体现公司和规模  yes   no
+	Boolean isSingleReflect;
+
+	//建设性质
+	String nature;
+	// 项目属地
+	String divisionStr;
+	//项目所在城市
+	String cityStr;
+
+	String province;
+	Integer provinceId;
+	String city;
+	Integer cityId;
+	String county;
+	Integer countyId;
+
+	Double startArea;
+	
+	Double endArea;
+	//项目类别
+	String projectType;
+	// 工程用途
+	String purposeStr;
+	// 中标开始时间
+	Date startTenderTime;
+	// 中标结束时间
+	Date endTenderTime;
+	// 实际竣工开始日期
+	Date startCheckDate;
+	// 实际竣工结束日期
+	Date endCheckDate;
+	//竣工备案时间未公示
+	String hasCheckDate;
+	//实际开工开始日期
+	Date startWorkDate;
+	//实际开工结束日期
+	Date endWorkDate;
+	//合同日期开始
+	Date startContractDate;
+	//合同日期结束
+	Date endContractDate;
+	//施工许可开始日期
+	Date startLicenceDate;
+	//施工许可结束日期
+	Date endLicenceDate;
+	//施工图审开始日期
+	Date startCensorDate;
+	//施工图审结束日期
+	Date endCensorDate;
+	//竣工验收开始日期
+	Date startCheckCheckDate;
+	//竣工验收结束日期
+	Date endCheckCheckDate;
+	//竣工验收时间未公示
+	String hasCheckCheckDate;
+	// 业绩属性
+	String attributeStr;
+	// 业绩属性
+	String attributeQueryType;
+	// 项目经理
+	String pmStr;
+	// 项目经理同时具备、任意均可
+	String pmQueryType;
+	// 结构体系
+	String structure;
+	// 数据等级
+	String dataLevel;
+	//招投标数据等级
+	String tenderDataLevel;
+	//合同登记
+	String contractDataLevel;
+	//施工许可
+	String licenceDataLevel;
+	//竣工验收备案
+	String completionDataLevel;
+	//项目主体
+	String projectDataLevel;
+	//施工图审
+	String censorDataLevel;
+	//竣工验收
+	String checkDataLevel;
+	// 数据等级查询节点
+	String dataLevelStr;
+	// 数据等级查询方式  同时具备  任意均可
+	String dataLevelQueryType;
+	// 资金来源
+	String fundSource;
+	
+	Double startLength;
+	
+	Double endLength;
+	//施工许可
+	Double startLicenceLength;
+	Double endLicenceLength;
+	//竣工验收
+	Double startCheckCompletionLength;
+	Double endCheckCompletionLength;
+	//竣工验收备案
+	Double startCompletionLength;
+	Double endCompletionLength;
+	//长度体现节点
+	String lengthNode;
+	//长度筛选类型 or/and
+	String lengthType;
+
+	Double startSpan;
+	
+	Double endSpan;
+	//施工许可
+	Double startLicenceSpan;
+	Double endLicenceSpan;
+	//竣工验收
+	Double startCheckCompletionSpan;
+	Double endCheckCompletionSpan;
+	//竣工验收备案
+	Double startCompletionSpan;
+	Double endCompletionSpan;
+	//跨度体现节点
+	String spanNode;
+	//跨度筛选类型 or/and
+	String spanType;
+
+	Integer achievementCount;
+
+	String type;
+
+	String tenderWay;
+
+	String md5Company;
+	// 企业业绩关键词
+	String keyword;
+	// 企业项目详情的中标开始时间  时间戳
+	Long startTenderDetailTime;
+	// 企业项目详情的中标结束时间  时间戳
+	Long endTenderDetailTime;
+
+	List<SkyProjectIndexDto> indexDtos;
+
+	//指标筛选类型 or/and
+	String indexQueryType;
+	//指标体现节点
+	String indexPoint;
+}

dsk-common/src/main/java/com/dsk/common/dtos/AptitudeDetailDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * @author liuchang
+ * @date 2020/7/24 13:47
+ */
+@Data
+public class AptitudeDetailDto {
+
+    
+    Integer categoryCode;
+
+    Integer typeCode;
+
+    Integer majorCode;
+
+    String levelCode;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/AptitudeDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuchang
+ * @date 2020/7/24 13:47
+ */
+@Data
+public class AptitudeDto {
+    //资质条件
+    String nameStr;
+
+    String codeStr;
+    //资质同时具备任意均可  and/or
+    String queryType;
+    //资质查询类型  qualification 按资质项   level 按等级
+    String aptitudeType;
+    //存放处理完后的资质条件
+    List<String> names;
+
+    Integer namesCount;
+}

dsk-common/src/main/java/com/dsk/common/dtos/AptitudeQueryDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+public class AptitudeQueryDto {
+
+	String ename;
+
+	String resultEname;
+
+	String businessScopeQueryType;
+	//资质查询范围  old 旧表   new 新表
+	String aptitudeSource;
+	//任意均可or  同时具备and  有且仅有only
+	String aptitudeQueryType;
+
+	List<AptitudeDto> aptitudeDtoList;
+	//资质排除
+	String outCodeStr;
+	//资质排除类型 任意均可or  同时具备and
+	String outQueryType;
+	//行业code
+	String industryCode;
+
+	Double registeredCapital;
+
+	Double leftRegisteredCapital;
+
+	Double rightRegisteredCapital;
+
+	Double leftActualCapi;
+
+	Double rightActualCapi;
+
+	String queryType;
+	//三体系查询方式   同时具备、任意均可
+	String systemQueryType;
+	//体系类型
+	List<Integer> systemType;
+
+	String systemTypeStr;
+	//参保人数 起
+	Integer startInsuredNum;
+	//参保人数 止
+	Integer endInsuredNum;
+	//是否有电话 0无 1有 2有手机号码 3有固定号码 4 有手机和固定号码
+	Integer hasPhone;
+	//是否高新技术企业 0否 1是
+	Integer isHighTech;
+	//税务登记 1：A级
+	Integer	taxLvl;
+
+	String taxYear;
+
+	//企业类型
+	// 1 国有企业
+	// 2 集体企业
+	// 3 股份有限公司
+	// 4 有限责任公司
+	// 5 联营企业
+	// 6 港、澳、台商投资企业
+	// 7 私营企业
+	// 8 外商投资企业
+	// 9 个体工商户
+	// 10 股份制企业
+	// 11 事业单位
+	// 12 其他
+	String companyType;
+	//安许证到期日期参数
+	@JSONField(format="yyyy-MM-dd")
+	Date startLiceValidityDate;
+	@JSONField(format="yyyy-MM-dd")
+	Date endLiceValidityDate;
+	//资质编号
+	String aptitudeCertNo;
+	//安许证编号
+	String liceCertNo;
+	//资质到期日期参数
+	@JSONField(format="yyyy-MM-dd")
+	Date startAptitudeValidityDate;
+	@JSONField(format="yyyy-MM-dd")
+	Date endAptitudeValidityDate;
+	//成立日期
+	Date startRegisteredDate;
+	Date endRegisteredDate;
+
+	Integer hasAptitude;
+
+	Integer hasLiceCert;
+
+	Integer no;
+
+	Double rate;
+
+	String isLocalC;
+
+	String isISO;
+
+	String isEMS;
+
+	String isOHSMS;
+
+	String certData;
+
+	String nameSimple;
+
+	String logoUrl;
+
+	String registeredDate;
+
+	String liceValidityDate;
+
+	Integer liceValidDay;
+
+	String url;
+
+	String registeredCapitalStr;
+
+	String id;
+
+	String companyId;
+
+	Integer jskEid;
+
+	String regionId;
+
+	String source;
+
+	String name;
+
+	String businessStatus;
+
+	String formerName;
+
+	String creditCode;
+
+	String legalPerson;
+
+	String registrationType;
+
+	Double actualCapi;
+
+	String domicile;
+
+	String domicileNum;
+
+	String domicileCity;
+
+	String domicileCounty;
+
+	String registerProvince;
+
+	String registerCity;
+
+	String registerCounty;
+
+	Integer isCountryCredit;
+
+	String businessAddress;
+
+	String businessScope;
+
+	Integer isLocal;
+
+	String attn;
+
+	String phone;
+
+	String other;
+
+	String regionInfo;
+	@JSONField(format="yyyy-MM-dd")
+	Date rateTime;
+	// 资质数
+	Integer aptitudeCount;
+
+	// 项目数
+
+	Integer projectCount;
+
+	// 人数
+
+	Integer persionCount;
+
+	//最新中标个数
+
+	Integer recentlyCount;
+
+	Integer numPunish;
+
+	Integer badCreditChinaCount;
+
+	Integer zzZfcgsxCount;
+
+	Integer seriousIllegalCount;
+
+	Integer zzSxbzxCount;
+
+	Integer zzJdcgsxCount;
+
+	Integer zzRiskBidCount;
+
+	// -------------注册地与备案地 重构版----------------
+
+	String filePlaceCode;//备案地code
+
+	public Integer filePlaceType;//备案地类型  1 本省企业或外地备案 2 外地备案 3 本省企业
+
+	String province;//注册地 省级code 多个逗号隔开
+
+	String city;//注册地 市级code 多个逗号隔开
+
+	String county;//注册地 区级code 多个逗号隔开
+
+	String regionWeb;//企业备案网站
+
+	String tagCode;//企业标签
+}

dsk-common/src/main/java/com/dsk/common/dtos/AwardDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 刘昌
+ * @date 2020/9/4 9:08
+ */
+@Data
+public class AwardDto {
+
+    String id;
+    //建安宝企业id
+    String eid;
+    //奖项类型（建安标品汇）
+    String type;
+    //建设库公司id
+    Integer companyId;
+    //公司名称
+    String ename;
+    //奖项名称
+    String name;
+
+    String staffName;
+    //企业角色
+    String companyRole;
+    //项目名称
+    String projectName;
+    //项目类型
+    String projectType;
+    //验收等级
+    String grade;
+
+    String gradeStr;
+    //颁发机构 JSON数组
+    String organization;
+    //奖项级别
+    String level;
+    //奖项小类
+    String sectionType;
+    //行业类型
+    String industryType;
+
+    String industryTypeStr;
+    //省份
+    String province;
+    //省份ID
+    Integer provinceId;
+    //市
+    String city;
+    //城市ID
+    Integer cityId;
+
+    String area;
+
+    Integer areaId;
+    //格式化后的发布时间
+    Date publishDate;
+    //获奖年度
+    String year;
+    //获奖起始年度
+    Integer yearBegin;
+    //获奖截止年度
+    Integer yearOver;
+    //原文链接
+    String href;
+    //快照截图地址, 存相对路径
+    String pathSnapshot;
+    //符合荣誉条件的数量
+    Integer awardNum;
+    //省份列表
+    String provinceStr;
+    //市区列表
+    String cityStr;
+
+    //荣誉名称列表
+    String nameStr;
+    //颁发单位
+    String organizationStr;
+    //开始发布时间
+    String startPublishDate;
+    //结束时间
+    String endPublishDate;
+}

dsk-common/src/main/java/com/dsk/common/dtos/AwardQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 刘昌
+ * @date 2020/9/8 16:01
+ */
+@Data
+public class AwardQueryDto {
+
+    List<AwardDto> awardDtos;
+
+    String awardDtoType;
+}

dsk-common/src/main/java/com/dsk/common/dtos/BatchQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+//批量查询dto
+@Data
+public class BatchQueryDto {
+
+    String region;
+
+    String fileUrl;
+
+    String userId;
+
+    String exportExeclName;
+
+    String exportBackUrl;
+
+    String exportUniqueCode;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/BeijingQueryDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 北京一体化查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class BeijingQueryDto {
+
+	String id;
+
+	String achievementType;
+
+	String province;
+
+	String city;
+
+	String county;
+
+	//中标金额
+	Double startTenderMoney;
+
+	Double endTenderMoney;
+
+	//合同金额
+	Double startContractMoney;
+
+	Double endContractMoney;
+	//金额查询类型 and/or 默认任意均可
+	String moneyQueryType;
+
+	// 中标开始时间
+	@JSONField(format="yyyy-MM-dd")
+	Date startTenderDate;
+	// 中标结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endTenderDate;
+
+	// 合同开始时间
+	@JSONField(format="yyyy-MM-dd")
+	Date startContractDate;
+	// 合同结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endContractDate;
+	//时间查询类型 and/or 默认任意均可
+	String timeQueryType;
+	//建设单位
+	String buildCorpName;
+	//中标单位
+	String tenderCompany;
+	//招标代理
+	String agency;
+
+	//单项查询 关键词包含
+	String singleKeywordIn;
+	//单项查询 关键词不包含
+	String singleKeywordOut;
+	//单项查询 关键词包含体现节点
+	String singleKeywordInNode;
+	//单项查询 关键词不包含体现节点
+	String singleKeywordOutNode;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/BusinessInfoDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class BusinessInfoDto {
+
+	String ename;
+
+	String resultEname;
+
+	String businessScopeQueryType;
+
+	Double registeredCapital;
+
+	Double leftRegisteredCapital;
+
+	Double rightRegisteredCapital;
+
+	Double leftActualCapi;
+
+	Double rightActualCapi;
+
+	String queryType;
+
+	//参保人数 起
+	Integer startInsuredNum;
+	//参保人数 止
+	Integer endInsuredNum;
+	//是否有电话 0否 1是
+	Integer hasPhone;
+	//是否高新技术企业 0否 1是
+	Integer isHighTech;
+	//税务登记 1：A级
+	Integer	taxLvl;
+
+	String taxYear;
+
+	//企业类型
+	// 1 国有企业
+	// 2 集体企业
+	// 3 股份有限公司
+	// 4 有限责任公司
+	// 5 联营企业
+	// 6 港、澳、台商投资企业
+	// 7 私营企业
+	// 8 外商投资企业
+	// 9 个体工商户
+	// 10 股份制企业
+	// 11 事业单位
+	// 12 其他
+	String companyType;
+
+	//成立日期
+	Date startRegisteredDate;
+	Date endRegisteredDate;
+
+	Integer hasAptitude;
+
+	Integer hasLiceCert;
+
+	Integer no;
+
+	Double rate;
+
+	String isLocalC;
+
+	String isISO;
+
+	String isEMS;
+
+	String isOHSMS;
+
+	String certData;
+
+	String nameSimple;
+
+	String logoUrl;
+
+	String registeredDate;
+
+	String liceValidityDate;
+
+	Integer liceValidDay;
+
+	String url;
+
+	String registeredCapitalStr;
+
+	String id;
+
+	String companyId;
+
+	Integer jskEid;
+
+	String regionId;
+
+	String source;
+
+	String name;
+	//中文经营状态(枚举:在业、清算、迁入、迁出、停业、撤销、吊销、注销、不详)
+	String businessStatus;
+
+	String formerName;
+
+	String creditCode;
+
+	String legalPerson;
+
+	String registrationType;
+
+	Double actualCapi;
+
+	String domicile;
+
+	String domicileNum;
+
+	String domicileCity;
+
+	String domicileCounty;
+
+	String registerProvince;
+
+	String registerCity;
+
+	String registerCounty;
+
+	Integer isCountryCredit;
+
+	String businessAddress;
+
+	String businessScope;
+
+	Integer isLocal;
+
+	String attn;
+
+	String phone;
+
+	String other;
+
+	String regionInfo;
+	@JSONField(format="yyyy-MM-dd")
+	Date rateTime;
+	// 资质数
+	Integer aptitudeCount;
+
+	// 项目数
+
+	Integer projectCount;
+
+	// 人数
+
+	Integer persionCount;
+
+	//最新中标个数
+
+	Integer recentlyCount;
+
+	Integer numPunish;
+
+	Integer badCreditChinaCount;
+
+	Integer zzZfcgsxCount;
+
+	Integer seriousIllegalCount;
+
+	Integer zzSxbzxCount;
+
+	Integer zzJdcgsxCount;
+
+	Integer zzRiskBidCount;
+
+	// -------------注册地与备案地 重构版----------------
+
+	String filePlaceCode;//备案地code
+
+	public Integer filePlaceType;//备案地类型  1 本省企业或外地备案 2 外地备案 3 本省企业
+
+	String province;//注册地 省级code 多个逗号隔开
+
+	String city;//注册地 市级code 多个逗号隔开
+
+	String county;//注册地 区级code 多个逗号隔开
+
+	String regionWeb;//企业备案网站
+
+	String tagCode;//企业标签
+}

dsk-common/src/main/java/com/dsk/common/dtos/ComposePersonnelQueryDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 人员查询实体类
+ * @author Administrator
+ *
+ */
+@Data
+public class ComposePersonnelQueryDto {
+
+	// 人员姓名
+	String personName;
+	// 人员id
+	String staffId;
+	// 企业名称
+	String ename;
+	//yes有业绩 no没业绩
+	String mance;
+	//企业注册地
+	String domicile;
+
+	String domicileNum;
+
+	String domicileCity;
+
+	String domicileCounty;
+	//市
+	String registerCity;
+	//省份
+	String registerProvince;
+	//区
+	String registerCounty;
+
+	String cardNumber;
+	//证书and/or
+	String registerQueryType;
+	// 注册类型   只有一人多证and
+	List<RegisterTypeDto> registers;
+	//人员荣誉
+	List<AwardQueryDto> awardQueryDtos;
+	//人员荣誉同时具备任意均可
+	String personAwardQueryType;
+	//人员业绩同时具备任意均可
+	String achievementQueryType;
+	//四库业绩
+	List<AchievementQueryDto> achievementQueryDto;
+	//四库业绩完整版
+	List<AchievementQueryDto> achievementFullQueryDto;
+	//最新中标业绩
+	List<RecentlyBidQueryDto> recentlyBidQueryDto;
+	//一体化项目业绩
+	List<YitihuaAchievementQueryDto> yitihuaAchievements;
+	//一体化业绩精简版
+	List<YitihuaAchievementQueryDto> ythAchievements;
+	//一体化业绩完整版
+	List<YitihuaAchievementQueryDto> ythFullAchievements;
+	//全平台业绩
+	List<JabBasicEnterpriseProjectDto> basicAchievements;
+	//江西中标业绩
+	List<JiangxiBidQueryDto> jiangxiBidQueryDto;
+	//水利业绩
+	List<ShuiliAchievementQueryDto> shuiliAchievements;
+	//人员业绩条件是否与企业业绩条件相同
+	Boolean isSame;
+	//人员业绩企业一致
+	Integer achievementCount;
+	//一体化来源
+	String yitihuaSource;
+	//资质到期日期参数
+	@JSONField(format="yyyy-MM-dd")
+	Date startCertValidityDate;
+	@JSONField(format="yyyy-MM-dd")
+	Date endCertValidityDate;
+
+	String filePlaceCode;//备案地code
+
+	Integer filePlaceType;//备案地类型  1 本省企业或外地备案 2 外地备案 3 本省企业
+
+	String province;//注册地 省级code 多个逗号隔开
+
+	String city;//注册地 市级code 多个逗号隔开
+
+	String county;//注册地 区级code 多个逗号隔开
+	//是否有电话 0否 1是
+	Integer hasPhone;
+
+	//关键词
+	String keyword;
+}

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class ComposeQueryDto {
+
+	String region;
+
+	String keyword;
+
+	String keywordNot;
+
+	Page page;
+	
+	AptitudeQueryDto aptitudeQueryDto;
+
+	//工商信息
+	BusinessInfoDto businessInfoDto;
+
+	List<AchievementQueryDto> enterpriseAchievementQueryDto;
+
+	//完整版四库业绩
+	List<AchievementQueryDto> enterpriseAchievementFullQueryDto;
+
+	List<JiangxiBidQueryDto> jiangxiBidQueryDto;
+
+	BeijingQueryDto beijingQueryDto;
+
+	List<RecentlyBidQueryDto> recentlyBidQueryDto;
+
+	List<AwardQueryDto> awardQueryDtos;
+
+	String awardEname;
+	//人员证书专查
+	PersonnelCertificateQueryDto personnelCertificateQueryDto;
+
+	PersonnelCertificateQueryDto companyPersonnelCertQueryDto;
+	//项目负责人 （施工/监理/设计/勘察）
+	ComposePersonnelQueryDto composePersonnelQueryDto;
+	//项目负责人  （施工）
+	ComposePersonnelQueryDto composePersonnelQueryDtoV2;
+
+//	PersonnelQueryDto personnelQueryDto;
+
+	JskBidQueryDto jskBidQueryDto;
+	//标讯pro   招标
+	JskBidNewsDto jskBidNewsDto;
+
+	//标讯pro   中标候选人
+	JskBidCandidateDto jskBidCandidateDto;
+	//中标公示
+	JskBidWinListDto jskBidWinListDto;
+
+	String achievementQueryType;
+
+	String awardQueryType;
+
+	Boolean isHighLightKeyword;
+	
+	String eid;
+
+	String personId;
+
+	String md5Company;
+
+	List<String> exportHeader ;
+	//符合条件的荣誉类别 0 1 2 3
+	String awardType;
+
+	String badBehaviorEname;
+	//不良行为
+	List<CreditBehaviorDto> badBehaviors;
+	//信用评价
+	List<CreditEvaluateDto> creditEvaluates;
+	//良好行为
+	GoodBehaviorDto goodBehaviorDto;
+
+	String creditEvaluateType;
+
+	//全平台业绩
+	List<JabBasicEnterpriseProjectDto> basicAchievements;
+
+	//江西住建项目业绩
+	List<YitihuaAchievementQueryDto> yitihuaAchievements;
+	//一体化业绩精简版
+	List<YitihuaAchievementQueryDto> ythAchievements;
+	//一体化业绩完整版
+	List<YitihuaAchievementQueryDto> ythFullAchievements;
+	//水利业绩
+	List<ShuiliAchievementQueryDto> shuiliAchievements;
+	//土地招拍挂
+	LandMarketDto landMarketDto;
+	//拟建
+	EstablishmentDto establishmentDto;
+
+	EstablishmentDto bidPro;
+
+	String yitihuaSource;
+
+	String exportSource;
+
+	Integer exportCount;
+
+	String exportExeclName;
+
+	String exportBackUrl;
+
+	String exportUniqueCode;
+
+	String orderSn;
+
+	public Page getPage() {
+		if (page == null) {
+			page = new Page();
+			page.setPage(1);
+			page.setLimit(10);
+		}
+		return page;
+	}
+}

dsk-common/src/main/java/com/dsk/common/dtos/ComposeRegisterDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ComposeRegisterDto {
+
+	// 注册类型
+	List<RegisterTypeDto> registerTypes;
+	// and/or
+	String registerQueryType;
+	// 注册人数
+	Integer registerCount;
+	// 个数类型 1 大于等于 2 等于 3小于等于
+	Integer countType;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/CreditBehaviorDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 刘昌
+ * @date 2020/9/4 9:08
+ */
+@Data
+public class CreditBehaviorDto {
+
+    String category;
+
+    String type;
+
+    String subclass;
+
+    String org;
+
+    String dataSource;
+
+    String contentInfo;
+
+    String punishType;
+
+    Date startTime;
+
+    String behaviorTime;
+
+    String behaviorExportTime;
+
+    Date endTime;
+
+    Integer jskEid;
+
+    String ename;
+}

dsk-common/src/main/java/com/dsk/common/dtos/CreditEvaluateDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 刘昌
+ * @date 2020/9/4 9:08
+ */
+@Data
+public class CreditEvaluateDto {
+
+    String keyword;
+
+    String no;
+
+    String ename;
+
+    String province;
+
+    String city;
+
+    String dataSource;
+    //企业类型
+    String type;
+//    是否是及以上
+    Boolean attrComp;
+    //评价类型
+    String attribute;
+    //排名、评分
+    String rankOrLevel;
+    //等级
+    Integer startYear;
+
+    Integer endYear;
+
+    String jskEid;
+
+    String publishTime;
+
+    String timeSpan;
+
+    Date startTime;
+
+    Date endTime;
+
+    String quarter;
+
+    String issuteTime;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/DateQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 时间筛选对象
+ *
+ * @author lcl
+ * @create 2021/9/6
+ */
+@Data
+public class DateQueryDto implements Serializable {
+    //类型
+    private String type;
+    //筛选类型 and/or
+    private String queryType;
+    //开始时间
+    private Date startDate;
+    //结束时间
+    private Date endDate;
+}

dsk-common/src/main/java/com/dsk/common/dtos/Enterprise.java

+package com.dsk.common.dtos;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 企业
+ * @author Administrator
+ *
+ */
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Enterprise {
+
+	String id;
+	
+	String companyId;
+	
+	Integer jskEid;
+	
+	String regionId;
+	
+	String source;
+	
+	String name;
+	
+	String businessStatus;
+	
+	String formerName;
+	
+	String creditCode;
+	
+	String legalPerson;
+	
+	String registrationType;
+	
+	Double registeredCapital;
+
+	Double actualCapi;
+
+	String registeredCapitalStr;
+	
+	String domicile;
+	
+	String domicileNum;
+	
+	String domicileCity;
+	
+	String registerProvince;
+	
+	String registerCity;
+	
+	Integer isCountryCredit;
+	
+	String businessAddress;
+	
+	String businessScope;
+	
+	Integer isLocal;
+	
+	String attn;
+	
+	String phone;
+	
+	String other;
+	
+	String regionInfo;
+	
+	Double rate;
+	
+	Date rateTime;
+	
+	// 资质数
+	
+	Integer aptitudeCount;
+	
+	// 项目数
+	
+	Integer projectCount;
+	
+	// 人数
+	
+	Integer persionCount;
+
+	//最新中标个数
+	
+	Integer recentlyCount;
+	
+	Integer numPunish;
+	
+	Integer badCreditChinaCount;
+	
+	Integer zzZfcgsxCount;
+	
+	Integer seriousIllegalCount;
+	
+	Integer zzSxbzxCount;
+	
+	Integer zzJdcgsxCount;
+	
+	Integer zzRiskBidCount;
+
+	// -------------注册地与备案地 重构版----------------
+	
+	String filePlaceCode;//备案地code
+	
+	public Integer filePlaceType;//备案地类型  1 本省企业或外地备案 2 外地备案 3 本省企业
+	
+	String province;//注册地 省级code 多个逗号隔开
+	
+	String city;//注册地 市级code 多个逗号隔开
+	
+	String county;//注册地 区级code 多个逗号隔开
+}

dsk-common/src/main/java/com/dsk/common/dtos/EnterpriseDto.java

+package com.dsk.common.dtos;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EnterpriseDto{
+	
+	Integer no;
+	
+	Double rate;
+	
+	String isLocalC;
+
+	String labels;
+
+	String isISO;
+	
+	String isEMS;
+	
+	String isOHSMS;
+	
+	String certData;
+	
+	String nameSimple;
+	
+	String logoUrl;
+	
+	String registeredDate;
+	
+	String liceValidityDate;
+	//安许证-证书生效时间
+	String liceIssueDate;
+
+	String liceCertNo;
+	
+	Integer liceValidDay;
+
+	String url;
+	
+	String registeredCapitalStr;
+
+	String id;
+
+	String companyId;
+
+	Integer jskEid;
+
+	String regionId;
+
+	String source;
+
+	String name;
+
+	String businessStatus;
+
+	String formerName;
+
+	String creditCode;
+
+	String legalPerson;
+
+	String registrationType;
+
+	Double registeredCapital;
+
+	Double actualCapi;
+
+	String domicile;
+
+	String domicileNum;
+
+	String domicileCity;
+
+	String registerProvince;
+
+	String registerCity;
+
+	Integer isCountryCredit;
+
+	String businessAddress;
+
+	String businessScope;
+
+	Integer isLocal;
+
+	String attn;
+
+	String phone;
+
+	String companyType;
+
+	String other;
+
+	String regionInfo;
+
+	Date rateTime;
+	// 资质数
+	Integer aptitudeCount;
+
+	Integer aptitudeCountNew;
+	// 项目数
+	Integer projectCount;
+	// 人数
+	Integer persionCount;
+	//最新中标个数
+	Integer recentlyCount;
+
+	Integer skyCount;
+
+	Integer registeredPersonnelCount;
+
+	Integer jskBidCount;
+
+	Integer supplierCount;
+
+	Integer customerCount;
+
+	Integer threePersonnelCount;
+
+	Integer numPunish;
+
+	Integer badCreditChinaCount;
+
+	Integer zzZfcgsxCount;
+
+	Integer seriousIllegalCount;
+
+	Integer zzSxbzxCount;
+
+	Integer zzJdcgsxCount;
+
+	Integer zzRiskBidCount;
+
+	// -------------注册地与备案地 重构版----------------
+
+	String filePlaceCode;//备案地code
+
+	public Integer filePlaceType;//备案地类型  1 本省企业或外地备案 2 外地备案 3 本省企业
+
+	String province;//注册地 省级code 多个逗号隔开
+
+	String city;//注册地 市级code 多个逗号隔开
+
+	String county;//注册地 区级code 多个逗号隔开
+	//企业备案地
+	List<String> regionList;
+}

dsk-common/src/main/java/com/dsk/common/dtos/Entity.java

+package com.dsk.common.dtos;
+
+import java.io.*;
+
+/**
+ * <pre>
+ * <b>.</b>
+ * <b>Description:实体类基类</b> 
+ * 
+ * <b>Author:</b> vip@chennxu.com
+ * <b>Date:</b> 2016年9月3日 上午11:49:20
+ * <b>Copyright:</b> Copyright &copy;2006-2015 chennxu.com Co., Ltd. All rights reserved.
+ * <b>Changelog:</b>
+ *   Ver   Date                  Author              Detail
+ *   ----------------------------------------------------------------------
+ *   1.0   2016年9月3日 上午11:49:20   vip@chennxu.com        new file.
+ * </pre>
+ */
+public class Entity implements Serializable, Cloneable, Comparable<Entity> {
+
+	/**
+	 * 序列化版本标示
+	 */
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 深度克隆
+	 * 
+	 * @return 克隆后得到的对象
+	 * @throws IOException
+	 * @throws ClassNotFoundException
+	 */
+	public final Object deepClone() throws IOException, ClassNotFoundException {
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ObjectOutputStream oos = new ObjectOutputStream(bos);
+		oos.writeObject(this);
+		ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+		return new ObjectInputStream(bis).readObject();
+	}
+
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		// TODO Auto-generated method stub
+		return super.clone();
+	}
+
+	public int compareTo(Entity o) {
+		return 0;
+	}
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/EstablishmentDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目立项数据(JskProjectEstablishment)实体类
+ *
+ * @author pig4cloud
+ * @since 2022-04-09 17:06:01
+ */
+@Data
+public class EstablishmentDto  {
+
+    private String keyword;
+    private String keywordNot;
+
+    private String id;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 申请单位
+     */
+    private String companyName;
+    
+    private Integer companyId;
+    /**
+     * 立项阶段
+     */
+    
+    private String  stage;
+    /**
+     * 审批部门
+     */
+
+    private String examineOffice;
+    /**
+     * 项目类型
+     */
+
+    private String projectType;
+    /**
+     * 事项名称
+     */ 
+    private String examineContent;
+    /**
+     * 审批结果
+     */ 
+    private String examineStatus;
+    /**
+     * 审批文号
+     */ 
+    private String licenseNum;
+    /**
+     * 计划开工时间
+     */ 
+    private String planStartTime;
+    @JSONField(format="yyyy-MM-dd")
+    private Date planStartTimeStart;
+    @JSONField(format="yyyy-MM-dd")
+    private Date planStartTimeEnd;
+    /**
+     * 建成时间
+     */
+    @JSONField(format="yyyy-MM-dd")
+    private String planEndTime;
+    @JSONField(format="yyyy-MM-dd")
+    private Date planEndTimeStart;
+    @JSONField(format="yyyy-MM-dd")
+    private Date planEndTimeEnd;
+    /**
+     * 审批文件链接
+     */ 
+    private String licenseUrl;
+    /**
+     * 复核通过时间
+     */ 
+    private String reviewTime;
+    /**
+     * 办结时间
+     */ 
+    private String handleTime;
+    @JSONField(format="yyyy-MM-dd")
+    private Date handleTimeStart;
+    @JSONField(format="yyyy-MM-dd")
+    private Date handleTimeEnd;
+    /**
+     * 项目代码
+     */ 
+    private String projectCode;
+    /**
+     * 国家代码
+     */ 
+    private String countryCode;
+    /**
+     * 省
+     */ 
+    private Integer provinceId;
+    /**
+     * 市
+     */ 
+    private Integer cityId;
+    /**
+     * 区
+     */ 
+    private Integer districtId;
+
+    
+    private String domicile;
+    /**
+     * 省
+     */ 
+    private String province;
+    /**
+     * 市
+     */ 
+    private String city;
+    /**
+     * 区
+     */ 
+    private String district;
+    /**
+     * 总投资
+     */ 
+    private Double money;
+    
+    private Double startMoney;
+    
+    private Double endMoney;
+    /**
+     * 资金来源
+     */ 
+    private String sourceMoney;
+    /**
+     * 项目所属行业
+     */ 
+    private String industry;
+    /**
+     * 建设性质
+     */ 
+    private String buildNature;
+    /**
+     * 建设地点
+     */ 
+    private String buildAddre;
+    /**
+     * 建设规模和内容
+     */ 
+    private String buildScale;
+    /**
+     * 来源网站名称
+     */ 
+    private String sourceName;
+    /**
+     * 详情页url
+     */ 
+    private String sourceUrl;
+    private String personTel;
+    /**
+     * 是否为民介
+     */
+    private Integer isProject;
+    private String isProjectStr;
+    private String approvalInfo;
+    private String marketingInfo;
+    /**
+     * 创建时间 设置为mysql自动创建
+     */ 
+    private Date createTime;
+    
+    private String updateTime;
+
+
+
+}
\ No newline at end of file

dsk-common/src/main/java/com/dsk/common/dtos/GoodBehaviorDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lc
+ * @date 2023/1/16 16:08
+ */
+@Data
+public class GoodBehaviorDto {
+
+    //三体系查询方式   同时具备、任意均可
+    String systemQueryType;
+    //体系类型
+    List<Integer> systemType;
+
+    String systemTypeStr;
+    //A级纳税人
+    String taxYear;
+
+    String taxYearQueryType;
+
+    //是否高新技术企业 0否 1是
+    Integer isHighTech;
+
+    String ename;
+}

dsk-common/src/main/java/com/dsk/common/dtos/HeaderDto.java

+package com.dsk.common.dtos;
+
+import com.md.common.entity.Page;
+import lombok.Data;
+
+/**
+ * 头部查询参数
+ *
+ * @author lcl
+ * @create 2021/10/22
+ */
+@Data
+public class HeaderDto{
+
+    private String queryStr;
+
+    private String sourceName;
+
+    private Page page;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/JabBasicEnterpriseProjectDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 全平台企业基本业绩信息(筛选条件)
+ *
+ * @author lcl
+ * @create 2021/9/6
+ */
+@Data
+public class JabBasicEnterpriseProjectDto implements Serializable {
+
+    //参建单位
+    private String ename;
+    //建设单位
+    private String buildCorpName;
+    //业绩来源 多个空格隔开
+    private String achievementSource;
+    //业绩类型 多个空格隔开
+    private String achievementType;
+    //项目金额 最小值
+    private Double projectMoney;
+    private Double startMoney;
+    private Double endMoney;
+    //包含金额未公示 0：不包含 1：包含
+    private Integer isMoney;
+    //时间条件
+    private List<DateQueryDto> dateDtos;
+    //时间查询类型 and/or 默认任意均可
+    private String timeQueryType;
+    //关键词（包含） 单个空格隔开
+    private List<KeywordDto> keywords;
+    //关键词（不包含）
+    private String keywordNot;
+
+    private String keywordNotType;
+
+    //单项查询 关键词包含
+    String singleKeywordIn;
+    //单项查询 关键词不包含
+    String singleKeywordOut;
+    //单项查询 关键词包含体现节点
+    String singleKeywordInNode;
+    //单项查询 关键词不包含体现节点
+    String singleKeywordOutNode;
+    //是否截图体现公司和规模  yes   no
+    Boolean isSingleReflect;
+
+    //省 多个空格隔开
+    private String divisionStr;
+    //市 多个空格隔开
+    private String cityStr;
+    //区 多个空格隔开
+    private String countyStr;
+    String province;
+    Integer provinceId;
+    String city;
+    Integer cityId;
+    String county;
+    Integer countyId;
+    //业绩数量
+    private Integer achievementCount;
+
+}
+
+

dsk-common/src/main/java/com/dsk/common/dtos/JiangxiBidQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JiangxiBidQueryDto {
+
+	//参建单位  施工单位
+	String ename;
+	//建设单位
+	String buildCorpName;
+	//中标金额
+	Double startMoney;
+
+	Double endMoney;
+	//包含金额未公示
+	String hasMoney;
+	// 中标开始时间
+	Date startTenderTime;
+	// 中标结束时间
+	Date endTenderTime;
+	//开工日期开始
+	Date startWorkDate;
+	//开工日期结束
+	Date endWorkDate;
+	//竣工日期开始
+	Date startCheckDate;
+	//竣工日期结束
+	Date endCheckDate;
+	// 实际竣工开始日期
+	Date startCheckCheckDate;
+	// 实际竣工结束日期
+	Date endCheckCheckDate;
+	//实际开工开始日期
+	Date startCheckWorkDate;
+	//实际开工结束日期
+	Date endCheckWorkDate;
+	//业绩时间同时具备、任意均可
+	String timeQueryType;
+	// 关键词(包含)
+	List<KeywordDto> keywords;
+	// 关键词(不包含)
+	String keywordNot;
+	// 关键词(不包含)查询类型 project项目名称  scale建设规模  projectOrScale项目名称或建设规模
+	String keywordNotType;
+
+	//单项查询 关键词包含
+	String singleKeywordIn;
+	//单项查询 关键词不包含
+	String singleKeywordOut;
+	//单项查询 关键词体现节点
+	String singleKeywordInNode;
+	//单项查询 关键词体现节点
+	String singleKeywordOutNode;
+//	// 项目属地
+//	String divisionStr;
+	//项目所在城市
+	String cityStr;
+	//所在区
+	String countyStr;
+	// 业绩数量
+	Integer achievementCount;
+
+	String city;
+
+	String county;
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskBidCandidateDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidCandidateDto {
+
+	String id;
+	//省
+	String province;
+	//市
+	String city;
+	//区
+	String county;
+	//项目名称
+	String projectName;
+	//项目类型
+	String projectType;
+	// 发布开始时间
+	@JSONField(format="yyyy-MM-dd")
+	Date startPubdate;
+	// 发布结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endPubdate;
+
+	//中标金额开始
+	Double startProjectAmount;
+	//中标金额结束
+	Double endProjectAmount;
+	//最高限价开始
+	Double startMaxAmount;
+	//最高限价结束
+	Double endMaxAmount;
+	//下浮率开始
+	Double startLowerRate;
+	//下浮率结束
+	Double endLowerRate;
+
+	//中标候选人
+	String bidWinCompany;
+	//中标候选人id
+	String bidWinCompanyId;
+	//招标人
+	String tenderee;
+	//代理机构
+	String agency;
+	//最高限价
+	String maxAmount;
+	//中标金额
+	String projectAmount;
+	//下浮率
+	String lowerRate;
+	//名次
+	String rank;
+	//发布时间
+	String pubdate;
+
+	String tendereeId;
+
+	String tendereeTel;
+
+	String agencyId;
+
+	String agencyTel;
+
+	List<Map<String,String>> mapList;
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskBidNewsDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidNewsDto {
+
+	String id;
+	//省
+	String province;
+	//市
+	String city;
+	//区
+	String county;
+	//项目名称
+	String projectName;
+	//项目类型
+	String projectType;
+	//工程用途
+	String projectPurposes;
+	//工程用途
+	String projectLevel;
+	//评标办法
+	String bidAssessmentWay;
+	//评标委员会-有无业主代表，0为未知，1为无，2为有
+	String bidMettingHasProjectUnit;
+	//有无预付款，0为未知，1为无，2为有
+	String hasAdvanceAmount;
+	//保证金缴纳
+	String projectEnsureAmountPayType;
+	// 发布开始时间
+	@JSONField(format="yyyy-MM-dd")
+	Date startPubdate;
+	// 发布结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endPubdate;
+
+	// 开标截至时间开始
+	@JSONField(format="yyyy-MM-dd")
+	Date startEndTimeDate;
+	// 开标截至时间结束
+	@JSONField(format="yyyy-MM-dd")
+	Date endEndTimeDate;
+	//项目金额开始
+	Double startProjectAmount;
+	//项目金额结束
+	Double endProjectAmount;
+	//项目投资额开始
+	Double startProjectInvestmentAmount;
+	//项目投资额结束
+	Double endProjectInvestmentAmount;
+	//合同估算价开始
+	Double startProjectContractAmount;
+	//合同估算价结束
+	Double endProjectContractAmount;
+	//建安费开始
+	Double startProjectSafeAmount;
+	//建安费结束
+	Double endProjectSafeAmount;
+	//勘察费开始
+	Double startProjectSurveyAmount;
+	//勘察费结束
+	Double endProjectSurveyAmount;
+	//设计费开始
+	Double startProjectDesignAmount;
+	//设计费结束
+	Double endProjectDesignAmount;
+	//投标保证金开始
+	Double startProjectEnsureAmount;
+	//投标保证金结束
+	Double endProjectEnsureAmount;
+
+	//资质要求
+	String qualiLimit;
+	//业绩要求
+	String projectLimit;
+	//人员要求
+	String personLimit;
+
+	//招标人
+	String tenderee;
+	//代理机构
+	String agency;
+	//时间
+	String dateStr;
+	//金额
+	String moneyStr;
+
+	String tendereeId;
+
+	String tendereeTel;
+
+	String agencyId;
+
+	String agencyTel;
+
+	String eligibleEnterprisesUrl;
+
+	String pubdate;
+
+	String endTimeDate;
+
+	String projectAmount;
+	//项目投资额
+	String projectInvestmentAmount;
+	//合同估算价
+	String projectContractAmount;
+	//建安费
+	String projectSafeAmount;
+	//综合单价
+	String projectComprehensiveAmount;
+	//勘察费
+	String projectSurveyAmount;
+	//设计费
+	String projectDesignAmount;
+	//投标保证金
+	String projectEnsureAmount;
+	//是否有文档
+	String hasFile;
+	//项目特点解析
+	String projectCharacteristics;
+    //市场分析及报价策略
+	String marketAnalysis;
+	//成本分析
+	String costAnalysis;
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskBidQueryDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidQueryDto {
+
+
+	String id;
+
+	String title;
+	//查找范围
+	String queryScope;
+	//"询价", "比选", "邀请", "竞争性谈判", "竞争性磋商", "单一来源", "竞价", "直接发包", "公开招标",其他',
+	String tenderingManner;
+	//招标金额
+	Double bidMoney;
+
+	String hasMoney;
+
+	Double startBidMoney;
+
+	Double endBidMoney;
+
+	String domicile;
+
+	String tenderStage;
+
+	String projectType;
+
+	String companyName;
+
+	String projectName;
+
+	String contentInfo;
+
+	Integer jskEid;
+
+	String tenderTime;
+	@JSONField(format="yyyy-MM-dd")
+	Date startTenderTime;
+	// 发布结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endTenderTime;
+
+	String punishDate;
+	// 发布开始时间
+	@JSONField(format="yyyy-MM-dd")
+	Date startPunishDate;
+	// 发布结束时间
+	@JSONField(format="yyyy-MM-dd")
+	Date endPunishDate;
+	//行业
+	String industry;
+	// 标的物类型：工程/货物/服务/其他
+	String subjectMatter;
+	//中标标金额
+	Double startTenderMoney;
+
+	Double endTenderMoney;
+
+	String overTime;
+
+	String phonePoint;
+
+	String contact;
+
+	String contactTel;
+
+	String source;
+
+	String agency;
+
+	Integer agencyId;
+
+	String agencyContact;
+
+	String agencyContactTel;
+
+	String province;
+
+	String city;
+
+	String county;
+
+	/**
+	 * 修改时间
+	 */
+	private String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskBidWinListDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 中标公示查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidWinListDto {
+
+	String winListUuid;
+	//招标单位
+	String tenderee;
+	//招标单位id
+	String tendereeId;
+	//省
+	String province;
+	String provinceId;
+	//市
+	String city;
+	String cityId;
+	//区
+	String area;
+	String areaId;
+	//中标项目编号
+	String bidWinProjectNo;
+	//项目名称
+	String projectName;
+	//项目id
+	String projectId;
+	//中标单位
+	String bidWinCompany;
+	//正文id
+	String contentId;
+	//下浮率
+	Double downfloatRate;
+	//其他来源
+	String otherSource;
+	//处理后的工期（天）
+	Integer dealProjectDuration;
+	//建造师名称
+	String constructor;
+	//建造师注册号
+	String constructorNo;
+	//处理后的中标金额（万元）
+	Double dealBidWinAmount;
+	//主来源网站名称
+	String sourceName;
+	//主来源详情页链接
+	String url;
+	//建设工程项目类型
+	String buildingProjectType;
+	//中标时间/发布时间
+	String issueTime;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/JskDataScreenDto.java

+package com.dsk.common.dtos;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.md.common.entity.Page;
+import lombok.Data;
+
+@Data
+public class JskDataScreenDto {
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public Integer provinceId;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public String certType;
+
+    public String subclass;
+
+    public String certLevel;
+
+    public String label;
+
+    public Integer count;
+
+    public String newProjectCount;
+
+    public String toDayBidAmount;
+
+    public String toDayBidCount;
+
+    public Page page;
+
+
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/KeywordDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+@Data
+public class KeywordDto {
+
+	// 关键词(包含)
+	private String keyword;
+	// 关键词(包含)查询类型 project项目名称  scale建设规模  projectOrScale项目名称或建设规模
+	private String keywordType;
+	//是否截图体现公司和规模  yes   no
+	private Boolean isReflect;
+	//体现节点
+	private String keywordStr;
+}

dsk-common/src/main/java/com/dsk/common/dtos/LandMarketDto.java

+package com.dsk.common.dtos;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LandMarketDto  {
+
+	private Integer id;
+
+	/**
+	 * 关键词
+	 */
+	private String keyword;
+
+	private String keywordNot;
+
+	/**
+	 * 项目名称
+	 */
+	private String projectName;
+	/**
+	 * 受让人
+	 */
+	private String companyName;
+	/**
+	 * 企业ID
+	 */
+	private Integer companyId;
+	/**
+	 * 出让面积
+	 */
+	private Double acreage;
+	private Double startAcreage;
+	private Double endAcreage;
+	/**
+	 * 加价幅度
+	 */
+	private String addMoneyRange;
+	/**
+	 * 招拍挂起始时间
+	 */
+	private Date auctionBeginTime;
+	/**
+	 * 招拍挂截止时间
+	 */
+	private Date auctionEndTime;
+	/**
+	 * 批准单位
+	 */
+	private String authority;
+	/**
+	 * 保证金
+	 */
+	private Double bondmoney;
+	/**
+	 * 建筑面积
+	 */
+	private Double buildArea;
+	private Double startBuildArea;
+	private Double endBuildArea;
+	/**
+	 * 建筑密度
+	 */
+	private String buildingDensity;
+	/**
+	 * 建筑限高
+	 */
+	private String buildingHeight;
+	private String domicile;
+	/**
+	 * 省
+	 */
+	private String province;
+	/**
+	 * 省ID
+	 */
+	private Integer provinceId;
+	/**
+	 * 市
+	 */
+	private String city;
+	/**
+	 * 市ID
+	 */
+	private Integer cityId;
+	/**
+	 * 区
+	 */
+	private String area;
+	/**
+	 * 区ID
+	 */
+	private Integer areaId;
+	/**
+	 * 合同编号
+	 */
+	private String contractNum;
+	/**
+	 * 合同签订日期
+	 */
+	private String contractSignTime;
+	/**
+	 * 合同签订日期
+	 */
+	@JSONField(format="yyyy-MM-dd")
+	private Date contractSignTimeStart;
+	/**
+	 * 合同签订日期
+	 */
+	@JSONField(format="yyyy-MM-dd")
+	private Date contractSignTimeEnd;
+	/**
+	 * 约定开工时间
+	 */
+	private Date conventionBeginTime;
+	/**
+	 * 约定竣工时间
+	 */
+	private Date conventionEndTime;
+	/**
+	 * 约定交地时间
+	 */
+	private Date conventionLandTime;
+	/**
+	 * 约定容积率
+	 */
+	private String conventionVolumeRate;
+	/**
+	 * 结果详情url
+	 */
+	private String detailUrl;
+	/**
+	 * 电子监管号
+	 */
+	private String electronicNumber;
+	private String gdgid;
+	/**
+	 * 绿化率
+	 */
+	private String greeningRate;
+	/**
+	 * 行业分类
+	 */
+	private String industry;
+	/**
+	 * 投资强度
+	 */
+	private String investmentIntensity;
+	/**
+	 * 报名起始时间
+	 */
+	private Date joinBeginTime;
+	/**
+	 * 报名截止时间
+	 */
+	private Date joinEndTime;
+	/**
+	 * 土地坐落
+	 */
+	private String landAddr;
+	/**
+	 * 土地级别
+	 */
+	private String landLevel;
+	/**
+	 * 地块名称
+	 */
+	private String landName;
+	/**
+	 * 地块公示url
+	 */
+	private String landNoticeUrl;
+	/**
+	 * 土地来源
+	 */
+	private String landSource;
+	/**
+	 * 土地用途
+	 */
+	private String landUse;
+	/**
+	 * 土地使用权人cid
+	 */
+	private Integer landUseCompanyId;
+	/**
+	 * 土地使用权人
+	 */
+	private String landUseCompany;
+	/**
+	 * 出让年限
+	 */
+	private String landUseYear;
+	/**
+	 * 起始价
+	 */
+	private String moneyBegin;
+	/**
+	 * 分期支付约定
+	 */
+	private String paymentAgreement;
+	/**
+	 * 实际开工时间
+	 */
+	private Date realBeginTime;
+	/**
+	 * 实际竣工时间
+	 */
+	private Date realEndTime;
+	/**
+	 * 出让公告url
+	 */
+	private String sellNoticeUrl;
+	/**
+	 * 供地方式/供应方式
+	 */
+	private String supplyLandWay;
+	/**
+	 * 成交价格
+	 */
+	private Double transactionPrice;
+
+	/**
+	 * 成交价格-起
+	 */
+	private Double startTransactionPrice;
+
+	/**
+	 * 成交价格-止
+	 */
+	private Double endTransactionPrice;
+	/**
+	 * 成交公示日期
+	 */
+	private String transactionPublicityTime;
+	/**
+	 * 容积率
+	 */
+	private String volumeRate;
+	/**
+	 * 约定容积率上限
+	 */
+	private Double volumeRateHigh;
+	/**
+	 * 约定容积率下限
+	 */
+	private Double volumeRateLow;
+	/**
+	 * 来源
+	 */
+	private String dataSource;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 修改时间
+	 */
+	private String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/Page.java

+package com.dsk.common.dtos;
+
+import com.dsk.common.exception.BusinessException;
+import com.github.pagehelper.PageHelper;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+@FieldDefaults(level=AccessLevel.PRIVATE)
+public class Page extends Entity {
+	public Page(){
+	}
+
+	public Page(Integer page, Integer limit) {
+		this.page = page;
+		this.limit = limit;
+	}
+
+	public Page(List<Map<String, Object>> list, Long total, Integer limit, Integer page){
+		this.list = list;
+		this.total = total;
+		this.page = page;
+		this.limit = limit;
+	}
+	/**
+	 * 序列化版本标示
+	 */
+	private static final long serialVersionUID = 1L;
+
+	// 页码数
+	Integer page;
+	
+	// 单页最大行数
+	Integer limit;
+
+	List<?> list;
+
+	String field;
+
+	String order;
+
+	Long total=0L;
+	
+	@SuppressWarnings("rawtypes")
+	private void validateOrderField(boolean isPage, Class cls) {
+		if (isPage) {
+			PageHelper.startPage(page == null ? 1 : page, limit == null ? 10: limit);
+		}
+		if (!StringUtils.isEmpty(order) && cls != null&&!StringUtils.isEmpty(field)) {
+            String[] orders = this.order.split(",");
+            String[] fieldArray = this.field.split(",");
+            if (orders.length == fieldArray.length) {
+                List<Field> fields = ReflectionUtils.getDeclaredField(cls);
+                for (String sort : fieldArray) {
+                    boolean isExsit = false;
+                    for (Field field : fields) {
+                        if (field.getName().equals(sort)) {
+                            isExsit = true;
+                            break;
+                        }
+                    }
+                    if (!isExsit) {
+                        throw new BusinessException("排序字段'{}'异常", sort);
+                    }
+                }
+                StringBuilder orderBy = new StringBuilder();
+                for (int i = 0; i < fieldArray.length; i++) {
+                    if (i!=0) {
+                        orderBy.append(",");
+                    }
+                    orderBy.append(humpToLine(fieldArray[i])).append(orders[i].equalsIgnoreCase("desc")?" desc":" asc");
+                }
+                PageHelper.orderBy(orderBy.toString());
+            }
+        }
+	}
+	
+	public void initPagingData(Class<?> cls){
+		this.validateOrderField(true, cls);
+	}
+
+	public void initAllData(Class<?> cls){
+		this.validateOrderField(false, cls);
+	}
+	
+	public Page setResult(List<?> result){
+        com.github.pagehelper.Page<?> page = (com.github.pagehelper.Page<?>) result;
+        this.total = page.getTotal();
+        this.list = page.getResult();
+        return this;
+    }
+	
+	public void setData(List<?> data) {
+		this.list = data;
+	}
+
+	public static String humpToLine(String str) {
+		return str.replaceAll("[A-Z]", "_$0").toLowerCase();
+	}
+
+	public List<?> getList() {
+		if(CollectionUtils.isEmpty(this.list)){
+			this.list = new ArrayList<>();
+		}
+		return list;
+	}
+
+	@Override
+	public String toString() {
+		return "com.md.common.entity.Page{" +
+				"serialVersionUID=" + serialVersionUID +
+				", page=" + page +
+				", limit=" + limit +
+				", list=" + list +
+				", field='" + field + '\'' +
+				", order='" + order + '\'' +
+				", total=" + total +
+				'}';
+	}
+}

dsk-common/src/main/java/com/dsk/common/dtos/Personnel.java

+package com.dsk.common.dtos;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Personnel {
+
+	String id;
+	
+	String eid;
+	
+	Integer jskEid;
+	
+	String md5Company;
+	
+	String name;
+	
+	String sex;
+	
+	String cardType;
+	
+	String cardNo;
+	
+	String ename;
+	
+	String phone;
+	
+	String registerCount;
+	
+	String blaCount;
+	
+	String changeCount;
+	
+	String manceCount;
+	
+	String noHaviorCount;
+	
+	String haviorCount;
+	
+}

dsk-common/src/main/java/com/dsk/common/dtos/PersonnelCertificateQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 人员查询实体类
+ * @author Administrator
+ *
+ */
+@Data
+public class PersonnelCertificateQueryDto {
+
+	// 注册类型
+	List<ComposeRegisterDto> registers;
+	
+	String queryType;
+	
+	String queryCategory;
+
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/PersonnelExeclDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PersonnelExeclDto {
+
+	String id;
+	
+	String name;
+	
+	String registerType;
+	
+	String specialty;
+	
+	String ename;
+	
+	String cardNumber;
+	
+	Date validDate;
+	
+	String phone;
+	
+	String pids;
+
+	String projectCount;
+}

dsk-common/src/main/java/com/dsk/common/dtos/PersonnelQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 人员查询实体类
+ * @author Administrator
+ *
+ */
+@Data
+public class PersonnelQueryDto {
+
+	// 注册类型
+	List<RegisterTypeDto> registers;
+	// 人员姓名
+	String personName;
+	// 项目名称
+	String projectName;
+	// 业绩
+	Double startMoney;
+	
+	Double endMoney;
+	// 企业名称
+	String ename;
+	// comp有竣工 yes有业绩 no没业绩
+	String mance;
+
+	String cardNumber;
+	
+	String queryType;
+	
+	String queryCategory;
+	//企业注册地
+	String domicile;
+
+	String domicileNum;
+
+	String domicileCity;
+
+	String registerProvince;
+
+	String registerCity;
+
+	//人员唯一标识
+	String md5Company;
+	//人员id
+	String staffId;
+}

dsk-common/src/main/java/com/dsk/common/dtos/RecentlyBidQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class RecentlyBidQueryDto {
+
+
+	// 项目属地
+	String divisionStr;
+
+	Integer companyProvinceId;
+	// 项目属地
+	String cityStr;
+
+	String province;
+
+	Integer provinceId;
+
+	String city;
+
+	Integer cityId;
+
+	String county;
+
+	Integer countyId;
+
+	String eid;
+
+	String ename;
+
+	String pname;
+
+	String buildCorpName;
+	
+	Double startMoney;
+	
+	Double endMoney;
+	// 关键词(包含)
+	List<KeywordDto> keywords;
+	// 关键词(不包含)
+	String keywordNot;
+
+	//单项查询 关键词包含
+	String singleKeywordIn;
+	//单项查询 关键词不包含
+	String singleKeywordOut;
+	// 中标开始时间
+	Date startTenderTime;
+	// 中标结束时间
+	Date endTenderTime;
+	
+	Integer achievementCount;
+
+	String projectName;
+
+	String tenderType;
+
+	String sourceName;
+
+	String projectType;
+
+	String projectTypeNew;
+
+	String hasMoney;
+
+	Double startLowerRate;
+
+	Double endLowerRate;
+
+	String hasLowerRate;
+	//业绩列表类型  lowerRate 下浮率业绩
+	String listType;
+	//是否有电话 0否 1是
+	Integer hasPhone;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/ReflectionUtils.java

+package com.dsk.common.dtos;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReflectionUtils {
+
+    /**
+     * 获取全部属性 （追溯到所有顶级类）但不包括常量
+     * 
+     * @param object
+     * @return
+     */
+    public static List<Field> getDeclaredField(Object object) {
+        Class<?> clazz = object.getClass();
+        return getDeclaredField(clazz);
+    }
+
+    public static List<Field> getDeclaredField(Class<?> clazz) {
+		List<Field> fields = new ArrayList<Field>();
+        for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            for (Field field : clazz.getDeclaredFields()) {
+                switch (field.getModifiers()) {
+                case 24:
+                case 25:
+                case 26:
+                case 28:
+                    continue;
+                default:
+                    fields.add(field);
+                    break;
+                }
+            }
+        }
+        return fields;
+	}
+}

dsk-common/src/main/java/com/dsk/common/dtos/RegisterTypeDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+@Data
+public class RegisterTypeDto {
+
+	//来源
+	String personType;
+
+	// 注册专业
+	String registerSpecialty;
+	// 类型名称
+	String registerName;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/ShuiliAchievementQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 水利业绩筛选实体
+ *
+ * @author lcl
+ * @create 2021/8/30
+ */
+@Data
+public class ShuiliAchievementQueryDto implements Serializable {
+
+    //参建单位
+    private String ename;
+    //建设单位
+    private String buildCorpName;
+    //项目负责人
+    private String projectPrincipal;
+    //业绩类型 单个
+    private String achievementType;
+    //工程类型
+    private String projectType;
+    //项目状态
+    private String projectStatus;
+    //工程等别
+    private String grade;
+    //工程级别
+    private String level;
+    //工程规模
+    private String projectScale;
+    //省
+    private String divisionStr;
+    //市
+    private String cityStr;
+
+    private String province;//注册地 省级code 多个逗号隔开
+
+    private String city;//注册地 市级code 多个逗号隔开
+
+    private String county;//注册地 区级code 多个逗号隔开
+    //关键词（包含） 多个空格分隔
+    private List<KeywordDto> keywords;
+    //关键词（不包含） 多个空格分隔
+    private String keywordNot;
+    private String keywordNotType;
+
+    //单项查询 关键词包含
+    private String singleKeywordIn;
+    //单项查询 关键词不包含
+    private String singleKeywordOut;
+    //单项查询 关键词包含体现节点
+    private String singleKeywordInNode;
+    //单项查询 关键词不包含体现节点
+    private String singleKeywordOutNode;
+    //项目金额（最大）
+    private Double endMoney;
+    //项目金额（最小）
+    private Double startMoney;
+    //项目金额体现 多个空格分隔
+    private String moneyStr;
+    //项目金额类型 and/or
+    private String moneyQueryType;
+    //实际开工时间(开始)
+    private Date startTimeFactBegin;
+    //实际开工时间(结束)
+    private Date startTimeFactEnd;
+    //实际竣工时间(开始)
+    private Date overTimeFactBegin;
+    //实际竣工时间(结束)
+    private Date overTimeFactEnd;
+    //开工日期(开始)
+    private Date startTimeBegin;
+    //开工日期(结束)
+    private Date startTimeEnd;
+    //完工日期(开始)
+    private Date overTimeBegin;
+    //完工日期(结束)
+    private Date overTimeEnd;
+    //合同签订日期(开始)
+    private Date contractDateBegin;
+    //合同签订日期(结束)
+    private Date contractDateEnd;
+    //报告提交日期(开始)
+    private Date reportCommitDateBegin;
+    //报告提交日期(结束)
+    private Date reportCommitDateEnd;
+    //时间类型 and/or
+    private String timeQueryType;
+    //截图体现节点
+    private String screenshotShowNode;
+    //截图体现类型  and/or
+    private String screenshotShowType;
+    //业绩数量
+    private Integer achievementCount;
+}

dsk-common/src/main/java/com/dsk/common/dtos/SkyProjectIndexDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+@Data
+public class SkyProjectIndexDto {
+
+    String descriptionType;
+
+    Double indexData;
+}

dsk-common/src/main/java/com/dsk/common/dtos/YitihuaAchievementQueryDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 江西住建筛选实体
+ *
+ * @author lcl
+ * @create 2021/8/30
+ */
+@Data
+public class YitihuaAchievementQueryDto implements Serializable {
+
+    //参建单位
+    private String ename;
+    //建设单位
+    private String buildCorpName;
+    //业绩类型 多个空格分隔
+    private String achievementType;
+    //项目分类 多个空格分隔
+    private String projectType;
+    //工程用途 多个空格分隔
+    private String purposeStr;
+    //建设性质 多个空格分隔
+    private String nature;
+    //招标方式 多个空格分隔
+    private String tenderWay;
+    //关键词（包含） 多个空格分隔
+    private List<KeywordDto> keywords;
+    //关键词（不包含） 多个空格分隔
+    private String keywordNot;
+    private String keywordNotType;
+
+    //单项查询 关键词包含
+    String singleKeywordIn;
+    //单项查询 关键词不包含
+    String singleKeywordOut;
+    //单项查询 关键词包含体现节点
+    String singleKeywordInNode;
+    //单项查询 关键词不包含体现节点
+    String singleKeywordOutNode;
+    //是否截图体现公司和规模  yes   no
+    Boolean isSingleReflect;
+    //项目节点
+    private String attributeStr;
+    //项目节点类型 and/or
+    private String attributeQueryType;
+    //项目金额（最大）
+    private Double endMoney;
+    //项目金额（最小）
+    private Double startMoney;
+    //项目金额体现 多个空格分隔
+    private String moneyStr;
+    //中标金额
+    private Double startTenderMoney;
+    private Double endTenderMoney;
+    //合同金额
+    private Double startContractMoney;
+    private Double endContractMoney;
+    //施工许可金额
+    private Double startLicenceMoney;
+    private Double endLicenceMoney;
+    //竣工验收实际造价
+    private Double startCompletionMoney;
+    private Double endCompletionMoney;
+    //竣工备案实际造价
+    private Double startCheckMoney;
+    private Double endCheckMoney;
+    //总投资
+    private Double startInvest;
+    private Double endInvest;
+    //项目金额类型 and/or
+    private String moneyQueryType;
+    //项目面积（最大）
+    private Double endArea;
+    //项目面积（最小）
+    private Double startArea;
+    //项目面积体现 多个空格分隔
+    private String areaStr;
+    //招投标面积
+    private Double startTenderArea;
+    private Double endTenderArea;
+    //施工许可面积
+    private Double startLicenceArea;
+    private Double endLicenceArea;
+    //竣工验收面积
+    private Double startCheckArea;
+    private Double endCheckArea;
+    //竣工验收备案面积
+    private Double startCompletionArea;
+    private Double endCompletionArea;
+    //总面积
+    private Double startTotalArea;
+    private Double endTotalArea;
+    //项目面积类型 and/or
+    private String areaQueryType;
+    //金额和面积类型 and/or
+    private String moneyAndAreaQueryType;
+    //项目经理节点 多个空格分隔
+    private String pmStr;
+    //项目经理类型 and/or
+    private String pmQueryType;
+    //中标时间（开始-结束）
+    private Date startTenderTime;
+    private Date endTenderTime;
+    //合同签订时间（开始-结束）
+    private Date startContractDate;
+    private Date endContractDate;
+    //许可时间（开始-结束）
+    private Date startLicenceDate;
+    private Date endLicenceDate;
+    //备案开工时间（开始-结束）
+    private Date startWorkDate;
+    private Date endWorkDate;
+    //竣工备案时间（开始-结束）
+    private Date startCheckDate;
+    private Date endCheckDate;
+    //竣工备案时间未公示
+    private String hasCheckDate;
+    //实际开工时间（开始-结束）
+    private Date startCheckWorkDate;
+    private Date endCheckWorkDate;
+    //竣工验收时间（开始-结束）
+    private Date startCheckCheckDate;
+    private Date endCheckCheckDate;
+    //竣工验收时间未公示
+    private String hasCheckCheckDate;
+    //图审完成时间（开始-结束）
+    private Date startCensorDate;
+    private Date endCensorDate;
+    //时间类型 and/or
+    private String timeQueryType;
+    //省
+    private String divisionStr;
+    //市
+    private String cityStr;
+    //区
+    private String countyStr;
+
+    private String province;//注册地 省级code 多个逗号隔开
+
+    private String city;//注册地 市级code 多个逗号隔开
+
+    private String county;//注册地 区级code 多个逗号隔开
+    //业绩数量
+    private Integer achievementCount;
+
+    // 数据等级
+    private String dataLevel;
+    //招投标数据等级
+    private String tenderDataLevel;
+    //合同登记
+    private String contractDataLevel;
+    //施工许可
+    private String licenceDataLevel;
+    //竣工验收备案
+    private String completionDataLevel;
+    //项目主体
+    private String projectDataLevel;
+    //施工图审
+    private String censorDataLevel;
+    //竣工验收
+    private String checkDataLevel;
+    // 数据等级查询节点
+    private String dataLevelStr;
+    // 数据等级查询方式  同时具备  任意均可
+    private String dataLevelQueryType;
+    // 结构体系
+    private String structure;
+    //长度
+    private Double startLength;
+    //长度
+    private Double endLength;
+    //施工许可
+    private Double startLicenceLength;
+    private Double endLicenceLength;
+    //竣工验收
+    private Double startCheckCompletionLength;
+    private Double endCheckCompletionLength;
+    //竣工验收备案
+    private Double startCompletionLength;
+    private Double endCompletionLength;
+    //长度体现节点
+    private String lengthNode;
+    //长度筛选类型 or/and
+    private String lengthType;
+    //跨度
+    private Double startSpan;
+    //跨度
+    private Double endSpan;
+    //施工许可
+    private Double startLicenceSpan;
+    private Double endLicenceSpan;
+    //竣工验收
+    private Double startCheckCompletionSpan;
+    private Double endCheckCompletionSpan;
+    //竣工验收备案
+    private Double startCompletionSpan;
+    private Double endCompletionSpan;
+    //跨度体现节点
+    private String spanNode;
+    //跨度筛选类型 or/and
+    private String spanType;
+}

dsk-common/src/main/java/com/dsk/common/dtos/ZaiJianListDto.java

+package com.dsk.common.dtos;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+//在建导出参数接收
+@Getter
+@Setter
+public class ZaiJianListDto {
+
+    List<String> md5CompanyList;
+
+    List<ZaiJianPersonnelDto> nullDataList;
+}

dsk-common/src/main/java/com/dsk/common/dtos/ZaiJianPersonnelDto.java

+package com.dsk.common.dtos;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ZaiJianPersonnelDto extends Personnel {
+	
+	Integer no;
+	
+	String id;
+	
+	String registerType;
+	
+	String cardNumber;
+	
+	String sealNumber;
+	
+	Date validDate;
+	
+	String pid;
+	
+	String eid;
+	
+	Integer jskEid;
+	
+	String specialty;
+	
+	String ename;
+	
+	String projectName;
+	
+	String province;
+	
+	Long tenderDate;
+	//中标时间
+	String tenderTime;
+	
+	Double tenderMoney;
+	
+	Integer period;
+	
+	String registerInfo;
+	
+	String otherRegisterInfo;
+	//项目状态
+	String status;
+	//人员角色
+	String personRole;
+	//业绩来源
+	String source;
+	
+	String sourceName;
+	//业绩来源类型 1四库一平台  2最新中标  3全国公路
+	String sourceType;
+	//信息快照
+	String sourceUrl;
+	//合同金额
+	Double contractMoney;
+	//许可金额
+	Double licenceMoney;
+	//实际造价（竣工金额）
+	Double overMoney;
+	//结算金额
+	Double settlementMoney;
+	//金额信息
+	String totalMoney;
+	//合同时间
+	String contractDate;
+	//许可时间
+	String licenceDate;
+	//计划竣工时间
+	String planCompletionDate;
+	//实际竣工时间
+	String completionDate;
+	//计划开工时间
+	String planStartDate;
+	//实际开工时间
+	String startDate;
+	//计划交工时间
+	String planHandoverDate;
+	//实际交工时间
+	String handoverDate;
+	//时间信息
+	String totalDate;
+	//业绩个数
+	Long achievementCount;
+	//各自系统的人员id
+	String personId;
+	//快照
+	String snapshootPic;
+	//人员id
+	String staffId;
+}

dsk-common/src/main/java/com/dsk/common/exception/BusinessException.java

+package com.dsk.common.exception;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+
+@Getter
+@FieldDefaults(level=AccessLevel.PRIVATE)
+public class BusinessException extends RuntimeException {
+
+	private static final long serialVersionUID = 1L;
+
+	Integer code;
+	
+	String msg;
+
+
+	public BusinessException(String msg) {
+		super(msg);
+		this.msg = msg;
+	}
+	
+
+	public BusinessException(Integer code, String msg) {
+		super();
+		this.code = code;
+		
+		this.msg = msg;
+	}
+	
+	public BusinessException(String msg, Object... params) {
+		for (Object param : params) {
+			msg = msg.replaceFirst("\\{\\}", param.toString());
+		}
+		this.msg = msg;
+	}
+	
+
+	public BusinessException(int code, String msg, Object... params) {
+		this.code = code;
+		for (Object param : params) {
+			msg = msg.replaceFirst("\\{\\}", param.toString());
+		}
+		this.msg = msg;
+	}
+
+	
+	public BusinessException(Throwable throwable) {
+		super(throwable);
+	}
+
+
+
+	public String getMsg() {
+		return msg;
+	}
+
+
+
+
+
+
+
+}

dsk-common/src/main/java/com/dsk/common/utils/ReflectionUtils.java

+package com.dsk.common.utils;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReflectionUtils {
+
+    /**
+     * 获取全部属性 （追溯到所有顶级类）但不包括常量
+     * 
+     * @param object
+     * @return
+     */
+    public static List<Field> getDeclaredField(Object object) {
+        Class<?> clazz = object.getClass();
+        return getDeclaredField(clazz);
+    }
+
+    public static List<Field> getDeclaredField(Class<?> clazz) {
+		List<Field> fields = new ArrayList<Field>();
+        for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
+            for (Field field : clazz.getDeclaredFields()) {
+                switch (field.getModifiers()) {
+                case 24:
+                case 25:
+                case 26:
+                case 28:
+                    continue;
+                default:
+                    fields.add(field);
+                    break;
+                }
+            }
+        }
+        return fields;
+	}
+}

dsk-operate-ui/README.md

@@ -7,8 +7,8 @@ npm install
 npm run dev
 
 ## 页面
-### http://localhost:8088/login 登录页面
-### http://localhost:8088/index 首页
+### http://localhost:81/login 登录页面
+### http://localhost:81/index 首页
 
 
 ## 开发规范及注意事项
@@ -16,7 +16,7 @@ npm run dev
 
 2* 所有图片文件均放在src/assets/images文件夹下，图片命名规范：（1）直接小写（2）驼峰命名（3）带下划线，三种均可。公用图片直接放在images下，单独栏目板块下的图片要单独建文件夹存放。
 
-3* svg栏目图标统一存放位置：src/icons/svg。
+3* svg栏目图标统一存放位置：src/assets/icons/svg。
 
 4* 组件引用：公用组件存放目录src/components;单独引用的组件存放目录可在页面同级目录下建component文件夹存。
 

dsk-operate-ui/src/assets/styles/index.scss

@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 16px;
 }
 
 .components-container {
@@ -180,3 +180,379 @@ aside {
     margin-bottom: 10px;
   }
 }
+
+// 自定义全局样式
+.flex-box {
+  display: flex !important;
+  flex-direction: row;
+  align-items: center;
+}
+
+.a-link{
+  color: #0081FF;
+  &:hover{
+    color: #0081FF;
+    text-decoration: underline;
+  }
+}
+
+.text-cl1{
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+ul, li {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.app-main{
+  background-color: #f5f5f5;
+}
+.app-container {
+  margin: 12px 24px;
+  background-color: #f5f5f5;
+  .el-input__inner{
+    border-color: #D9D9D9;
+    color: #232323;
+    &::placeholder {
+      color: rgba(35,35,35,0.5);
+    }
+  }
+  .el-select .el-input .el-select__caret{
+    color: #232323;
+  }
+  .query-box{
+    justify-content: space-between;
+  }
+  .query-params {
+    .form-content-width {
+      width: 160px;
+    }
+    .el-form{
+      &.el-form--inline .el-form-item{
+        margin-right: 16px;
+      }
+      .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+        margin-bottom: 8px;
+        margin-top: 8px;
+      }
+    }
+  }
+  .query-ability{
+    span{
+      font-size: 14px;
+      color: #232323;
+      line-height: initial;
+      margin-left: 20px;
+      cursor: pointer;
+      &:hover{
+        color: #0081FF;
+      }
+      &:first-child{
+        margin-left: 0;
+      }
+      img{
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+      }
+    }
+  }
+}
+
+.container-box {
+  padding: 16px;
+}
+
+.table-item{
+  width: 100%;
+  .el-table{
+    font-size: 12px;
+    color: #232323;
+    .cell{
+      padding-right: 12px !important;
+      padding-left: 12px !important;
+      line-height: 18px;
+    }
+    thead{
+      color: rgba(35,35,35,0.7);
+    }
+    .sort-caret.ascending{
+      border-bottom-color: rgba(0,129,255,0.5);
+    }
+    .ascending .sort-caret.ascending{
+      border-bottom-color: #0081FF;
+    }
+    .sort-caret.descending{
+      border-top-color: rgba(0,129,255,0.5);
+    }
+    .descending .sort-caret.descending{
+      border-top-color: #0081FF;
+    }
+    .el-table__header-wrapper{
+      th{
+        background: #F0F3FA;
+        text-align: left;
+      }
+    }
+    .el-table__body-wrapper{
+      &::-webkit-scrollbar {
+        width: 16px; //竖轴宽度
+        height: 16px; //横轴宽度
+      }
+      &::-webkit-scrollbar-track {
+        background-color: #F3F4F5;
+        border-radius: 0;
+      }
+      &::-webkit-scrollbar-thumb {
+        background-color: rgba(98,110,126,0.2);
+        border: 4px solid #F3F4F5;
+        border-radius: 10px;
+      }
+      &::-webkit-scrollbar-corner {
+        background: #F3F4F5;
+        /*border-left: 1px solid #E0EAF2;*/
+      }
+      tr{
+        &.current-row>td{
+          background-color: initial;
+        }
+        &:nth-child(2n) {
+          background: #F8FBFF;
+        }
+      }
+    }
+  }
+}
+
+.common-title{
+  font-size: 16px;
+  color: #232323;
+  font-weight: 700;
+  line-height: 0.9;
+  position: relative;
+  padding: 0 0 0 8px;
+  &:before{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 2px;
+    height: 14px;
+    background: #445781;
+    content:"";
+  }
+}
+
+.pagination-box{
+  text-align: right;
+  padding: 16px 0;
+  .el-pagination{
+    font-weight: normal;
+    padding: 0;
+    button, span:not([class*=suffix]){
+      height: 24px;
+      line-height: 24px;
+    }
+    &.is-background .btn-next,
+    &.is-background .btn-prev,
+    &.is-background .el-pager li{
+      height: 24px;
+      line-height: 24px;
+      min-width: 24px;
+      padding: 0 6px;
+      margin: 0 4px;
+      font-size: 12px;
+      color: rgba(35,35,35,0.7);
+      background-color: #F3F4F5;
+    }
+    &.is-background .el-pager li:not(.disabled):hover{
+      background-color: rgba(0,129,255,0.3);
+      color: #FFFFFF;
+    }
+    &.is-background{
+      .el-pager{
+        li:not(.disabled){
+          &.active{
+            background-color: $systemColor;
+            color: #FFFFFF;
+          }
+        }
+      }
+      .el-pagination__jump{
+        margin-left: 8px;
+        color: #3D3D3D;
+        .el-input{
+          font-size: 12px;
+        }
+        .el-pagination__editor{
+          height: 24px;
+          margin: 0 8px;
+        }
+        .el-pagination__editor.el-input .el-input__inner{
+          height: 24px;
+          border-color: #CDD1D9;
+          border-radius: 2px;
+        }
+      }
+    }
+  }
+}
+
+.el-drawer{
+  .el-drawer__header{
+    padding: 16px 2px 16px 16px;
+    margin-bottom: 0;
+    border-bottom: 1px solid #E1E1E1;
+  }
+  .el-drawer__body{
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 16px; //竖轴宽度
+      height: 16px; //横轴宽度
+    }
+    &::-webkit-scrollbar-track {
+      background-color: #F3F4F5;
+      border-radius: 0;
+    }
+    &::-webkit-scrollbar-thumb {
+      background-color: rgba(98,110,126,0.2);
+      border: 4px solid #F3F4F5;
+      border-radius: 10px;
+    }
+    &::-webkit-scrollbar-corner {
+      background: #F3F4F5;
+      /*border-left: 1px solid #E0EAF2;*/
+    }
+  }
+}
+
+//组件公用样式
+//
+// 无边框、阴影card
+.el-card.noborder{
+  border-color: #f5f5f5;
+  box-shadow: none;
+  margin-bottom: 12px;
+  .el-card__body{
+    padding: 0;
+  }
+}
+//el-tabs
+.tabpane{
+  &.w100{
+    .el-tabs__nav-scroll{
+      padding-left: 16px;
+    }
+    .el-tabs__content{
+      padding: 16px;
+    }
+  }
+  .el-tabs__header{
+    margin: 0;
+  }
+  .el-tabs__nav-wrap::after{
+    background-color: #EFEFEF;
+    height: 1px;
+  }
+  .el-tabs__item{
+    font-size: 16px;
+    color: #232323;
+    line-height: 50px;
+    height: 50px;
+  }
+  .is-active{
+    color: #0081FF;
+    font-weight: bold;
+  }
+}
+//按钮
+.btn{
+  margin-left: 8px;
+  border-radius: 4px;
+  display: inline-block;
+  font-size: 14px;
+  cursor: pointer;
+  text-align: center;
+  &.h28 {
+    height: 28px;
+    padding: 0 10px;
+  }
+  &.h32 {
+    height: 32px;
+    padding: 0 16px;
+  }
+  &.h34{
+    width: 80px;
+    height: 34px;
+  }
+  .img{
+    height: 100%;
+    float: left;
+    width: 16px;
+  }
+}
+.btn_default{
+  border: 1px solid #0081FF;
+  color: #0081FF;
+  &.h28{
+    line-height: 26px;
+  }
+  &.h32 {
+    line-height: 30px;
+  }
+  &.h34{
+    line-height: 32px;
+  }
+  &:hover{
+    color: #006AD1;
+    border-color: #006AD1;
+  }
+}
+.btn_primary{
+  background-color: #0081FF;
+  color: #fff;
+  &.h28{
+    line-height: 28px;
+  }
+  &.h32{
+    line-height: 32px;
+  }
+  &.h34{
+    line-height: 34px;
+  }
+  &:hover{
+    background-color: #006AD1;
+  }
+}
+//搜索框
+.searchInput{
+  width: 590px;
+  height: 34px;
+  border-radius: 2px 0px 0px 2px;
+  opacity: 1;
+  border: 1px solid #EFEFEF;
+  position: relative;
+  overflow: hidden;
+  .el-input{
+    margin: -2px -1px;
+  }
+  .btn{
+    background: #F5F5F5;
+    color: #0081FF;
+    cursor: pointer;
+    width: 60px;
+    line-height: 32px;
+    height: 32px;
+    text-align: center;
+    position: absolute;
+    right: 0;
+    top: 0;
+    border-radius: 0;
+    &:hover{
+      color: #006AD1;
+    }
+  }
+}

dsk-operate-ui/src/assets/styles/variables.scss

@@ -44,6 +44,9 @@ $base-logo-light-title-color: #fff; // 对应base-logo-title-color
 
 $base-sidebar-width: 144px;
 
+//系统默认颜色
+$systemColor:#0081FF;
+
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
@@ -56,5 +59,6 @@ $base-sidebar-width: 144px;
   subMenuHover: $base-sub-menu-hover;
   sideBarWidth: $base-sidebar-width;
   logoTitleColor: $base-logo-title-color;
-  logoLightTitleColor: $base-logo-light-title-color
+  logoLightTitleColor: $base-logo-light-title-color;
+  systemColor: $systemColor
 }

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -43,6 +43,7 @@ export default {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
     min-height: calc(100vh - 84px);
+    background: #F5F5F5;
   }
 
   .fixed-header + .app-main {

dsk-operate-ui/src/views/macro/financing/index.vue

 <template>
   <div class="app-container">
-    区域融资
+    <div>
+      专项债项目
+    </div>
+    <div>
+      项目明细
+    </div>
   </div>
 </template>
 

dsk-operate-ui/src/views/macro/nationalEconomies/index.vue

 <template>
-  <div class="app-container container-box">
+  <div class="app-container container-box nationalEconomies">
     <div class="flex-box query-box">
       <div class="flex-box query-params">
         <span class="common-title">全国经济大全</span>
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
           <el-form-item prop="year">
-            <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="querySubmit">
+            <el-select v-model="queryParams.year" filterable multiple collapse-tags class="form-content-width" placeholder="请选择年度" @change="querySubmit">
               <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item prop="area">
-            <el-select v-model="queryParams.area" filterable class="form-content-width" placeholder="请选择地区" @change="querySubmit">
-              <el-option v-for="(item, index) in areaOptions" :key="index" :label="item.name" :value="item.value" />
-            </el-select>
+            <el-cascader
+              ref="address"
+              :options="addressList"
+              :props="props"
+              v-model="queryParams.address"
+              @change="querySubmit"
+              placeholder="地区选择"
+              collapse-tags
+              clearable></el-cascader>
           </el-form-item>
         </el-form>
       </div>
@@ -30,35 +36,63 @@
         fit
         highlight-current-row
       >
-        <el-table-column label="序号" width="50" align="left">
+        <el-table-column label="序号" width="50" align="left" fixed>
           <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
         </el-table-column>
-        <el-table-column label="地区" min-width="70" align="left">
+        <el-table-column label="地区" min-width="60" align="left" fixed>
           <template slot-scope="scope">
             <router-link to="" tag="a" class="a-link">{{ scope.row.address || '广东省' }}</router-link>
           </template>
         </el-table-column>
-        <el-table-column label="年度明细" prop="dataId" width="100" align="left">
+        <el-table-column label="年度明细" prop="dataId" width="90" align="left" fixed>
           <template slot-scope="scope">
             <img src="@/assets/images/icon_detailed.png" class="icon-detailed" @click="handleDetail(scope.row)">
           </template>
         </el-table-column>
-        <el-table-column label="GDP（元）" prop="dataId" sortable min-width="120" align="right" />
-        <el-table-column label="GDP增速" prop="cgrdm" min-width="90" align="right" />
-        <el-table-column label="人均GDP（元）" prop="cgrssqy" min-width="130" align="right" />
-        <el-table-column label="固定资产投资（亿元）" prop="cgrzyhy" min-width="130" align="right" />
-        <el-table-column label="金融机构存款余额-本外币（亿元）" prop="cgzzxs" min-width="160" align="right" />
-        <el-table-column label="一般公共预算收入 (亿元)" prop="cgfs" width="130" align="left" />
-        <el-table-column label="一般公共预算收入增速" width="140" align="left">
+        <el-table-column label="GDP（元）" prop="dataId" sortable min-width="115" align="right" />
+        <el-table-column label="GDP增速" prop="cgrdm" sortable min-width="100" align="right" />
+        <el-table-column label="人均GDP（元）" prop="cgrssqy" sortable width="125" align="right" />
+        <el-table-column label="人口（万人）" prop="cgrssqy" sortable width="120" align="right" />
+        <el-table-column label="一般公共预算收入 (亿元)" prop="cgrzyhy" sortable width="170" align="right" />
+        <el-table-column label="一般公共预算收入增速（%）" prop="cgzzxs" sortable min-width="140" align="right" />
+        <el-table-column label="一般公共预算支出（亿元）" prop="cgfs" sortable width="140" align="left" />
+        <el-table-column label="政府性基金收入（亿元）" width="140" sortable align="left">
           <template slot-scope="scope">
             <router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>
           </template>
         </el-table-column>
-        <el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
-        <el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
-        <el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
-        <el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
-        <el-table-column label="一般公共预算收入：税收收入" prop="cgfs" width="150" align="left" />
+        <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="cgfs" sortable width="150" align="left" />
+        <el-table-column label="政府性基金支出（亿元）" prop="cgfs" width="170" sortable align="left" />
+        <el-table-column label="国有资产经营收入（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="国有资产经营支出（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="固定资产投资（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="财政自给率（%）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="地方政府债务余额（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="一般债余额（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="专项债余额（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="地方政府债务限额（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="城投平台有息债务？？（亿元）" prop="cgfs" width="160" align="left" >
+          <!--<template slot="header" slot-scope="scope">-->
+            <!--<el-input-->
+              <!--v-model="search"-->
+              <!--size="mini"-->
+              <!--placeholder="输入关键字搜索"/>-->
+          <!--</template>-->
+        </el-table-column>
+        <el-table-column label="负债率（%）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="负债率（宽口径）（%）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="债务率（%）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="债务率（宽口径）（%）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="金融机构存款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="金融机构贷款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="第一产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="第二产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="第三产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="工业增加值（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="工业总产值（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="进出口总额（亿美元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="社会消费品零售总额（亿元）" prop="cgfs" width="160" align="left" />
+        <el-table-column label="城镇居民人均可支配收入（元）" prop="cgfs" width="160" align="left" />
       </el-table>
     </div>
     <div class="pagination-box">
@@ -70,8 +104,9 @@
 
 <script>
 import { browsedIndexPage } from '@/api/nationalEconomies'
+import dataRegion from '@/assets/json/dataRegion'
 import economiesDetail from './component/economies-detail'
-
+import axios from 'axios'
 export default {
   name: 'NationalEconomies',
   components: {
@@ -81,16 +116,18 @@ export default {
     return {
       queryParams: {
         year: '',
-        area: ''
+        address: ''
       },
       yearOptions: [
-        { name: '2022年', value: '0' },
-        { name: '2023年', value: '1' }
-      ],
-      areaOptions: [
-        { name: '重庆', value: '0' },
-        { name: '四川', value: '1' }
+        { name: '2023年', value: '2023' },
+        { name: '2022年', value: '2022' },
+        { name: '2021年', value: '2021' },
       ],
+      props: {
+        value: 'id',
+        multiple: true,
+      },
+      addressList: [],
       tableData: [],
       tableLoading: false,
       pageIndex: 1,
@@ -100,20 +137,100 @@ export default {
   },
   created() {
     this.querySubmit()
+    this.dataRegion()
   },
   methods: {
+    //地区
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+      var str = [];
+      for (let x = 0; x < 3; x++) {
+        for (let i = 0; i < dataRegion.length; i++) {
+          if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+            str.push({
+              'id': dataRegion[i].id,
+              "label": dataRegion[i].regionName,
+              "short": dataRegion[i].short,
+              "value": dataRegion[i].parentId,
+              "children": []
+            });
+          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+            for (let j = 0; j < str.length; j++) {
+              if (str[j].id == dataRegion[i].parentId) {
+                str[j].children.push({
+                  'id': dataRegion[i].id,
+                  "label": dataRegion[i].regionName,
+                  "short": dataRegion[i].short,
+                  "value": dataRegion[i].parentId,
+                  "children": []
+                });
+              }
+            }
+          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+            for (let j = 0; j < str.length; j++) {
+              for (let k = 0; k < str[j].children.length; k++) {
+                if (str[j].children[k].id == dataRegion[i].parentId) {
+                  str[j].children[k].children.push({
+                    'id': dataRegion[i].id,
+                    "label": dataRegion[i].regionName,
+                    "short": dataRegion[i].short,
+                    "value": dataRegion[i].parentId
+                    // "children":[]
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+      this.addressList = str;
+    },
     // 查询提交
     async querySubmit() {
-      this.tableLoading = true
+      // this.tableLoading = true
       const params = { pageIndex: this.pageIndex, pageSize: this.pageSize, browsedType: 1 }
-      browsedIndexPage(params).then(res => {
-        this.tableData = res.data.list
-        this.tableDataTotal = res.data.totalCount
-      })
-      // 延迟关闭加载效果
-      setTimeout(() => {
-        this.tableLoading = false
-      }, 200)
+
+      if(this.queryParams.address){
+        let arr = this.$refs.address.getCheckedNodes();
+        let provinceCode = [],cityCode = [],countyCode = [];
+        for (var i in arr) {
+          if (arr[i].parent) {
+            if (!arr[i].parent.checked) {
+              arr[i].hasChildren && cityCode.push(arr[i].value);
+              !arr[i].hasChildren && countyCode.push(arr[i].value);
+            }
+          } else {
+            provinceCode.push(arr[i].value)
+          }
+        }
+        if(provinceCode.length > 0){
+          params.procinceId=provinceCode.join(',')
+        }
+        if(cityCode.length > 0){
+          params.cityId=cityCode.join(',')
+        }
+        if(countyCode.length > 0){
+          params.districtId=countyCode.join(',')
+        }
+      }
+      console.log(params)
+
+      // browsedIndexPage(params).then(res => {
+      //   this.tableData = res.data.list
+      //   this.tableDataTotal = res.data.totalCount
+      // })
+      // // 延迟关闭加载效果
+      // setTimeout(() => {
+      //   this.tableLoading = false
+      // }, 200)
     },
     // 明细
     handleDetail(row) {
@@ -148,4 +265,33 @@ export default {
     height: 16px;
     cursor: pointer;
   }
+
+  .nationalEconomies{
+    .table-item{
+      ::v-deep .el-table{
+        th{
+          font-size: 12px !important;
+          font-weight: 400 !important;
+        }
+        .el-table__fixed-header-wrapper th{
+          background: #F0F3FA;
+        }
+        .cell{
+          position: relative;
+        }
+        .caret-wrapper{
+          width: 10px;
+          /*<!--position: absolute;-->*/
+          /*<!--right: 12px;-->*/
+          /*<!--top: -3px;-->*/
+        }
+        /*.sort-caret{*/
+          /*position: initial;*/
+        /*}*/
+        /*.ascending{*/
+          /*margin-bottom: 3px;*/
+        /*}*/
+      }
+    }
+  }
 </style>

dsk-operate-ui/src/views/project/projectList/index.vue

 <template>
   <div class="app-container">
-    商机列表
+    <el-card class="box-card noborder nopad">
+      <div class="btns">
+        <div class="btn btn_default h28"><div class="img img1"></div>新建项目商机</div>
+        <div class="btn btn_primary h28"><div class="img img2"></div>批量导出</div>
+      </div>
+      <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane w100">
+        <el-tab-pane label="我参与的项目" name="first">
+          <div class="searchInput">
+            <el-input type="text" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
+            <div class="btn">搜索</div>
+          </div>
+          <div class="sellist">
+            <div class="selli">
+              <span>
+              地区团队
+              </span>aaa
+            </div>
+            <div class="selli">
+              <span>
+              项目信息
+              </span>aaa
+            </div>
+          </div>
+          <div class="scbtns">
+            <div class="btn btn_primary h34">查询</div>
+            <div class="btn btn_default h34">重置</div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="公司全部项目" name="second">配置管理</el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+    <el-card class="box-card noborder">
+
+    </el-card>
   </div>
 </template>
 
 <script>
+  // import "@/assets/styles/index.scss"
 export default {
   name: 'ProjectList',
   data() {
     return {
+      activeName:'first',
     }
   },
   created() {
@@ -19,5 +55,49 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+  .app-container{
+    padding: 0;
+  }
+  .noborder{
+    position: relative;
+  }
+  .btns{
+    position: absolute;
+    top: 11px;
+    right: 12px;
+    z-index: 2;
+    .img.img1{
+      background: url('../../../../src/assets/images/add.png')no-repeat center center;
+    }
+    .btn_default:hover{
+      .img1{
+        background: url('../../../../src/assets/images/add_1.png')no-repeat center center;
+      }
+    }
+    .img.img2{
+      background: url('../../../../src/assets/images/import.png')no-repeat center center;
+    }
+  }
+  .scbtns{
+    border-top: 1px solid #EFEFEF;
+    padding: 24px 0 8px;
+    .btn{
+      margin: 0 16px 0 0;
+    }
+  }
+  .sellist{
+    width: 100%;
+    padding: 10px 0;
+    .selli{
+      width: 100%;
+      height: 34px;
+      line-height: 34px;
+      font-size: 14px;
+      color: #232323;
+      >span{
+        float: left;
+        margin-right: 28px;
+      }
+    }
+  }
 </style>

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

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户信息表(Customer)实体类
+ *
+ * @author makejava
+ * @since 2023-05-16 09:27:55
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("customer")
+public class Customer implements Serializable {
+    private static final long serialVersionUID = 824383302173350532L;
+
+    @TableId(value = "customer_id",type = IdType.ASSIGN_UUID)
+    private String customerId;
+    /**
+     * jsk企业id
+     */
+    private Integer companyId;
+    /**
+     * 客户名称（企业名称）
+     */
+    private String companyName;
+    /**
+     * 法定代表人
+     */
+    private String legalPerson;
+    /**
+     * 注册资本(字符串)
+     */
+    private String registerCapitalStr;
+    /**
+     * 注册资本
+     */
+    private Double registerCapital;
+    /**
+     * 企业性质（company_nature_type）
+     */
+    private String companyNature;
+    /**
+     * 企业级别（company_level_type）
+     */
+    private String companyLevel;
+    /**
+     * 信用等级（credit_level_type）
+     */
+    private String creditLevel;
+    /**
+     * 上级公司（控股单位）
+     */
+    private String superCompany;
+    /**
+     * 是否上市 0：否 1：是
+     */
+    private Integer isOn;
+    /**
+     * 是否主要客户 0：否 1：是
+     */
+    private Integer isMajor;
+    /**
+     * 发包属性
+     */
+    private String companyAttribute;
+    /**
+     * 主要业务
+     */
+    private String mainBusiness;
+    /**
+     * 经营范围
+     */
+    private String businessScope;
+    /**
+     * 商务条件特点
+     */
+    private String businessCharacteristic;
+    /**
+     * 决策链条
+     */
+    private String decisionChain;
+    /**
+     * 招投标流程特点
+     */
+    private String bidCharacteristic;
+    /**
+     * 履约阶段特点
+     */
+    private String performanceCharacteristic;
+    /**
+     * 其它管理体系特点
+     */
+    private String otherMsCharacteistic;
+    /**
+     * 最后跟进时间
+     */
+    private Date lastFollowTime;
+
+    private Long createId;
+
+    private Date createTime;
+
+    private Long updateId;
+
+    private Date updateTime;
+
+
+}

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

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户决策链条(CustomerDecisionChain)实体类
+ *
+ * @author makejava
+ * @since 2023-05-16 15:33:45
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("customer_decision_chain")
+public class CustomerDecisionChain implements Serializable {
+    private static final long serialVersionUID = 990085082282249053L;
+
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    /**
+     * 客户id
+     */
+    private String customerId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 角色
+     */
+    private String role;
+    /**
+     * 公司/机关（工作单位）
+     */
+    private String workUnit;
+    /**
+     * 职位
+     */
+    private String position;
+    /**
+     * 联系方式
+     */
+    private String contactInformation;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Date createTime;
+
+    private Long updateId;
+
+    private Date updateTime;
+
+
+}

dsk-system/src/main/java/com/dsk/system/domain/dto/CustomerDecisionChainSearchDto.java

+package com.dsk.system.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author lcl
+ * @create 2023/5/16
+ */
+@Data
+public class CustomerDecisionChainSearchDto {
+    /**
+     * 客户id
+     */
+    private String customerId;
+}

dsk-system/src/main/java/com/dsk/system/mapper/CustomerDecisionChainMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.CustomerDecisionChain;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 客户决策链条(CustomerDecisionChain)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-05-16 15:33:46
+ */
+@Mapper
+public interface CustomerDecisionChainMapper extends BaseMapper<CustomerDecisionChain> {
+
+}
+

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.Customer;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 客户信息表(Customer)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-05-16 09:28:00
+ */
+@Mapper
+public interface CustomerMapper extends BaseMapper<Customer> {
+
+}
+

dsk-system/src/main/java/com/dsk/system/service/ICustomerDecisionChainService.java

+package com.dsk.system.service;
+
+import com.dsk.system.domain.CustomerDecisionChain;
+import com.dsk.system.domain.dto.CustomerDecisionChainSearchDto;
+
+import java.util.List;
+
+/**
+ * 客户决策链条(CustomerDecisionChain)表服务接口
+ *
+ * @author makejava
+ * @since 2023-05-16 15:33:45
+ */
+public interface ICustomerDecisionChainService {
+
+    /**
+     * 查询数据列表
+     */
+    List<CustomerDecisionChain> selectList(CustomerDecisionChainSearchDto dto);
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    CustomerDecisionChain selectById(Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param customerDecisionChain 实例对象
+     * @return 实例对象
+     */
+    boolean insert(CustomerDecisionChain customerDecisionChain);
+
+    /**
+     * 修改数据
+     *
+     * @param customerDecisionChain 实例对象
+     * @return 实例对象
+     */
+    boolean update(CustomerDecisionChain customerDecisionChain);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    boolean deleteById(Long id);
+
+}

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

+package com.dsk.system.service;
+
+
+import com.dsk.system.domain.Customer;
+
+import java.util.List;
+
+/**
+ * 客户信息表(Customer)表服务接口
+ *
+ * @author makejava
+ * @since 2023-05-16 09:28:00
+ */
+public interface ICustomerService {
+
+}

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerDecisionChainServiceImpl.java

+package com.dsk.system.service.impl;
+
+import cn.hutool.core.bean.BeanException;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.utils.SecurityUtils;
+import com.dsk.system.domain.CustomerDecisionChain;
+import com.dsk.system.domain.dto.CustomerDecisionChainSearchDto;
+import com.dsk.system.mapper.CustomerDecisionChainMapper;
+import com.dsk.system.service.ICustomerDecisionChainService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 客户决策链条(CustomerDecisionChain)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-05-16 15:33:45
+ */
+@Slf4j
+@Service
+public class CustomerDecisionChainServiceImpl implements ICustomerDecisionChainService {
+    @Resource
+    private CustomerDecisionChainMapper baseMapper;
+
+    @Override
+    public List<CustomerDecisionChain> selectList(CustomerDecisionChainSearchDto dto) {
+        return baseMapper.selectList(Wrappers.<CustomerDecisionChain>lambdaQuery()
+                .eq(CustomerDecisionChain::getCustomerId,dto.getCustomerId()));
+    }
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @Override
+    public CustomerDecisionChain selectById(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param customerDecisionChain 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public boolean insert(CustomerDecisionChain customerDecisionChain) {
+        verifyParameter(customerDecisionChain);
+        return baseMapper.insert(customerDecisionChain) > 0;
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param customerDecisionChain 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public boolean update(CustomerDecisionChain customerDecisionChain) {
+        if(ObjectUtils.isEmpty(customerDecisionChain.getId())) throw new BeanException("id不能为空！");
+        verifyParameter(customerDecisionChain);
+        return baseMapper.updateById(customerDecisionChain) > 0;
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @Override
+    public boolean deleteById(Long id) {
+        return baseMapper.deleteById(id) > 0;
+    }
+
+    /**
+     * 参数验证
+     * @param customerDecisionChain
+     */
+    private void verifyParameter(CustomerDecisionChain customerDecisionChain){
+        if(ObjectUtils.isEmpty(customerDecisionChain.getCustomerId())) throw new BeanException("客户id不能为空！");
+        customerDecisionChain.setUpdateId(SecurityUtils.getUserId());
+    }
+}

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

+package com.dsk.system.service.impl;
+
+import com.dsk.system.mapper.CustomerMapper;
+import com.dsk.system.service.ICustomerService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 客户信息表(Customer)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-05-16 09:27:57
+ */
+@Service
+public class CustomerServiceImpl implements ICustomerService {
+
+    @Resource
+    private CustomerMapper customerMapper;
+
+}

dsk-system/src/main/resources/mapper/CustomerDecisionChainMapper.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.system.mapper.CustomerDecisionChainMapper">
+
+    <resultMap type="com.dsk.system.domain.CustomerDecisionChain" id="CustomerDecisionChainMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="customerId" column="customer_id" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="role" column="role" jdbcType="VARCHAR"/>
+        <result property="workUnit" column="work_unit" jdbcType="VARCHAR"/>
+        <result property="position" column="position" jdbcType="VARCHAR"/>
+        <result property="contactInformation" column="contact_information" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateId" column="update_id" jdbcType="INTEGER"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+
+</mapper>
+

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.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.system.mapper.CustomerMapper">
+
+
+</mapper>
+

pom.xml

@@ -29,7 +29,7 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.20</lombok.version>
         <hutool-all.version>5.8.0</hutool-all.version>
         <dsk-openapi-sdk.version>2.1.0</dsk-openapi-sdk.version>
     </properties>
@@ -178,11 +178,16 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-extension</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
-                <scope>provided</scope>
             </dependency>
 
         </dependencies>