Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

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

@@ -4,7 +4,6 @@ package com.dsk.cscec.controller;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.R;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.service.IDimAreaService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,7 +39,7 @@ public class DimAreaController extends BaseController {
      * 获取地区树(不含区域)
      */
     @GetMapping("/all/withoutRegion")
-    public R<List<RegionWithLevelVo>> allAreaWithoutRegion(){
+    public R<List<RegionVo>> allAreaWithoutRegion(){
         return R.ok(baseService.allAreaWithoutRegion());
     }
 }

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

@@ -39,6 +39,10 @@ public class AdvisoryBodyBo extends BaseEntity {
      * 项目承接单位
      */
     private String contractOrgName;
+    /**
+     * 区域
+     */
+    private List<String> area;
     /**
      * 省份
      */

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

@@ -112,8 +112,8 @@ public class AdvisoryBodyVo {
     private String contractOrgName;
 
     /**
-     * 创建时间
+     * 创建时间/合同生效(盖章)日期
      */
     @ExcelProperty(value = "创建时间", index = 13)
-    private Date loadTime;
+    private Date contractSignDate;
 }

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

@@ -15,4 +15,6 @@ public class RegionVo {
 
     List<RegionVo> children;
 
+    Integer childrenLength;
+
 }

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

-package com.dsk.cscec.domain.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Author sxk
- * @Data 2023/12/13 14:14
- */
-@Data
-public class RegionWithLevelVo {
-    String level;
-    String value;
-    List<RegionWithLevelVo> children;
-    Integer childrenLength;
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/entity/AdvisoryBodyCustomForm.java

+package com.dsk.cscec.entity;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)实体类
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:43
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 385050456847400745L;
+    /**
+     * 项目主键
+     */
+    private Long projectKey;
+    /**
+     * 咨询机构ID
+     */
+    private Long advisoryBodyId;
+    /**
+     * json数据
+     */
+    private String jsonData;
+}

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

+package com.dsk.cscec.mapper;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表数据库访问层
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:37
+ */
+public interface AdvisoryBodyCustomFormMapper {
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务接口
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:44
+ */
+public interface AdvisoryBodyCustomFormService {
+
+}

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

@@ -3,7 +3,6 @@ package com.dsk.cscec.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 
 import java.util.List;
 
@@ -18,7 +17,7 @@ public interface IDimAreaService extends IService<DimArea> {
 
     List<RegionVo> allArea();
 
-    List<RegionWithLevelVo> allAreaWithoutRegion();
+    List<RegionVo> allAreaWithoutRegion();
 
 }
 

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

+package com.dsk.cscec.service.impl;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper;
+import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+
+import javax.annotation.Resource;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务实现类
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:44
+ */
+@Service("advisoryBodyCustomFormService")
+public class AdvisoryBodyCustomFormServiceImpl implements AdvisoryBodyCustomFormService {
+    @Resource
+    private AdvisoryBodyCustomFormMapper advisoryBodyCustomFormMapper;
+
+
+}

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.mapper.DimAreaMapper;
 import com.dsk.cscec.service.IDimAreaService;
 import com.dsk.system.service.ISysDictTypeService;
@@ -67,6 +66,7 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
                             }
                         }
                         provinceVo.setChildren(cityVos);
+                        provinceVo.setChildrenLength(provinceVo.getChildren().size());
                         provinceVos.add(provinceVo);
                     }
                 }
@@ -78,8 +78,8 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
     }
 
     @Override
