Skip to content

D
dsk-operate-sys-cscec
Commit 23b6c610 authored by fulixin's avatar fulixin
Browse files
Options

表头修改后的及项目名称模糊查询等

parent 171e8cd9
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 63 deletions
dsk-admin/src/main/resources/application-test.yml
View file @ 23b6c610
...@@ -51,6 +51,7 @@ spring: ...@@ -51,6 +51,7 @@ spring:
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
# url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai # url: jdbc:mysql://111.204.34.146:63308/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://172.17.0.12:3306/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai url: jdbc:mysql://172.17.0.12:3306/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://1.94.207.134:3306/cscec_bms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
username: dev username: dev
password: DskSzh!456 password: DskSzh!456
# 从库数据源 # 从库数据源
...@@ -102,11 +103,14 @@ spring: ...@@ -102,11 +103,14 @@ spring:
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring: spring:
redis: redis:
# host: 111.204.34.146 # host: 120.46.64.239
host: 172.17.0.12
# 端口，默认为6379 # 端口，默认为6379
port: 6379 # port: 6379
# 数据库索引 # 数据库索引
# database: 6
# password: zfTFIJjaN#6xB83r
host: 172.17.0.12
database: 13 database: 13
# 密码 # 密码
password: DskSzhRedis!789 password: DskSzhRedis!789
...@@ -195,4 +199,4 @@ sa-token: ...@@ -195,4 +199,4 @@ sa-token:
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true is-concurrent: true
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: true is-share: true
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
View file @ 23b6c610
...@@ -41,7 +41,7 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -41,7 +41,7 @@ public class AdvisoryBodyManageController extends BaseController {
* 获取项目列表 * 获取项目列表
*/ */
@GetMapping("/getProjectList") @GetMapping("/getProjectList")
public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) { public TableDataInfo<ProjectSearchVo> getProjectList(@Validated ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
// return projectService.queryProjectList(projectSearchBo, pageQuery); // return projectService.queryProjectList(projectSearchBo, pageQuery);
return contractService.queryProjectList(projectSearchBo, pageQuery); return contractService.queryProjectList(projectSearchBo, pageQuery);
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CustomerInfoController.java
View file @ 23b6c610
...@@ -59,7 +59,7 @@ public class CustomerInfoController extends BaseController { ...@@ -59,7 +59,7 @@ public class CustomerInfoController extends BaseController {
* 内部合作-咨询机构合作记录 * 内部合作-咨询机构合作记录
*/ */
@GetMapping("/advisoryList") @GetMapping("/advisoryList")
public TableDataInfo<AdvisoryBodyVo> advisoryList(@RequestBody AdvisoryBodyBo bo, PageQuery query) { public TableDataInfo<AdvisoryBodyVo> advisoryList(@Validated AdvisoryBodyBo bo, PageQuery query) {
return iCustomerInfoService.queryAdvisoryList(bo, query); return iCustomerInfoService.queryAdvisoryList(bo, query);
} }
...@@ -67,7 +67,7 @@ public class CustomerInfoController extends BaseController { ...@@ -67,7 +67,7 @@ public class CustomerInfoController extends BaseController {
* 内部合作-咨询机构合作记录导出 * 内部合作-咨询机构合作记录导出
*/ */
@GetMapping("/advisoryExport") @GetMapping("/advisoryExport")
public void advisoryExport(@RequestBody AdvisoryBodyBo bo, PageQuery query, HttpServletResponse response) { public void advisoryExport(@Validated AdvisoryBodyBo bo, PageQuery query, HttpServletResponse response) {
List<AdvisoryBodyVo> listVo = iCustomerInfoService.queryAdvisoryList(bo, query).getRows(); List<AdvisoryBodyVo> listVo = iCustomerInfoService.queryAdvisoryList(bo, query).getRows();
ExcelUtil.exportExcel(listVo, "咨询机构合作记录", AdvisoryBodyVo.class, response); ExcelUtil.exportExcel(listVo, "咨询机构合作记录", AdvisoryBodyVo.class, response);
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditAdvisoryBodyInfoBo.java
View file @ 23b6c610
...@@ -107,4 +107,32 @@ public class EditAdvisoryBodyInfoBo { ...@@ -107,4 +107,32 @@ public class EditAdvisoryBodyInfoBo {
* 是否为终审单位（0代表是 1代表否） * 是否为终审单位（0代表是 1代表否）
*/ */
private String isFinalJudgeUnit; private String isFinalJudgeUnit;
/**
* 业主名称
*/
private String ownerName;
/**
* 项目经理及联系方式
*/
private String projectManagerAndPhone;
/**
* 商务经理及联系方式
*/
private String businessManagerAndPhone;
/**
* 招标代理单位
*/
private String bidAgencyUnit;
/**
* 一审单位
*/
private String firstAuditUnit;
/**
* 二审单位
*/
private String secondAuditUnit;
/**
* 三审单位
*/
private String thirdAuditUnit;
} }
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml
View file @ 23b6c610
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo"> <select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo">
select select
dp.project_name, dc.project_name,
dp.owner_name, dc.owner_name,
abp.project_manager_and_phone, abp.project_manager_and_phone,
abp.business_manager_and_phone, abp.business_manager_and_phone,
abp.bid_agency_unit, abp.bid_agency_unit,
...@@ -24,23 +24,23 @@ ...@@ -24,23 +24,23 @@
abp.project_key, abp.project_key,
abp.project_leader, abp.project_leader,
abp.project_leader_major, abp.project_leader_major,
abp.project_leader_phone, abp.project_leader_phone
ab.advisory_body_name, -- ab.advisory_body_name
dp.project_code, -- dc.project_code,
dp.province_name, -- dc.province_name,
dp.city_name, -- dc.city_name,
dp.isinvestproject, -- dc.isinvestproject,
dp.project_type1, -- dc.project_type1,
dp.project_type2, -- dc.project_type2,
dp.contract_value, -- dc.contract_value,
dp.contract_org_name, -- dc.contract_org_name,
dp.contract_sign_date -- dc.contract_sign_date
from advisory_body_project abp from advisory_body_project abp
left join advisory_body ab on ab.advisory_body_cid = abp.advisory_body_cid left join advisory_body ab on ab.advisory_body_cid = abp.advisory_body_cid
left join d_project dp on dp.project_key = abp.project_key left join d_contract dc on dc.contract_key = abp.project_key
<where> <where>
<if test="bo.projectName != null and bo.projectName != ''"> <if test="bo.projectName != null and bo.projectName != ''">
and dp.project_name like concat('%',#{bo.projectName},'%') and dc.project_name like concat('%',#{bo.projectName},'%')
</if> </if>
<if test="bo.advisoryBodyId != null and bo.advisoryBodyId != ''"> <if test="bo.advisoryBodyId != null and bo.advisoryBodyId != ''">
and ab.advisory_body_id = #{bo.advisoryBodyId} and ab.advisory_body_id = #{bo.advisoryBodyId}
...@@ -51,46 +51,46 @@ ...@@ -51,46 +51,46 @@
<if test="bo.advisoryBodyName != null and bo.advisoryBodyName != ''"> <if test="bo.advisoryBodyName != null and bo.advisoryBodyName != ''">
and ab.advisory_body_name = #{bo.advisoryBodyName} and ab.advisory_body_name = #{bo.advisoryBodyName}
</if> </if>
<if test="bo.contractOrgId != null and bo.contractOrgId != ''"> <!-- <if test="bo.contractOrgId != null and bo.contractOrgId != ''">-->
and dp.contract_org_id = #{bo.contractOrgId} <!-- and dp.contract_org_id = #{bo.contractOrgId}-->
</if> <!-- </if>-->
<if test="bo.contractOrgName != null and bo.contractOrgName != ''"> <!-- <if test="bo.contractOrgName != null and bo.contractOrgName != ''">-->
and dp.contract_org_name = #{bo.contractOrgName} <!-- and dp.contract_org_name = #{bo.contractOrgName}-->
</if> <!-- </if>-->
<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)"> <!-- <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 <!-- and-->
<trim prefix="(" suffix=")" prefixOverrides="or"> <!-- <trim prefix="(" suffix=")" prefixOverrides="or">-->
<if test="bo.area != null and bo.area.size > 0 "> <!-- <if test="bo.area != null and bo.area.size > 0 ">-->
or dp.area_name in <!-- or dp.area_name in-->
<foreach collection="bo.area" item="areaName" open="(" close=")" separator=","> <!-- <foreach collection="bo.area" item="areaName" open="(" close=")" separator=",">-->
#{areaName} <!-- #{areaName}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="bo.province != null and bo.province.size > 0 "> <!-- <if test="bo.province != null and bo.province.size > 0 ">-->
or dp.province_name in <!-- or dp.province_name in-->
<foreach collection="bo.province" item="provinceName" open="(" close=")" separator=","> <!-- <foreach collection="bo.province" item="provinceName" open="(" close=")" separator=",">-->
#{provinceName} <!-- #{provinceName}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="bo.city != null and bo.city.size > 0 "> <!-- <if test="bo.city != null and bo.city.size > 0 ">-->
or dp.city_name in <!-- or dp.city_name in-->
<foreach collection="bo.city" item="cityName" open="(" close=")" separator=","> <!-- <foreach collection="bo.city" item="cityName" open="(" close=")" separator=",">-->
#{cityName} <!-- #{cityName}-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
</trim> <!-- </trim>-->
</if> <!-- </if>-->
<if test="bo.isinvestproject != null and bo.isinvestproject != ''"> <!-- <if test="bo.isinvestproject != null and bo.isinvestproject != ''">-->
and dp.isinvestproject = #{bo.isinvestproject} <!-- and dp.isinvestproject = #{bo.isinvestproject}-->
</if> <!-- </if>-->
<if test="bo.projectType1 != null and bo.projectType1 != ''"> <!-- <if test="bo.projectType1 != null and bo.projectType1 != ''">-->
and dp.project_type1 = #{bo.projectType1} <!-- and dp.project_type1 = #{bo.projectType1}-->
</if> <!-- </if>-->
<if test="bo.projectType2 != null and bo.projectType2 != ''"> <!-- <if test="bo.projectType2 != null and bo.projectType2 != ''">-->
and dp.project_type2 = #{bo.projectType2} <!-- and dp.project_type2 = #{bo.projectType2}-->
</if> <!-- </if>-->
</where> </where>
order by dp.contract_sign_date desc order by dc.contract_sign_date desc
</select> </select>
<select id="countByBo" resultType="int"> <select id="countByBo" resultType="int">
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DContractMapper.xml
View file @ 23b6c610
...@@ -17,12 +17,16 @@ ...@@ -17,12 +17,16 @@
abp.third_audit_unit abp.third_audit_unit
from d_contract c from d_contract c
left join advisory_body_project abp on c.contract_key = abp.project_key left join advisory_body_project abp on c.contract_key = abp.project_key
left join advisory_body ab on ab.advisory_body_cid = abp.advisory_body_cid
<where> <where>
<if test="bo.projectName != null and bo.projectName != ''"> <if test="bo.projectName != null and bo.projectName != ''">
c.project_name = #{bo.projectName} c.project_name like concat('%',#{bo.projectName},'%')
</if> </if>
<if test="bo.ownerUnit != null and bo.ownerUnit != ''"> <if test="bo.ownerUnit != null and bo.ownerUnit != ''">
and c.owner_name = #{bo.ownerUnit} and c.owner_name like concat('%',#{bo.ownerUnit},'%')
</if>
<if test="bo.advisoryBodyName != null and bo.advisoryBodyName != ''">
and ab.advisory_body_name like concat('%',#{bo.advisoryBodyName},'%')
</if> </if>
</where> </where>
order by c.contract_sign_date desc order by c.contract_sign_date desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment