档案补录=》列表查询
Showing
11 changed files
with
145 additions
and
125 deletions
1 | package com.pashanhoo.replenish.controller; | 1 | package com.pashanhoo.replenish.controller; |
2 | 2 | ||
3 | import com.baomidou.mybatisplus.core.metadata.IPage; | ||
3 | import com.pashanhoo.common.Result; | 4 | import com.pashanhoo.common.Result; |
4 | import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; | 5 | import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; |
6 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; | ||
5 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; | 7 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; |
6 | import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest; | 8 | import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest; |
7 | import com.pashanhoo.replenish.service.DgArchivesReplenishService; | 9 | import com.pashanhoo.replenish.service.DgArchivesReplenishService; |
... | @@ -64,8 +66,8 @@ public class DgArchivesReplenishController { | ... | @@ -64,8 +66,8 @@ public class DgArchivesReplenishController { |
64 | 66 | ||
65 | @PostMapping("search") | 67 | @PostMapping("search") |
66 | @ApiOperation(value = "根据条件进行列表查询") | 68 | @ApiOperation(value = "根据条件进行列表查询") |
67 | public Result searchDgArchivesReplenishList(@RequestBody DgArchivesReplenishSearchRequest request) { | 69 | public Result<IPage<DgArchivesReplenishListVO>> searchDgArchivesReplenishList(@RequestBody DgArchivesReplenishSearchRequest request) { |
68 | 70 | ||
69 | return dgarchivesreplenishService.searchDgArchivesReplenishList(request); | 71 | return Result.ok(dgarchivesreplenishService.searchDgArchivesReplenishList(request)); |
70 | } | 72 | } |
71 | } | 73 | } | ... | ... |
... | @@ -45,14 +45,14 @@ public class DgArchivesReplenishDO implements Serializable { | ... | @@ -45,14 +45,14 @@ public class DgArchivesReplenishDO implements Serializable { |
45 | /** | 45 | /** |
46 | * 修改时间 | 46 | * 修改时间 |
47 | */ | 47 | */ |
48 | @TableField("XGSJ") | 48 | @TableField("CREATETIME") |
49 | private Date xgsj; | 49 | private Date createTime; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * 修改人 | 52 | * 修改人 |
53 | */ | 53 | */ |
54 | @TableField("XGR") | 54 | @TableField("CREATER") |
55 | private String xgr; | 55 | private String creater; |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * 备注 | 58 | * 备注 | ... | ... |
... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; | ... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; |
2 | 2 | ||
3 | import java.util.Date; | 3 | import java.util.Date; |
4 | import java.io.Serializable; | 4 | import java.io.Serializable; |
5 | |||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
5 | import io.swagger.annotations.ApiModel; | 7 | import io.swagger.annotations.ApiModel; |
6 | import io.swagger.annotations.ApiModelProperty; | 8 | import io.swagger.annotations.ApiModelProperty; |
7 | import lombok.Data; | 9 | import lombok.Data; |
8 | import lombok.EqualsAndHashCode; | 10 | import lombok.EqualsAndHashCode; |
11 | import org.springframework.format.annotation.DateTimeFormat; | ||
9 | 12 | ||
10 | /** | 13 | /** |
11 | * <p> | 14 | * <p> |
... | @@ -36,16 +39,18 @@ public class AddDgArchivesReplenishRequest implements Serializable { | ... | @@ -36,16 +39,18 @@ public class AddDgArchivesReplenishRequest implements Serializable { |
36 | private String blbh; | 39 | private String blbh; |
37 | 40 | ||
38 | /** | 41 | /** |
39 | * 修改时间 | 42 | *补录人 |
40 | */ | 43 | */ |
41 | @ApiModelProperty(name = "xgsj", value = "修改时间") | 44 | @ApiModelProperty(name = "creater", value = "补录人") |
42 | private Date xgsj; | 45 | private String creater; |
43 | 46 | ||
44 | /** | 47 | /** |
45 | * 修改人 | 48 | * 补录时间 |
46 | */ | 49 | */ |
47 | @ApiModelProperty(name = "xgr", value = "修改人") | 50 | @ApiModelProperty(name = "createTime", value = "补录时间") |
48 | private String xgr; | 51 | @DateTimeFormat(pattern = "yyyy-MM-dd") |
52 | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") | ||
53 | private Date createTime; | ||
49 | 54 | ||
50 | /** | 55 | /** |
51 | * 备注 | 56 | * 备注 | ... | ... |
... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; | ... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; |
2 | 2 | ||
3 | import java.util.Date; | 3 | import java.util.Date; |
4 | import java.io.Serializable; | 4 | import java.io.Serializable; |
5 | |||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
5 | import io.swagger.annotations.ApiModel; | 7 | import io.swagger.annotations.ApiModel; |
6 | import io.swagger.annotations.ApiModelProperty; | 8 | import io.swagger.annotations.ApiModelProperty; |
7 | import lombok.Data; | 9 | import lombok.Data; |
8 | import lombok.EqualsAndHashCode; | 10 | import lombok.EqualsAndHashCode; |
11 | import org.springframework.format.annotation.DateTimeFormat; | ||
9 | 12 | ||
10 | /** | 13 | /** |
11 | * <p> | 14 | * <p> |
... | @@ -41,16 +44,18 @@ public class DgArchivesReplenishDetailVO implements Serializable { | ... | @@ -41,16 +44,18 @@ public class DgArchivesReplenishDetailVO implements Serializable { |
41 | private String blbh; | 44 | private String blbh; |
42 | 45 | ||
43 | /** | 46 | /** |
44 | * 修改时间 | 47 | *补录人 |
45 | */ | 48 | */ |
46 | @ApiModelProperty(name = "xgsj", value = "修改时间") | 49 | @ApiModelProperty(name = "creater", value = "补录人") |
47 | private Date xgsj; | 50 | private String creater; |
48 | 51 | ||
49 | /** | 52 | /** |
50 | * 修改人 | 53 | * 补录时间 |
51 | */ | 54 | */ |
52 | @ApiModelProperty(name = "xgr", value = "修改人") | 55 | @ApiModelProperty(name = "createTime", value = "补录时间") |
53 | private String xgr; | 56 | @DateTimeFormat(pattern = "yyyy-MM-dd") |
57 | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") | ||
58 | private Date createTime; | ||
54 | 59 | ||
55 | /** | 60 | /** |
56 | * 备注 | 61 | * 备注 | ... | ... |
... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; | ... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; |
2 | 2 | ||
3 | import java.util.Date; | 3 | import java.util.Date; |
4 | import java.io.Serializable; | 4 | import java.io.Serializable; |
5 | |||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
5 | import io.swagger.annotations.ApiModel; | 7 | import io.swagger.annotations.ApiModel; |
6 | import io.swagger.annotations.ApiModelProperty; | 8 | import io.swagger.annotations.ApiModelProperty; |
7 | import lombok.Data; | 9 | import lombok.Data; |
8 | import lombok.EqualsAndHashCode; | 10 | import lombok.EqualsAndHashCode; |
11 | import org.springframework.format.annotation.DateTimeFormat; | ||
9 | 12 | ||
10 | /** | 13 | /** |
11 | * <p> | 14 | * <p> |
... | @@ -30,60 +33,71 @@ public class DgArchivesReplenishListVO implements Serializable { | ... | @@ -30,60 +33,71 @@ public class DgArchivesReplenishListVO implements Serializable { |
30 | private String bsm_archives; | 33 | private String bsm_archives; |
31 | 34 | ||
32 | /** | 35 | /** |
33 | * 补录时间 | ||
34 | */ | ||
35 | @ApiModelProperty(name = "xgsj", value = "补录时间") | ||
36 | private Date xgsj; | ||
37 | |||
38 | /** | ||
39 | * 补录人 | ||
40 | */ | ||
41 | @ApiModelProperty(name = "xgr", value = "补录人") | ||
42 | private String xgr; | ||
43 | /** | ||
44 | * 业务类型名称 | 36 | * 业务类型名称 |
45 | */ | 37 | */ |
46 | @ApiModelProperty(name = "djjgmc", value = "业务类型名称") | 38 | @ApiModelProperty(name = "qllx", value = "业务类型名称") |
47 | private String djjgmc; | 39 | private String qllx; |
40 | |||
48 | /** | 41 | /** |
49 | * 登记类型 | 42 | * 登记类型 |
50 | */ | 43 | */ |
51 | @ApiModelProperty(name = "djlx", value = "登记类型") | 44 | @ApiModelProperty(name = "djlx", value = "登记类型") |
52 | private String djlx; | 45 | private String djlx; |
46 | |||
53 | /** | 47 | /** |
54 | * 档案号 | 48 | * 档案号 |
55 | */ | 49 | */ |
56 | @ApiModelProperty(name = "ajh", value = "档案号") | 50 | @ApiModelProperty(name = "ajh", value = "档案号") |
57 | private String ajh; | 51 | private String ajh; |
52 | |||
58 | /** | 53 | /** |
59 | * 业务号 | 54 | * 业务号 |
60 | */ | 55 | */ |
61 | @ApiModelProperty(name = "ywh", value = "业务号") | 56 | @ApiModelProperty(name = "ywh", value = "业务号") |
62 | private String ywh; | 57 | private String ywh; |
58 | |||
63 | /** | 59 | /** |
64 | * 不动产单元号 | 60 | * 不动产单元号数量 |
65 | */ | 61 | */ |
66 | @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") | 62 | @ApiModelProperty(name = "bdcdyNum", value = "不动产单元号数量") |
67 | private String bdcdyh; | 63 | private String bdcdyNum; |
64 | |||
68 | /** | 65 | /** |
69 | * 权利人 | 66 | * 权利人 |
70 | */ | 67 | */ |
71 | @ApiModelProperty(name = "qlr", value = "权利人") | 68 | @ApiModelProperty(name = "qlr", value = "权利人") |
72 | private String qlr; | 69 | private String qlr; |
70 | |||
73 | /** | 71 | /** |
74 | * 义务人 | 72 | * 义务人 |
75 | */ | 73 | */ |
76 | @ApiModelProperty(name = "ywr", value = "义务人") | 74 | @ApiModelProperty(name = "ywr", value = "义务人") |
77 | private String ywr; | 75 | private String ywr; |
76 | |||
78 | /** | 77 | /** |
79 | * 不动产证件号码 | 78 | * 不动产证件号码 |
80 | */ | 79 | */ |
81 | @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码") | 80 | @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码") |
82 | private String bdcqzh; | 81 | private String bdcqzh; |
82 | |||
83 | /** | 83 | /** |
84 | * 不动产单元号数量 | 84 | * 补录时间 |
85 | */ | ||
86 | @ApiModelProperty(name = "createTime", value = "补录时间") | ||
87 | @DateTimeFormat(pattern = "yyyy-MM-dd") | ||
88 | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") | ||
89 | private Date createTime; | ||
90 | |||
91 | /** | ||
92 | * 补录人 | ||
93 | */ | ||
94 | @ApiModelProperty(name = "creater", value = "补录人") | ||
95 | private String creater; | ||
96 | |||
97 | /** | ||
98 | * 不动产单元号 | ||
85 | */ | 99 | */ |
86 | @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量") | 100 | @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") |
87 | private String bdcdy_num; | 101 | private String bdcdyh; |
88 | 102 | ||
89 | } | 103 | } | ... | ... |
... | @@ -2,11 +2,14 @@ package com.pashanhoo.replenish.entity.vo; | ... | @@ -2,11 +2,14 @@ package com.pashanhoo.replenish.entity.vo; |
2 | 2 | ||
3 | import java.util.Date; | 3 | import java.util.Date; |
4 | import java.io.Serializable; | 4 | import java.io.Serializable; |
5 | |||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
5 | import io.swagger.annotations.ApiModel; | 7 | import io.swagger.annotations.ApiModel; |
6 | import io.swagger.annotations.ApiModelProperty; | 8 | import io.swagger.annotations.ApiModelProperty; |
7 | import lombok.Data; | 9 | import lombok.Data; |
8 | import lombok.EqualsAndHashCode; | 10 | import lombok.EqualsAndHashCode; |
9 | import com.pashanhoo.common.PageInfo; | 11 | import com.pashanhoo.common.PageInfo; |
12 | import org.springframework.format.annotation.DateTimeFormat; | ||
10 | 13 | ||
11 | /** | 14 | /** |
12 | * <p> | 15 | * <p> |
... | @@ -30,15 +33,11 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial | ... | @@ -30,15 +33,11 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial |
30 | private String ywh; | 33 | private String ywh; |
31 | 34 | ||
32 | /** | 35 | /** |
33 | * 登记业务编码 | 36 | * 权利类型 |
34 | */ | ||
35 | @ApiModelProperty(name = "djywbm", value = "登记业务编码") | ||
36 | private String djywbm; | ||
37 | /** | ||
38 | * 登记业务名称 | ||
39 | */ | 37 | */ |
40 | @ApiModelProperty(name = "djywmc", value = "登记业务名称") | 38 | @ApiModelProperty(name = "qllx", value = "权利类型") |
41 | private String djywmc; | 39 | private String qllx; |
40 | |||
42 | /** | 41 | /** |
43 | * 登记类型 | 42 | * 登记类型 |
44 | */ | 43 | */ |
... | @@ -46,22 +45,17 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial | ... | @@ -46,22 +45,17 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial |
46 | private String djlx; | 45 | private String djlx; |
47 | 46 | ||
48 | /** | 47 | /** |
49 | * 补录时间 | ||
50 | */ | ||
51 | @ApiModelProperty(name = "xgsj", value = "补录时间") | ||
52 | private Date xgsj; | ||
53 | |||
54 | /** | ||
55 | *补录人 | 48 | *补录人 |
56 | */ | 49 | */ |
57 | @ApiModelProperty(name = "xgr", value = "补录人") | 50 | @ApiModelProperty(name = "creater", value = "补录人") |
58 | private String xgr; | 51 | private String creater; |
59 | 52 | ||
60 | /** | 53 | /** |
61 | * 备注 | 54 | * 补录时间 |
62 | */ | 55 | */ |
63 | @ApiModelProperty(name = "bz", value = "备注") | 56 | @ApiModelProperty(name = "createTime", value = "补录时间") |
64 | private String bz; | 57 | @DateTimeFormat(pattern = "yyyy-MM-dd") |
65 | 58 | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") | |
59 | private Date createTime; | ||
66 | 60 | ||
67 | } | 61 | } | ... | ... |
... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; | ... | @@ -2,10 +2,13 @@ package com.pashanhoo.replenish.entity.vo; |
2 | 2 | ||
3 | import java.util.Date; | 3 | import java.util.Date; |
4 | import java.io.Serializable; | 4 | import java.io.Serializable; |
5 | |||
6 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
5 | import io.swagger.annotations.ApiModel; | 7 | import io.swagger.annotations.ApiModel; |
6 | import io.swagger.annotations.ApiModelProperty; | 8 | import io.swagger.annotations.ApiModelProperty; |
7 | import lombok.Data; | 9 | import lombok.Data; |
8 | import lombok.EqualsAndHashCode; | 10 | import lombok.EqualsAndHashCode; |
11 | import org.springframework.format.annotation.DateTimeFormat; | ||
9 | 12 | ||
10 | /** | 13 | /** |
11 | * <p> | 14 | * <p> |
... | @@ -41,16 +44,18 @@ public class UpdateDgArchivesReplenishRequest implements Serializable { | ... | @@ -41,16 +44,18 @@ public class UpdateDgArchivesReplenishRequest implements Serializable { |
41 | private String blbh; | 44 | private String blbh; |
42 | 45 | ||
43 | /** | 46 | /** |
44 | * 修改时间 | 47 | *补录人 |
45 | */ | 48 | */ |
46 | @ApiModelProperty(name = "xgsj", value = "修改时间") | 49 | @ApiModelProperty(name = "creater", value = "补录人") |
47 | private Date xgsj; | 50 | private String creater; |
48 | 51 | ||
49 | /** | 52 | /** |
50 | * 修改人 | 53 | * 补录时间 |
51 | */ | 54 | */ |
52 | @ApiModelProperty(name = "xgr", value = "修改人") | 55 | @ApiModelProperty(name = "createTime", value = "补录时间") |
53 | private String xgr; | 56 | @DateTimeFormat(pattern = "yyyy-MM-dd") |
57 | @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") | ||
58 | private Date createTime; | ||
54 | 59 | ||
55 | /** | 60 | /** |
56 | * 备注 | 61 | * 备注 | ... | ... |
... | @@ -2,11 +2,12 @@ package com.pashanhoo.replenish.mapper; | ... | @@ -2,11 +2,12 @@ package com.pashanhoo.replenish.mapper; |
2 | 2 | ||
3 | 3 | ||
4 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | 4 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
5 | import com.baomidou.mybatisplus.core.metadata.IPage; | ||
5 | import com.pashanhoo.replenish.entity.DgArchivesReplenishDO; | 6 | import com.pashanhoo.replenish.entity.DgArchivesReplenishDO; |
6 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; | 7 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; |
7 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; | 8 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; |
9 | import org.apache.ibatis.annotations.Param; | ||
8 | 10 | ||
9 | import java.util.List; | ||
10 | 11 | ||
11 | /** | 12 | /** |
12 | * <p> | 13 | * <p> |
... | @@ -18,6 +19,6 @@ import java.util.List; | ... | @@ -18,6 +19,6 @@ import java.util.List; |
18 | */ | 19 | */ |
19 | public interface DgArchivesReplenishMapper extends BaseMapper<DgArchivesReplenishDO> { | 20 | public interface DgArchivesReplenishMapper extends BaseMapper<DgArchivesReplenishDO> { |
20 | 21 | ||
21 | List<DgArchivesReplenishListVO> search(DgArchivesReplenishSearchRequest searchRequest); | 22 | IPage<DgArchivesReplenishListVO> search(@Param("pageParam") IPage<DgArchivesReplenishListVO> pageParam, @Param("request") DgArchivesReplenishSearchRequest request); |
22 | 23 | ||
23 | } | 24 | } | ... | ... |
1 | package com.pashanhoo.replenish.service; | 1 | package com.pashanhoo.replenish.service; |
2 | 2 | ||
3 | 3 | ||
4 | import com.baomidou.mybatisplus.core.metadata.IPage; | ||
4 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | 5 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
5 | import com.baomidou.mybatisplus.extension.service.IService; | 6 | import com.baomidou.mybatisplus.extension.service.IService; |
6 | import com.pashanhoo.common.Result; | 7 | import com.pashanhoo.common.Result; |
7 | import com.pashanhoo.replenish.entity.*; | 8 | import com.pashanhoo.replenish.entity.*; |
8 | import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; | 9 | import com.pashanhoo.replenish.entity.vo.*; |
9 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO; | ||
10 | import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; | ||
11 | import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest; | ||
12 | 10 | ||
13 | /** | 11 | /** |
14 | * <p> | 12 | * <p> |
... | @@ -45,5 +43,5 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish | ... | @@ -45,5 +43,5 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish |
45 | * @param request | 43 | * @param request |
46 | * @return | 44 | * @return |
47 | */ | 45 | */ |
48 | Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request); | 46 | IPage<DgArchivesReplenishListVO> searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request); |
49 | } | 47 | } | ... | ... |
1 | package com.pashanhoo.replenish.service.impl; | 1 | package com.pashanhoo.replenish.service.impl; |
2 | 2 | ||
3 | 3 | ||
4 | import com.baomidou.mybatisplus.core.metadata.IPage; | ||
5 | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||
4 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | 6 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
5 | import com.github.pagehelper.PageHelper; | 7 | import com.github.pagehelper.PageHelper; |
6 | import com.github.pagehelper.PageInfo; | 8 | import com.github.pagehelper.PageInfo; |
... | @@ -34,6 +36,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen | ... | @@ -34,6 +36,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen |
34 | 36 | ||
35 | /** | 37 | /** |
36 | * 新增记录 | 38 | * 新增记录 |
39 | * | ||
37 | * @param request | 40 | * @param request |
38 | * @return | 41 | * @return |
39 | */ | 42 | */ |
... | @@ -45,6 +48,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen | ... | @@ -45,6 +48,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen |
45 | 48 | ||
46 | /** | 49 | /** |
47 | * 根据主键查询记录详情 | 50 | * 根据主键查询记录详情 |
51 | * | ||
48 | * @param id | 52 | * @param id |
49 | * @return | 53 | * @return |
50 | */ | 54 | */ |
... | @@ -56,6 +60,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen | ... | @@ -56,6 +60,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen |
56 | 60 | ||
57 | /** | 61 | /** |
58 | * 修改单条记录 | 62 | * 修改单条记录 |
63 | * | ||
59 | * @param request | 64 | * @param request |
60 | * @return | 65 | * @return |
61 | */ | 66 | */ |
... | @@ -67,15 +72,15 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen | ... | @@ -67,15 +72,15 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen |
67 | 72 | ||
68 | /** | 73 | /** |
69 | * 根据条件进行列表查询 | 74 | * 根据条件进行列表查询 |
75 | * | ||
70 | * @param request | 76 | * @param request |
71 | * @return | 77 | * @return |
72 | */ | 78 | */ |
73 | @Override | 79 | @Override |
74 | public Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) { | 80 | public IPage<DgArchivesReplenishListVO> searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) { |
75 | PageHelper.startPage(request.getCurrentPage(), request.getPageSize()); | 81 | |
76 | List<DgArchivesReplenishListVO> list= dgarchivesreplenishMapper.search(request); | 82 | IPage<DgArchivesReplenishListVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize()); |
77 | PageInfo<DgArchivesReplenishListVO> pageInfo = new PageInfo<DgArchivesReplenishListVO>(list); | 83 | return dgarchivesreplenishMapper.search(pageParam, request); |
78 | return Result.ok(pageInfo); | ||
79 | } | 84 | } |
80 | 85 | ||
81 | } | 86 | } | ... | ... |
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | <mapper namespace="com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper"> | 3 | <mapper namespace="com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper"> |
4 | |||
5 | <!-- 通用查询映射结果 --> | 4 | <!-- 通用查询映射结果 --> |
6 | <resultMap id="BaseResultMap" type="com.pashanhoo.replenish.entity.DgArchivesReplenishDO"> | 5 | <resultMap id="BaseResultMap" type="com.pashanhoo.replenish.entity.DgArchivesReplenishDO"> |
7 | <id column="BSM_MODIFY" property="bsmModify" /> | 6 | <id column="BSM_MODIFY" property="bsmModify"/> |
8 | <result column="BSM_ARCHIVES" property="bsmArchives" /> | 7 | <result column="BSM_ARCHIVES" property="bsmArchives"/> |
9 | <result column="BLBH" property="blbh" /> | 8 | <result column="BLBH" property="blbh"/> |
10 | <result column="XGSJ" property="xgsj" /> | 9 | <result column="CREATETIME" property="createTime"/> |
11 | <result column="XGR" property="xgr" /> | 10 | <result column="CREATER" property="creater"/> |
12 | <result column="BZ" property="bz" /> | 11 | <result column="BZ" property="bz"/> |
13 | </resultMap> | ||
14 | <!-- 通用查询映射结果 --> | ||
15 | <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO"> | ||
16 | <id column="BSM_ARCHIVES" property="bsm_archives" /> | ||
17 | <result column="XGSJ" property="xgsj" /> | ||
18 | <result column="XGR" property="xgr" /> | ||
19 | <result column="DJLX" property="djlx" /> | ||
20 | <result column="DJJGMC" property="djjgmc" /> | ||
21 | <result column="AJH" property="ajh" /> | ||
22 | <result column="YWH" property="ywh" /> | ||
23 | <result column="BDCDYH" property="bdcdyh" /> | ||
24 | <result column="QLR" property="qlr" /> | ||
25 | <result column="YWR" property="ywr" /> | ||
26 | <result column="BDCQZH" property="bdcqzh" /> | ||
27 | <result column="BDCDY_NUM" property="bdcdy_num" /> | ||
28 | </resultMap> | 12 | </resultMap> |
29 | 13 | ||
30 | <!-- 通用查询结果列 --> | 14 | <select id="search" resultType="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO"> |
31 | <sql id="Base_Column_List"> | 15 | select DB.QLLX, |
32 | BSM_MODIFY, BSM_ARCHIVES, BLBH, XGSJ, XGR, BZ | 16 | DB.DJLX, |
33 | </sql> | 17 | DA.AJH, |
34 | <select id="search" resultMap="SearchResultMap"> | 18 | DB.YWH, |
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 | 19 | BDCDY.BDCDYH, |
36 | from dg_archives_replenish a, dg_business b, dg_bdcdy c,dg_archives d | 20 | BDCDY.QLR, |
37 | where a.bsm_archives = d.bsm_archives | 21 | BDCDY.YWR, |
38 | and a.bsm_archives=d.bsm_archives | 22 | BDCDY.BDCQZH, |
39 | and c.bsm_archives=d.bsm_archives | 23 | DGR.CREATETIME, |
40 | <if test="ywh != null and ywh!='' "> | 24 | DGR.CREATER, |
41 | and b.ywh=#{ywh,jdbcType=VARCHAR} | 25 | count(*) over (partition by BDCDY.bdcdyh) as bdcdyNum |
42 | </if> | 26 | from DG_REPLENISH DGR |
43 | <if test="djjgbm != null and djjgbm!='' "> | 27 | join DG_ARCHIVES DA on DA.BSM_ARCHIVES = DGR.BSM_ARCHIVES |
44 | and b.djjgbm=#{djjgbm,jdbcType=VARCHAR} | 28 | join DG_BDCDY BDCDY on BDCDY.BSM_ARCHIVES = DGR.BSM_ARCHIVES |
45 | </if> | 29 | join DG_BUSINESS DB on DB.BSM_ARCHIVES = DGR.BSM_ARCHIVES |
46 | <if test="djlx != null and djlx!='' "> | 30 | <where> |
47 | and b.djlx=#{djlx,jdbcType=VARCHAR} | 31 | <if test="request.ywh != null and request.ywh != ''"> |
48 | </if> | 32 | DB.YWH = #{request.ywh,jdbcType=VARCHAR} |
49 | <if test="xgr != null and xgr!='' "> | 33 | </if> |
50 | and a.xgr=#{xgr,jdbcType=VARCHAR} | 34 | <if test="request.qllx != null and request.qllx != ''"> |
51 | </if> | 35 | and DB.QLLX = #{request.qllx,jdbcType=VARCHAR} |
52 | <if test="xgsj != null and xgsj!='' "> | 36 | </if> |
53 | and a.xgsj=#{xgsj,jdbcType=VARCHAR} | 37 | <if test="request.djlx != null and request.djlx != ''"> |
54 | </if> | 38 | and DB.DJLX = #{request.djlx,jdbcType=VARCHAR} |
55 | 39 | </if> | |
40 | <if test="request.creater != null and request.creater != ''"> | ||
41 | and DGR.CREATER = #{request.creater,jdbcType=VARCHAR} | ||
42 | </if> | ||
43 | <if test="request.createTime != null"> | ||
44 | and DGR.CREATETIME = #{request.createTime,jdbcType=TIMESTAMP} | ||
45 | </if> | ||
46 | </where> | ||
56 | </select> | 47 | </select> |
57 | </mapper> | 48 | </mapper> | ... | ... |
-
Please register or sign in to post a comment