Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
d95181f6 by 夏齐
Options

新增档案修改查询数据接口

1 parent 3471c4a3
Inline Side-by-side
Showing 10 changed files with 158 additions and 95 deletions
1 package com.pashanhoo.common.util;
2
3 public class SysCodeUtil {
4
5 /**
6 * 获取编号
7 * @param ctype
8 * @param taskNo
9 * @param taskChild
10 */
11 public static String getSequence(String ctype,String taskNo,String taskChild){
12 //1、查询数据是否存在
13 //2、如果存在在修改编号值
14 //3、不存在则新增
15 return "";
16 }
17
18
19
20 }
...@@ -65,8 +65,6 @@ public class DgArchivesModifyController { ...@@ -65,8 +65,6 @@ public class DgArchivesModifyController {
65 @PostMapping("search") 65 @PostMapping("search")
66 @ApiOperation(value = "根据条件进行列表查询") 66 @ApiOperation(value = "根据条件进行列表查询")
67 public Result searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) { 67 public Result searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) {
68 //TODO 默认排序条件设置 68 return dgarchivesmodifyService.searchDgArchivesModifyList(request);
69 request.defaultFillPageProp("","");
70 return Result.ok(dgarchivesmodifyService.searchDgArchivesModifyList(request));
71 } 69 }
72 } 70 }
......
...@@ -18,64 +18,73 @@ import lombok.EqualsAndHashCode; ...@@ -18,64 +18,73 @@ import lombok.EqualsAndHashCode;
18 @Data 18 @Data
19 @EqualsAndHashCode(callSuper = false) 19 @EqualsAndHashCode(callSuper = false)
20 @ApiModel(value="档案修改信息列表VO") 20 @ApiModel(value="档案修改信息列表VO")
21 //TODO 该类属性暂时是完整的全部属性，需进行个性化的增删 21
22 public class DgArchivesModifyListVO implements Serializable { 22 public class DgArchivesModifyListVO implements Serializable {
23 23
24 private static final long serialVersionUID = 1L; 24 private static final long serialVersionUID = 1L;
25 25
26 /** 26 /**
27 * 修改标识码 27 * 案卷标识码
28 */ 28 */
29 @ApiModelProperty(name = "bsmModify", value = "修改标识码") 29 @ApiModelProperty(name = "bsm_archives", value = "案卷标识码")
30 private String bsmModify; 30 private String bsm_archives;
31 31
32 /** 32 /**
33 * 档案标识码 33 * 修改时间
34 */ 34 */
35 @ApiModelProperty(name = "bsmArchives", value = "档案标识码") 35 @ApiModelProperty(name = "xgsj", value = "修改时间")
36 private String bsmArchives; 36 private Date xgsj;
37 37
38 /** 38 /**
39 * 修改编号 39 * 修改人
40 */ 40 */
41 @ApiModelProperty(name = "xgbh", value = "修改编号") 41 @ApiModelProperty(name = "xgr", value = "修改人")
42 private String xgbh; 42 private String xgr;
43
44 /** 43 /**
45 * 原档案信息 44 * 业务类型名称
46 */ 45 */
47 @ApiModelProperty(name = "ydaxx", value = "原档案信息") 46 @ApiModelProperty(name = "djjgmc", value = "业务类型名称")
48 private String ydaxx; 47 private String djjgmc;
49
50 /** 48 /**
51 * 现档案信息 49 * 登记类型
52 */ 50 */
53 @ApiModelProperty(name = "xdaxx", value = "现档案信息") 51 @ApiModelProperty(name = "djlx", value = "登记类型")
54 private String xdaxx; 52 private String djlx;
55
56 /** 53 /**
57 * 修改内容 54 * 档案号
58 */ 55 */
59 @ApiModelProperty(name = "xgnr", value = "修改内容") 56 @ApiModelProperty(name = "ajh", value = "档案号")
60 private String xgnr; 57 private String ajh;
61
62 /** 58 /**
63 * 修改时间 59 * 业务号
64 */ 60 */
65 @ApiModelProperty(name = "xgsj", value = "修改时间") 61 @ApiModelProperty(name = "ywh", value = "业务号")
66 private Date xgsj; 62 private String ywh;
67
68 /** 63 /**
69 * 修改人 64 * 不动产单元号
70 */ 65 */
71 @ApiModelProperty(name = "xgr", value = "修改人") 66 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
72 private String xgr; 67 private String bdcdyh;
73 68 /**
69 * 权利人
70 */
71 @ApiModelProperty(name = "qlr", value = "权利人")
72 private String qlr;
73 /**
74 * 义务人
75 */
76 @ApiModelProperty(name = "ywr", value = "义务人")
77 private String ywr;
78 /**
79 * 不动产证件号码
80 */
81 @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码")
82 private String bdcqzh;
74 /** 83 /**
75 * 备注 84 * 不动产单元号数量
76 */ 85 */
77 @ApiModelProperty(name = "bz", value = "备注") 86 @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量")
78 private String bz; 87 private String bdcdy_num;
79 88
80 89
81 } 90 }
......
...@@ -23,60 +23,53 @@ import com.pashanhoo.common.PageInfo; ...@@ -23,60 +23,53 @@ import com.pashanhoo.common.PageInfo;
23 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable { 23 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable {
24 24
25 private static final long serialVersionUID = 1L; 25 private static final long serialVersionUID = 1L;
26
27 /** 26 /**
28 * 修改标识码 27 * 登记业务名称
29 */ 28 */
30 @ApiModelProperty(name = "bsmModify", value = "修改标识码") 29 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
31 private String bsmModify; 30 private String djywmc;
32
33 /** 31 /**
34 * 档案标识码 32 * 登记类型
35 */ 33 */
36 @ApiModelProperty(name = "bsmArchives", value = "档案标识码") 34 @ApiModelProperty(name = "djlx", value = "登记类型")
37 private String bsmArchives; 35 private String djlx;
38
39 /** 36 /**
40 * 修改编号 37 * 修改人
41 */ 38 */
42 @ApiModelProperty(name = "xgbh", value = "修改编号") 39 @ApiModelProperty(name = "xgr", value = "修改人")
43 private String xgbh; 40 private String xgr;
44
45 /** 41 /**
46 * 原档案信息 42 * 修改起始时间
47 */ 43 */
48 @ApiModelProperty(name = "ydaxx", value = "原档案信息") 44 @ApiModelProperty(name = "xgqssj", value = "修改起始时间")
49 private String ydaxx; 45 private Date xgqssj;
50
51 /** 46 /**
52 * 现档案信息 47 * 修改截止时间
53 */ 48 */
54 @ApiModelProperty(name = "xdaxx", value = "现档案信息") 49 @ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
55 private String xdaxx; 50 private Date xgjzsj;
56
57 /** 51 /**
58 * 修改内容 52 * 档案号
59 */ 53 */
60 @ApiModelProperty(name = "xgnr", value = "修改内容") 54 @ApiModelProperty(name = "ajh", value = "档案号")
61 private String xgnr; 55 private String ajh;
62
63 /** 56 /**
64 * 修改时间 57 * 业务号
65 */ 58 */
66 @ApiModelProperty(name = "xgsj", value = "修改时间") 59 @ApiModelProperty(name = "ywh", value = "业务号")
67 private Date xgsj; 60 private String ywh;
68
69 /** 61 /**
70 * 修改人 62 * 不动产单元号
71 */ 63 */
72 @ApiModelProperty(name = "xgr", value = "修改人") 64 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
73 private String xgr; 65 private String bdcdyh;
74
75 /** 66 /**
76 * 备注 67 * 不动产权证号
77 */ 68 */
78 @ApiModelProperty(name = "bz", value = "备注") 69 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
79 private String bz; 70 private String bdcqzh;
71
72
80 73
81 74
82 } 75 }
......
...@@ -3,6 +3,10 @@ package com.pashanhoo.modify.mapper; ...@@ -3,6 +3,10 @@ package com.pashanhoo.modify.mapper;
3 3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 5 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
6 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO;
7 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
8
9 import java.util.List;
6 10
7 /** 11 /**
8 * <p> 12 * <p>
...@@ -14,4 +18,7 @@ import com.pashanhoo.modify.entity.DgArchivesModifyDO; ...@@ -14,4 +18,7 @@ import com.pashanhoo.modify.entity.DgArchivesModifyDO;
14 */ 18 */
15 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> { 19 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> {
16 20
21
22 List<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
23
17 } 24 }
......
...@@ -3,6 +3,7 @@ package com.pashanhoo.modify.service; ...@@ -3,6 +3,7 @@ package com.pashanhoo.modify.service;
3 3
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
6 import com.pashanhoo.common.Result;
6 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 7 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
7 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest; 8 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest;
8 import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO; 9 import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO;
...@@ -44,5 +45,5 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> { ...@@ -44,5 +45,5 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
44 * @param request 45 * @param request
45 * @return 46 * @return
46 */ 47 */
47 Page searchDgArchivesModifyList(DgArchivesModifySearchRequest request); 48 Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
48 } 49 }
......
1 package com.pashanhoo.modify.service.impl; 1 package com.pashanhoo.modify.service.impl;
2 2
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import com.github.pagehelper.PageHelper;
5 import com.github.pagehelper.PageInfo;
6 import com.pashanhoo.common.Result;
4 import com.pashanhoo.modify.entity.DgArchivesModifyConverter; 7 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
5 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 8 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
6 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest; 9 import com.pashanhoo.modify.entity.vo.*;
7 import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO;
8 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
9 import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
10 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper; 10 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
11 import com.pashanhoo.modify.service.DgArchivesModifyService; 11 import com.pashanhoo.modify.service.DgArchivesModifyService;
12 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
12 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
14 15
15 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 16 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 17 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
17 18
19 import java.util.List;
20
18 /** 21 /**
19 * <p> 22 * <p>
20 * 档案修改信息 服务实现类 23 * 档案修改信息 服务实现类
...@@ -75,17 +78,11 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -75,17 +78,11 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
75 * @return 78 * @return
76 */ 79 */
77 @Override 80 @Override
78 public Page searchDgArchivesModifyList(DgArchivesModifySearchRequest request) { 81 public Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
79 Page<DgArchivesModifyDO> pageParam = new Page<DgArchivesModifyDO>(request.getCurrentPage(), request.getPageSize()); 82 PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
80 QueryWrapper<DgArchivesModifyDO> wrapper = new QueryWrapper<>(); 83 List<DgArchivesModifyListVO> list= dgarchivesmodifyMapper.searchDgArchivesModifyList(request);
81 //设置默认排序 84 PageInfo<DgArchivesModifyListVO> pageInfo = new PageInfo<DgArchivesModifyListVO>(list);
82 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 85 return Result.ok(pageInfo);
83
84 //TODO 根据当前情况设置wrapper条件
85
86 Page page = this.page(pageParam, wrapper);
87 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
88 return page.setRecords(dgarchivesmodifyConverter.doList2ListVOList(page.getRecords()));
89 } 86 }
90 87
91 } 88 }
......
...@@ -24,10 +24,10 @@ public class DgArchivesReplenishListVO implements Serializable { ...@@ -24,10 +24,10 @@ public class DgArchivesReplenishListVO implements Serializable {
24 private static final long serialVersionUID = 1L; 24 private static final long serialVersionUID = 1L;
25 25
26 /** 26 /**
27 * 补录标识码 27 * 档案标识码
28 */ 28 */
29 @ApiModelProperty(name = "bsm_modify", value = "补录标识码") 29 @ApiModelProperty(name = "bsm_archives", value = "档案标识码")
30 private String bsm_modify; 30 private String bsm_archives;
31 31
32 /** 32 /**
33 * 补录时间 33 * 补录时间
......
...@@ -14,9 +14,47 @@ ...@@ -14,9 +14,47 @@
14 <result column="XGR" property="xgr" /> 14 <result column="XGR" property="xgr" />
15 <result column="BZ" property="bz" /> 15 <result column="BZ" property="bz" />
16 </resultMap> 16 </resultMap>
17 17 <!-- 通用查询映射结果 -->
18 <resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
19 <id column="BSM_ARCHIVES" property="bsm_archives" />
20 <result column="XGSJ" property="xgsj" />
21 <result column="XGR" property="xgr" />
22 <result column="DJLX" property="djlx" />
23 <result column="DJJGMC" property="djjgmc" />
24 <result column="AJH" property="ajh" />
25 <result column="YWH" property="ywh" />
26 <result column="BDCDYH" property="bdcdyh" />
27 <result column="QLR" property="qlr" />
28 <result column="YWR" property="ywr" />
29 <result column="BDCQZH" property="bdcqzh" />
30 <result column="BDCDY_NUM" property="bdcdy_num" />
31 </resultMap>
18 <!-- 通用查询结果列 --> 32 <!-- 通用查询结果列 -->
19 <sql id="Base_Column_List"> 33 <sql id="Base_Column_List">
20 BSM_MODIFY, BSM_ARCHIVES, XGBH, YDAXX, XDAXX, XGNR, XGSJ, XGR, BZ 34 BSM_MODIFY, BSM_ARCHIVES, XGBH, YDAXX, XDAXX, XGNR, XGSJ, XGR, BZ
21 </sql> 35 </sql>
36 <select id="searchDgArchivesModifyList" resultMap="SearchResultMap">
37 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
38 from dg_archives_modify a, dg_business b, dg_bdcdy c,dg_archives d
39 where a.bsm_archives = d.bsm_archives
40 and a.bsm_archives=d.bsm_archives
41 and c.bsm_archives=d.bsm_archives
42 <if test="ywh != null and ywh!='' ">
43 and b.ywh=#{ywh,jdbcType=VARCHAR}
44 </if>
45 <if test="djjgbm != null and djjgbm!='' ">
46 and b.djjgbm=#{djjgbm,jdbcType=VARCHAR}
47 </if>
48 <if test="djlx != null and djlx!='' ">
49 and b.djlx=#{djlx,jdbcType=VARCHAR}
50 </if>
51 <if test="xgr != null and xgr!='' ">
52 and a.xgr=#{xgr,jdbcType=VARCHAR}
53 </if>
54 <if test="xgsj != null and xgsj!='' ">
55 and a.xgsj=#{xgsj,jdbcType=VARCHAR}
56 </if>
57
58
59 </select>
22 </mapper> 60 </mapper>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </resultMap> 13 </resultMap>
14 <!-- 通用查询映射结果 --> 14 <!-- 通用查询映射结果 -->
15 <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO"> 15 <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO">
16 <id column="BSM_MODIFY" property="bsm_modify" /> 16 <id column="BSM_ARCHIVES" property="bsm_archives" />
17 <result column="XGSJ" property="xgsj" /> 17 <result column="XGSJ" property="xgsj" />
18 <result column="XGR" property="xgr" /> 18 <result column="XGR" property="xgr" />
19 <result column="DJLX" property="djlx" /> 19 <result column="DJLX" property="djlx" />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 BSM_MODIFY, BSM_ARCHIVES, BLBH, XGSJ, XGR, BZ 32 BSM_MODIFY, BSM_ARCHIVES, BLBH, XGSJ, XGR, BZ
33 </sql> 33 </sql>
34 <select id="search" resultMap="SearchResultMap"> 34 <select id="search" resultMap="SearchResultMap">
35 select a.bsm_modify,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 35 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
36 from dg_archives_replenish a, dg_business b, dg_bdcdy c,dg_archives d 36 from dg_archives_replenish a, dg_business b, dg_bdcdy c,dg_archives d
37 where a.bsm_archives = d.bsm_archives 37 where a.bsm_archives = d.bsm_archives
38 and a.bsm_archives=d.bsm_archives 38 and a.bsm_archives=d.bsm_archives
......