-    public List<RegionWithLevelVo> allAreaWithoutRegion() {
-        List<RegionWithLevelVo> vos = new ArrayList<>();
+    public List<RegionVo> allAreaWithoutRegion() {
+        List<RegionVo> vos = new ArrayList<>();
         //区域
         List<SysDictData> sysDictData = sysDictTypeService.selectDictDataByType(AREA_TYPE);
         if(CollectionUtils.isNotEmpty(sysDictData)){
@@ -93,10 +93,9 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
 
                 if(CollectionUtils.isNotEmpty(provinces)){
                     for (Object province : provinces) {
-                        RegionWithLevelVo provinceVo = new RegionWithLevelVo();
+                        RegionVo provinceVo = new RegionVo();
                         provinceVo.setValue(String.valueOf(province));
-                        provinceVo.setLevel("1");
-                        List<RegionWithLevelVo> cityVos = new ArrayList<>();
+                        List<RegionVo> cityVos = new ArrayList<>();
                         //市
                         List<Object> citys = baseMapper.selectObjs(Wrappers.<DimArea>lambdaQuery()
                                 .select(DimArea::getAreaName3)
@@ -105,9 +104,8 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
                                 .groupBy(DimArea::getAreaName3));
                         if(CollectionUtils.isNotEmpty(citys)){
                             for (Object city : citys) {
-                                RegionWithLevelVo cityVo = new RegionWithLevelVo();
+                                RegionVo cityVo = new RegionVo();
                                 cityVo.setValue(String.valueOf(city));
-                                cityVo.setLevel("2");
                                 cityVos.add(cityVo);
                             }
                         }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java

 package com.dsk.jsk.controller;
 
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.jsk.domain.JskCompanyRelationTableV1Dto;
 import com.dsk.jsk.service.CompanyRelationTableV1Service;
@@ -48,4 +49,16 @@ public class CompanyRelationTableV1Controller {
     public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
         return relationTableV1Service.detailPage(dto);
     }
+
+    /***
+     *@Description: -分页列表-下拉
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/pageSelect")
+    public R pageSelect(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
+        return relationTableV1Service.pageSelect(dto);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java

 package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.jsk.domain.*;
 import com.dsk.system.utils.DskOpenApiUtil;
@@ -32,4 +33,16 @@ public class CompanyRelationTableV1Service {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
+
+    /***
+     *@Description: -分页列表-下拉
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    public R pageSelect(JskCompanyRelationTableV1Dto dto) throws Exception{
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/pageSelect", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper">
+
+
+</mapper>
+

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

@@ -14,7 +14,7 @@
         abp.project_leader_phone,
         ab.advisory_body_name,
         dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
-        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time
+        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
         from advisory_body_project abp
         left join advisory_body ab on ab.advisory_body_id = abp.advisory_body_id
         left join d_project dp on dp.project_key = abp.project_key
@@ -34,32 +34,31 @@
             <if test="bo.contractOrgName != null and bo.contractOrgName != ''">
                 and dp.contract_org_name = #{bo.contractOrgName}
             </if>
-            <if test="bo.province != null and bo.province.size > 0 and (bo.city == null or bo.city.size==0)">
-                and dp.province_name in
-                <foreach collection="bo.province" item="province" separator="," open="(" close=")">
-                    #{province}
+            <if test="bo.area != null and bo.area.size > 0 or (bo.province != null and bo.province.size > 0) or (bo.city != null and bo.city.size > 0)">
+                and
+                <trim prefix="(" suffix=")" prefixOverrides="or">
+                    <if test="bo.area != null and bo.area.size > 0 ">
+                        or dp.area_name in
+                        <foreach collection="bo.area" item="areaName" open="(" close=")" separator=",">
+                            #{areaName}
                         </foreach>
                     </if>
-            <if test="(bo.province == null or bo.province.size==0) and bo.city != null and bo.city.size > 0 ">
-                and dp.city_name in
-                <foreach collection="bo.city" item="city" separator="," open="(" close=")">
-                    #{city}
+                    <if test="bo.province != null and bo.province.size > 0 ">
+                        or dp.province_name in
+                        <foreach collection="bo.province" item="provinceName" open="(" close=")" separator=",">
+                            #{provinceName}
                         </foreach>
                     </if>
-            <if test="bo.province != null and bo.province.size > 0  and bo.city != null  and bo.city.size > 0 ">
-                and (
-                dp.province_name in
-                <foreach collection="bo.province" item="province" separator="," open="(" close=")">
-                    #{province}
-                </foreach>
+                    <if test="bo.city != null and bo.city.size > 0 ">
                         or dp.city_name in
-                <foreach collection="bo.city" item="city" separator="," open="(" close=")">
-                    #{city}
+                        <foreach collection="bo.city" item="cityName" open="(" close=")" separator=",">
+                            #{cityName}
                         </foreach>
-                )
+                    </if>
+                </trim>
             </if>
         </where>
-        order by dp.load_time desc
+        order by dp.contract_sign_date desc
     </select>
 
     <select id="selectAdvisoryBodyCidsByName" resultType="java.lang.Long">