From f67167363d83dc0a9b99e08a1a90e2cced12e408 Mon Sep 17 00:00:00 2001 From: jingweijie <jingweijie@pashanhoo.com> Date: Fri, 12 Nov 2021 17:39:16 +0800 Subject: [PATCH] 档案补录=》列表查询 --- src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java | 6 ++++-- src/main/java/com/pashanhoo/replenish/entity/DgArchivesReplenishDO.java | 8 ++++---- src/main/java/com/pashanhoo/replenish/entity/vo/AddDgArchivesReplenishRequest.java | 21 +++++++++++++-------- src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java | 17 +++++++++++------ src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java | 52 +++++++++++++++++++++++++++++++++------------------- src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java | 34 ++++++++++++++-------------------- src/main/java/com/pashanhoo/replenish/entity/vo/UpdateDgArchivesReplenishRequest.java | 17 +++++++++++------ src/main/java/com/pashanhoo/replenish/mapper/DgArchivesReplenishMapper.java | 5 +++-- src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java | 8 +++----- src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java | 15 ++++++++++----- src/main/resources/mapper/DgArchivesReplenishMapper.xml | 87 +++++++++++++++++++++++++++++++++++++++------------------------------------------------ 11 files changed, 145 insertions(+), 125 deletions(-) diff --git a/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java b/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java index fcda83c..4585ea8 100644 --- a/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java +++ b/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java @@ -1,7 +1,9 @@ package com.pashanhoo.replenish.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pashanhoo.common.Result; import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; +import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest; import com.pashanhoo.replenish.service.DgArchivesReplenishService; @@ -64,8 +66,8 @@ public class DgArchivesReplenishController { @PostMapping("search") @ApiOperation(value = "根据条件进行列表查询") - public Result searchDgArchivesReplenishList(@RequestBody DgArchivesReplenishSearchRequest request) { + public Result<IPage<DgArchivesReplenishListVO>> searchDgArchivesReplenishList(@RequestBody DgArchivesReplenishSearchRequest request) { - return dgarchivesreplenishService.searchDgArchivesReplenishList(request); + return Result.ok(dgarchivesreplenishService.searchDgArchivesReplenishList(request)); } } diff --git a/src/main/java/com/pashanhoo/replenish/entity/DgArchivesReplenishDO.java b/src/main/java/com/pashanhoo/replenish/entity/DgArchivesReplenishDO.java index 8f699ab..077658e 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/DgArchivesReplenishDO.java +++ b/src/main/java/com/pashanhoo/replenish/entity/DgArchivesReplenishDO.java @@ -45,14 +45,14 @@ public class DgArchivesReplenishDO implements Serializable { /** * 修改时间 */ - @TableField("XGSJ") - private Date xgsj; + @TableField("CREATETIME") + private Date createTime; /** * 修改人 */ - @TableField("XGR") - private String xgr; + @TableField("CREATER") + private String creater; /** * 备注 diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/AddDgArchivesReplenishRequest.java b/src/main/java/com/pashanhoo/replenish/entity/vo/AddDgArchivesReplenishRequest.java index e14fd89..4c19122 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/vo/AddDgArchivesReplenishRequest.java +++ b/src/main/java/com/pashanhoo/replenish/entity/vo/AddDgArchivesReplenishRequest.java @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; import java.util.Date; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -36,16 +39,18 @@ public class AddDgArchivesReplenishRequest implements Serializable { private String blbh; /** - * 修改时间 - */ - @ApiModelProperty(name = "xgsj", value = "修改时间") - private Date xgsj; + *补录人 + */ + @ApiModelProperty(name = "creater", value = "补录人") + private String creater; /** - * 修改人 - */ - @ApiModelProperty(name = "xgr", value = "修改人") - private String xgr; + * 补录时间 + */ + @ApiModelProperty(name = "createTime", value = "补录时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; /** * 备注 diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java index 039456a..cbec218 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java +++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; import java.util.Date; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -41,16 +44,18 @@ public class DgArchivesReplenishDetailVO implements Serializable { private String blbh; /** - * 修改时间 + *补录人 */ - @ApiModelProperty(name = "xgsj", value = "修改时间") - private Date xgsj; + @ApiModelProperty(name = "creater", value = "补录人") + private String creater; /** - * 修改人 + * 补录时间 */ - @ApiModelProperty(name = "xgr", value = "修改人") - private String xgr; + @ApiModelProperty(name = "createTime", value = "补录时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; /** * 备注 diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java index 21d20ab..9f80117 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java +++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; import java.util.Date; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -30,60 +33,71 @@ public class DgArchivesReplenishListVO implements Serializable { private String bsm_archives; /** - * 补录时间 - */ - @ApiModelProperty(name = "xgsj", value = "补录时间") - private Date xgsj; - - /** - * 补录人 - */ - @ApiModelProperty(name = "xgr", value = "补录人") - private String xgr; - /** * 业务类型名称 */ - @ApiModelProperty(name = "djjgmc", value = "业务类型名称") - private String djjgmc; + @ApiModelProperty(name = "qllx", value = "业务类型名称") + private String qllx; + /** * 登记类型 */ @ApiModelProperty(name = "djlx", value = "登记类型") private String djlx; + /** * 档案号 */ @ApiModelProperty(name = "ajh", value = "档案号") private String ajh; + /** * 业务号 */ @ApiModelProperty(name = "ywh", value = "业务号") private String ywh; + /** - * 不动产单元号 + * 不动产单元号数量 */ - @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") - private String bdcdyh; + @ApiModelProperty(name = "bdcdyNum", value = "不动产单元号数量") + private String bdcdyNum; + /** * 权利人 */ @ApiModelProperty(name = "qlr", value = "权利人") private String qlr; + /** * 义务人 */ @ApiModelProperty(name = "ywr", value = "义务人") private String ywr; + /** * 不动产证件号码 */ @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码") private String bdcqzh; + /** - * 不动产单元号数量 + * 补录时间 + */ + @ApiModelProperty(name = "createTime", value = "补录时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + /** + * 补录人 + */ + @ApiModelProperty(name = "creater", value = "补录人") + private String creater; + + /** + * 不动产单元号 */ - @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量") - private String bdcdy_num; + @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") + private String bdcdyh; } diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java index fa0cac4..8898fcb 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java +++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java @@ -2,11 +2,14 @@ package com.pashanhoo.replenish.entity.vo; import java.util.Date; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import com.pashanhoo.common.PageInfo; +import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -30,15 +33,11 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial private String ywh; /** - * 登记业务编码 - */ - @ApiModelProperty(name = "djywbm", value = "登记业务编码") - private String djywbm; - /** - * 登记业务名称 + * 权利类型 */ - @ApiModelProperty(name = "djywmc", value = "登记业务名称") - private String djywmc; + @ApiModelProperty(name = "qllx", value = "权利类型") + private String qllx; + /** * 登记类型 */ @@ -46,22 +45,17 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial private String djlx; /** - * 补录时间 - */ - @ApiModelProperty(name = "xgsj", value = "补录时间") - private Date xgsj; - - /** *补录人 */ - @ApiModelProperty(name = "xgr", value = "补录人") - private String xgr; + @ApiModelProperty(name = "creater", value = "补录人") + private String creater; /** - * 备注 + * 补录时间 */ - @ApiModelProperty(name = "bz", value = "备注") - private String bz; - + @ApiModelProperty(name = "createTime", value = "补录时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; } diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/UpdateDgArchivesReplenishRequest.java b/src/main/java/com/pashanhoo/replenish/entity/vo/UpdateDgArchivesReplenishRequest.java index 6858f44..af0bdcd 100644 --- a/src/main/java/com/pashanhoo/replenish/entity/vo/UpdateDgArchivesReplenishRequest.java +++ b/src/main/java/com/pashanhoo/replenish/entity/vo/UpdateDgArchivesReplenishRequest.java @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; import java.util.Date; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -41,16 +44,18 @@ public class UpdateDgArchivesReplenishRequest implements Serializable { private String blbh; /** - * 修改时间 + *补录人 */ - @ApiModelProperty(name = "xgsj", value = "修改时间") - private Date xgsj; + @ApiModelProperty(name = "creater", value = "补录人") + private String creater; /** - * 修改人 + * 补录时间 */ - @ApiModelProperty(name = "xgr", value = "修改人") - private String xgr; + @ApiModelProperty(name = "createTime", value = "补录时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; /** * 备注 diff --git a/src/main/java/com/pashanhoo/replenish/mapper/DgArchivesReplenishMapper.java b/src/main/java/com/pashanhoo/replenish/mapper/DgArchivesReplenishMapper.java index eb76633..a4d6457 100644 --- a/src/main/java/com/pashanhoo/replenish/mapper/DgArchivesReplenishMapper.java +++ b/src/main/java/com/pashanhoo/replenish/mapper/DgArchivesReplenishMapper.java @@ -2,11 +2,12 @@ package com.pashanhoo.replenish.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pashanhoo.replenish.entity.DgArchivesReplenishDO; import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; +import org.apache.ibatis.annotations.Param; -import java.util.List; /** * <p> @@ -18,6 +19,6 @@ import java.util.List; */ public interface DgArchivesReplenishMapper extends BaseMapper<DgArchivesReplenishDO> { - List<DgArchivesReplenishListVO> search(DgArchivesReplenishSearchRequest searchRequest); + IPage<DgArchivesReplenishListVO> search(@Param("pageParam") IPage<DgArchivesReplenishListVO> pageParam, @Param("request") DgArchivesReplenishSearchRequest request); } diff --git a/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java b/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java index ff89bd5..9f35ca7 100644 --- a/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java +++ b/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java @@ -1,14 +1,12 @@ package com.pashanhoo.replenish.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pashanhoo.common.Result; import com.pashanhoo.replenish.entity.*; -import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; -import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO; -import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; -import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest; +import com.pashanhoo.replenish.entity.vo.*; /** * <p> @@ -45,5 +43,5 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish * @param request * @return */ - Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request); + IPage<DgArchivesReplenishListVO> searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request); } diff --git a/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java b/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java index c9c6be4..1c8b4a4 100644 --- a/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java +++ b/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java @@ -1,6 +1,8 @@ package com.pashanhoo.replenish.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -34,6 +36,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen /** * 新增记录 + * * @param request * @return */ @@ -45,6 +48,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen /** * 根据主键查询记录详情 + * * @param id * @return */ @@ -56,6 +60,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen /** * 修改单条记录 + * * @param request * @return */ @@ -67,15 +72,15 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen /** * 根据条件进行列表查询 + * * @param request * @return */ @Override - public Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) { - PageHelper.startPage(request.getCurrentPage(), request.getPageSize()); - List<DgArchivesReplenishListVO> list= dgarchivesreplenishMapper.search(request); - PageInfo<DgArchivesReplenishListVO> pageInfo = new PageInfo<DgArchivesReplenishListVO>(list); - return Result.ok(pageInfo); + public IPage<DgArchivesReplenishListVO> searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) { + + IPage<DgArchivesReplenishListVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize()); + return dgarchivesreplenishMapper.search(pageParam, request); } } diff --git a/src/main/resources/mapper/DgArchivesReplenishMapper.xml b/src/main/resources/mapper/DgArchivesReplenishMapper.xml index 53e13ee..836d5b4 100644 --- a/src/main/resources/mapper/DgArchivesReplenishMapper.xml +++ b/src/main/resources/mapper/DgArchivesReplenishMapper.xml @@ -1,57 +1,48 @@ <?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.pashanhoo.replenish.mapper.DgArchivesReplenishMapper"> - <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.pashanhoo.replenish.entity.DgArchivesReplenishDO"> - <id column="BSM_MODIFY" property="bsmModify" /> - <result column="BSM_ARCHIVES" property="bsmArchives" /> - <result column="BLBH" property="blbh" /> - <result column="XGSJ" property="xgsj" /> - <result column="XGR" property="xgr" /> - <result column="BZ" property="bz" /> - </resultMap> - <!-- 通用查询映射结果 --> - <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO"> - <id column="BSM_ARCHIVES" property="bsm_archives" /> - <result column="XGSJ" property="xgsj" /> - <result column="XGR" property="xgr" /> - <result column="DJLX" property="djlx" /> - <result column="DJJGMC" property="djjgmc" /> - <result column="AJH" property="ajh" /> - <result column="YWH" property="ywh" /> - <result column="BDCDYH" property="bdcdyh" /> - <result column="QLR" property="qlr" /> - <result column="YWR" property="ywr" /> - <result column="BDCQZH" property="bdcqzh" /> - <result column="BDCDY_NUM" property="bdcdy_num" /> + <id column="BSM_MODIFY" property="bsmModify"/> + <result column="BSM_ARCHIVES" property="bsmArchives"/> + <result column="BLBH" property="blbh"/> + <result column="CREATETIME" property="createTime"/> + <result column="CREATER" property="creater"/> + <result column="BZ" property="bz"/> </resultMap> - <!-- 通用查询结果列 --> - <sql id="Base_Column_List"> - BSM_MODIFY, BSM_ARCHIVES, BLBH, XGSJ, XGR, BZ - </sql> - <select id="search" resultMap="SearchResultMap"> - select a.bsm_archives,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num - from dg_archives_replenish a, dg_business b, dg_bdcdy c,dg_archives d - where a.bsm_archives = d.bsm_archives - and a.bsm_archives=d.bsm_archives - and c.bsm_archives=d.bsm_archives - <if test="ywh != null and ywh!='' "> - and b.ywh=#{ywh,jdbcType=VARCHAR} - </if> - <if test="djjgbm != null and djjgbm!='' "> - and b.djjgbm=#{djjgbm,jdbcType=VARCHAR} - </if> - <if test="djlx != null and djlx!='' "> - and b.djlx=#{djlx,jdbcType=VARCHAR} - </if> - <if test="xgr != null and xgr!='' "> - and a.xgr=#{xgr,jdbcType=VARCHAR} - </if> - <if test="xgsj != null and xgsj!='' "> - and a.xgsj=#{xgsj,jdbcType=VARCHAR} - </if> - + <select id="search" resultType="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO"> + select DB.QLLX, + DB.DJLX, + DA.AJH, + DB.YWH, + BDCDY.BDCDYH, + BDCDY.QLR, + BDCDY.YWR, + BDCDY.BDCQZH, + DGR.CREATETIME, + DGR.CREATER, + count(*) over (partition by BDCDY.bdcdyh) as bdcdyNum + from DG_REPLENISH DGR + join DG_ARCHIVES DA on DA.BSM_ARCHIVES = DGR.BSM_ARCHIVES + join DG_BDCDY BDCDY on BDCDY.BSM_ARCHIVES = DGR.BSM_ARCHIVES + join DG_BUSINESS DB on DB.BSM_ARCHIVES = DGR.BSM_ARCHIVES + <where> + <if test="request.ywh != null and request.ywh != ''"> + DB.YWH = #{request.ywh,jdbcType=VARCHAR} + </if> + <if test="request.qllx != null and request.qllx != ''"> + and DB.QLLX = #{request.qllx,jdbcType=VARCHAR} + </if> + <if test="request.djlx != null and request.djlx != ''"> + and DB.DJLX = #{request.djlx,jdbcType=VARCHAR} + </if> + <if test="request.creater != null and request.creater != ''"> + and DGR.CREATER = #{request.creater,jdbcType=VARCHAR} + </if> + <if test="request.createTime != null"> + and DGR.CREATETIME = #{request.createTime,jdbcType=TIMESTAMP} + </if> + </where> </select> </mapper> -- libgit2 0.24.0