From e785c62a34d79f4ed7a68c2b26e52e4707026a39 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Wed, 6 Mar 2024 15:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfJfglController.java | 8 ++++ .../com/kms/yg/df/domain/BsSgcDfBzhjs.java | 14 ++++++ .../com/kms/yg/df/domain/BsSgcDfDagl.java | 14 ++++++ .../com/kms/yg/df/domain/BsSgcDfJfgl.java | 13 +++++ .../kms/yg/df/mapper/BsSgcDfBzhjsMapper.java | 14 ++++++ .../kms/yg/df/mapper/BsSgcDfDaglMapper.java | 11 +++++ .../kms/yg/df/mapper/BsSgcDfJfglMapper.java | 13 +++++ .../yg/df/service/BsSgcDfBzhjsService.java | 35 ++++++++++++++ .../kms/yg/df/service/BsSgcDfDaglService.java | 32 +++++++++++++ .../kms/yg/df/service/BsSgcDfJfglService.java | 43 +++++++++++++++++ .../mapper/yg/df/BsSgcDfBzhjsMapper.xml | 45 ++++++++++++++++++ .../mapper/yg/df/BsSgcDfDaglMapper.xml | 47 +++++++++++++++++++ .../mapper/yg/df/BsSgcDfJfglMapper.xml | 45 ++++++++++++++++++ 13 files changed, 334 insertions(+) create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml create mode 100644 shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java index d8136e6d..901b7184 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java @@ -46,6 +46,14 @@ public class BsSgcDfJfglController extends BaseController private BsSgcDfJfglService bsSgcDfJfglService; + + @GetMapping("/listByCode/{code}") + public AjaxResult listById(@PathVariable("code") String code) + { + return AjaxResult.success(bsSgcDfJfglService.getByCode(code)); + } + + /** * 查询经费管理列表 */ diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java index d2436605..3977cccb 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java @@ -1,5 +1,6 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,4 +53,17 @@ public class BsSgcDfBzhjs extends BaseEntity @ApiModelProperty("分数") private String updateUid; + + + @TableField(exist = false) + private String dikeName; + @TableField(exist = false) + private String dikeType; + @TableField(exist = false) + private String engScal; + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private String adcd; + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java index c3b5106c..694e4075 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java @@ -1,5 +1,6 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -57,4 +58,17 @@ public class BsSgcDfDagl extends BaseEntity @ApiModelProperty("年度调度运用计划") private String relation; + + + @TableField(exist = false) + private String dikeName; + @TableField(exist = false) + private String dikeType; + @TableField(exist = false) + private String engScal; + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private String adcd; + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java index 182656bf..33f1e565 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java @@ -1,5 +1,6 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -72,4 +73,16 @@ public class BsSgcDfJfgl extends BaseEntity @ApiModelProperty("经费用途") private String type; + + @TableField(exist = false) + private String dikeName; + @TableField(exist = false) + private String dikeType; + @TableField(exist = false) + private String engScal; + @TableField(exist = false) + private String unit; + @TableField(exist = false) + private String adcd; + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java index 80cc56a8..85bf05d3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBzhjs; +import java.util.List; + /** * 堤防标准化建设Mapper接口 * @@ -13,4 +17,14 @@ import com.kms.yg.df.domain.BsSgcDfBzhjs; @Repository public interface BsSgcDfBzhjsMapper extends BaseMapper { + + + List getList(@Param("id") String id, + @Param("dikeType") String dikeType, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java index a7c69bbb..32b11ba8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzDagl; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfDagl; +import java.util.List; + /** * 堤防档案管理Mapper接口 * @@ -13,4 +17,11 @@ import com.kms.yg.df.domain.BsSgcDfDagl; @Repository public interface BsSgcDfDaglMapper extends BaseMapper { + List getList(@Param("id") String id, + @Param("dikeType") String dikeType, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java index 61420fa1..6dbc91ae 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJfglMapper.java @@ -1,9 +1,13 @@ package com.kms.yg.df.mapper; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfJfgl; +import java.util.List; + /** * 经费管理Mapper接口 * @@ -13,4 +17,13 @@ import com.kms.yg.df.domain.BsSgcDfJfgl; @Repository public interface BsSgcDfJfglMapper extends BaseMapper { + + List getList(@Param("id") String id, + @Param("dikeType") String dikeType, + @Param("dikeName") String dikeName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index f7f26046..42daf902 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java @@ -1,9 +1,19 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzBzhjs; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfBzhjsMapper; import com.kms.yg.df.domain.BsSgcDfBzhjs; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防标准化建设Service接口 * @@ -13,4 +23,29 @@ import org.springframework.stereotype.Service; @Service public class BsSgcDfBzhjsService extends BaseService{ + @Autowired + private BsSgcDfBzhjsMapper bsSgcDfBzhjsMapper; + + + + @Autowired + private SysXzqhService sysXzqhService; + + + public IPage selectPage(SearchParam sp) { + + BsSgcDfBzhjs data = sp.getData(); + + List list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + + Page page = new Page<>(); + page.setRecords(list); + + page.setTotal(list.size()); + + return page; + + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index cdb4ce40..52483beb 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -1,9 +1,19 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzDagl; +import com.kms.yg.sz.mapper.BsSgcSzDaglMapper; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfDaglMapper; import com.kms.yg.df.domain.BsSgcDfDagl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 堤防档案管理Service接口 * @@ -13,4 +23,26 @@ import org.springframework.stereotype.Service; @Service public class BsSgcDfDaglService extends BaseService{ + + @Autowired + private BsSgcDfDaglMapper bsSgcDfDaglMapper; + + @Autowired + private SysXzqhService sysXzqhService; + + public IPage selectPage(SearchParam sp) { + + BsSgcDfDagl data = sp.getData(); + + + List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + + Page page = new Page<>(); + page.setTotal(list.size()); + page.setRecords(list); + return page; + + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java index 4680cde0..e8b28414 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java @@ -1,9 +1,19 @@ package com.kms.yg.df.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.kms.yg.df.mapper.BsSgcDfJfglMapper; import com.kms.yg.df.domain.BsSgcDfJfgl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 经费管理Service接口 * @@ -13,4 +23,37 @@ import org.springframework.stereotype.Service; @Service public class BsSgcDfJfglService extends BaseService{ + + @Autowired + private BsSgcDfJfglMapper bsSgcDfJfglMapper; + + + + @Autowired + private SysXzqhService sysXzqhService; + + public IPage selectPage(SearchParam sp) { + + BsSgcDfJfgl data = sp.getData(); + + List list= bsSgcDfJfglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + + Page page = new Page<>(); + page.setRecords(list); + + page.setTotal(list.size()); + + return page; + + } + + public List getByCode(String code) { + List bsSgcSzJfgls = bsSgcDfJfglMapper.selectList(Wrappers.lambdaQuery(BsSgcDfJfgl.class) + .eq(BsSgcDfJfgl::getDikeCode, code)); + + return bsSgcSzJfgls; + + } + } diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml new file mode 100644 index 00000000..e435c813 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -0,0 +1,45 @@ + + + + + + select * + from bs_sgc_df_bzhjs sf + left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml new file mode 100644 index 00000000..99e56c33 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml @@ -0,0 +1,47 @@ + + + + + + select * + from bs_sgc_df_dagl sd + left join bs_sgc_df_safe_jbxx sj on sd.dike_code = sj.dike_code + + + + + + + + + + + + + + + + + + + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml new file mode 100644 index 00000000..e8ae0f5d --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml @@ -0,0 +1,45 @@ + + + + + + select * + from bs_sgc_df_jfgl sf + left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + + + + + + + + + + + + + + + + +