Commit 2454c494d87c6bd40e9e751eb1d488d87d3a67db
1 parent
fefd1cc5
Exists in
dev
开发:区域划分删除、会员审核详情
Showing
13 changed files
with
127 additions
and
2 deletions
Show diff stats
backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java
... | ... | @@ -303,4 +303,9 @@ public class WHyxx extends BaseModel<WHyxx> { |
303 | 303 | @TableField("F_tjsmrzsj") |
304 | 304 | @JsonProperty("fTjsmrzsj") |
305 | 305 | private LocalDateTime fTjsmrzsj; |
306 | + | |
307 | + @ApiModelProperty(value = "理由") | |
308 | + @TableField("F_ly") | |
309 | + @JsonProperty("fLy") | |
310 | + private String fLy; | |
306 | 311 | } | ... | ... |
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java
... | ... | @@ -94,4 +94,19 @@ public class MHyxxController extends BaseController<MHyxxManager, WHyxx> { |
94 | 94 | } |
95 | 95 | return CommonResult.<String>ok().message("审核成功"); |
96 | 96 | } |
97 | + | |
98 | + @GetMapping(value = "/detail/{id}") | |
99 | + @ApiOperation(value = "会员认证详情", httpMethod = "POST", notes = "会员认证详情") | |
100 | + public CommonResult<Object> detail(@PathVariable("id") String id) throws Exception { | |
101 | + if (ObjectUtils.isEmpty(id) ) { | |
102 | + return CommonResult.error("请传入会员id"); | |
103 | + } | |
104 | + Object detail = new Object(); | |
105 | + try { | |
106 | + detail = mHyxxManager.detail(id); | |
107 | + } catch (Exception e) { | |
108 | + return CommonResult.error(e.getMessage()); | |
109 | + } | |
110 | + return CommonResult.<Object>ok().value(detail); | |
111 | + } | |
97 | 112 | } | ... | ... |
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java
... | ... | @@ -10,6 +10,8 @@ import com.hotent.lpg.manage.manager.MStationRegionalDivisionManager; |
10 | 10 | import io.swagger.annotations.ApiOperation; |
11 | 11 | import io.swagger.annotations.ApiParam; |
12 | 12 | import lombok.extern.slf4j.Slf4j; |
13 | +import org.apache.ibatis.annotations.Param; | |
14 | +import org.springframework.beans.factory.annotation.Autowired; | |
13 | 15 | import org.springframework.web.bind.annotation.*; |
14 | 16 | |
15 | 17 | /** |
... | ... | @@ -90,4 +92,16 @@ public class MStationRegionalDivisionController extends BaseController<MStationR |
90 | 92 | } |
91 | 93 | return CommonResult.<String>ok().message(msg); |
92 | 94 | } |
95 | + | |
96 | + @RequestMapping(value = "/delById/{id}", method = RequestMethod.DELETE, produces={"application/json; charset=utf-8" }) | |
97 | + @ApiOperation(value = "删除区域划分信息", httpMethod = "DELETE", notes = "删除区域划分信息") | |
98 | + public CommonResult<Object> delById(@PathVariable("id") String id) { | |
99 | + WStationRegionalDivision ws = baseService.getById(id); | |
100 | + if (ObjectUtils.isEmpty(ws)) { | |
101 | + return CommonResult.error("区域信息不存在"); | |
102 | + } | |
103 | + baseService.removeById(id); | |
104 | + baseService.removeWStationRegionalDivisionById(ws.getRefId()); | |
105 | + return CommonResult.ok().message("操作成功"); | |
106 | + } | |
93 | 107 | } | ... | ... |
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java
... | ... | @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; |
26 | 26 | import org.springframework.transaction.annotation.Transactional; |
27 | 27 | |
28 | 28 | import java.time.LocalDateTime; |
29 | +import java.util.HashMap; | |
29 | 30 | import java.util.List; |
30 | 31 | import java.util.UUID; |
31 | 32 | |
... | ... | @@ -146,6 +147,31 @@ public class MHyxxManagerImpl extends BaseManagerImpl<MHyxxDao, WHyxx> implement |
146 | 147 | throw new RuntimeException("会员信息不存在,会员id=" + wHyxx.getId()); |
147 | 148 | } |
148 | 149 | data.setFRzzt(RzztEnum.valueOf(wHyxx.getFRzzt()).getInfo()); |
150 | + data.setFLy(wHyxx.getFLy()); | |
149 | 151 | baseMapper.updateById(data); |
150 | 152 | } |
153 | + | |
154 | + @Override | |
155 | + public Object detail(String id) { | |
156 | + WHyxx wHyxx = baseMapper.selectById(id); | |
157 | +// HashMap<String, Object> result = new HashMap<>(); | |
158 | +// result.put("id", id); | |
159 | +// result.put("hylx", wHyxx.getFHylx()); | |
160 | +// result.put("sfzrxy", wHyxx.getFSfzrxy());//个人身份证 | |
161 | +// result.put("sfzghy", wHyxx.getFSfzghy());//个人身份证 | |
162 | +// result.put("sfzh", wHyxx.getFSfzh());//身份证号 | |
163 | +// result.put("frsfzghy", wHyxx.getFFrsfzghy());//法人身份证 | |
164 | +// result.put("frsfzghy", wHyxx.getFFrsfzghy());//法人身份证 | |
165 | +// result.put("xm", wHyxx.getFXm());//姓名 | |
166 | +// result.put("xb", wHyxx.getFXb());//性别 | |
167 | +// result.put("symc", wHyxx.getFSymc());//商业名称 | |
168 | +// result.put("sjh", wHyxx.getFSjh());//联系方式 | |
169 | +// result.put("nl", wHyxx.getFNl());//年龄 | |
170 | +// result.put("sfzhyxq", wHyxx.getFSfzhyxq());//身份证有效期 | |
171 | +// result.put("shtysbm", wHyxx.getFShtysbm());//统一社会信用代码 | |
172 | +// result.put("rzzt", wHyxx.getFRzzt());//认证状态 | |
173 | +// result.put("yyzz", wHyxx.getFYyzz());//营业执照 | |
174 | +// result.put("khxkz", wHyxx.getFKhxkz());//开户许可证 | |
175 | + return wHyxx; | |
176 | + } | |
151 | 177 | } | ... | ... |
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java
... | ... | @@ -88,6 +88,11 @@ public class MStationRegionalDivisionManagerImpl extends BaseManagerImpl<MStatio |
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | + @Override | |
92 | + public int removeWStationRegionalDivisionById(String id) { | |
93 | + return baseMapper.removeWStationRegionalDivisionById(id); | |
94 | + } | |
95 | + | |
91 | 96 | /** |
92 | 97 | * 新增修改点、线、多边形、矩形坐标信息 |
93 | 98 | * | ... | ... |
backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml
... | ... | @@ -60,6 +60,7 @@ |
60 | 60 | <result column="F_ssqyID" property="fSsqyID"/> |
61 | 61 | <result column="F_ssqymc" property="fSsqymc"/> |
62 | 62 | <result column="F_tjsmrzsj" property="fTjsmrzsj"/> |
63 | + <result column="F_ly" property="fLy"/> | |
63 | 64 | </resultMap> |
64 | 65 | |
65 | 66 | <!-- 通用查询结果列 --> |
... | ... | @@ -119,7 +120,8 @@ |
119 | 120 | F_rzzt, |
120 | 121 | F_ssqyID, |
121 | 122 | F_ssqymc, |
122 | - F_tjsmrzsj | |
123 | + F_tjsmrzsj, | |
124 | + F_ly | |
123 | 125 | </sql> |
124 | 126 | |
125 | 127 | <select id="selectPage" resultMap="BaseResultMap"> | ... | ... |
backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java
0 → 100644
... | ... | @@ -0,0 +1,43 @@ |
1 | +package com.hotent.lpg.user.controller; | |
2 | + | |
3 | + | |
4 | +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; | |
5 | +import com.hotent.base.controller.BaseController; | |
6 | +import com.hotent.base.model.CommonResult; | |
7 | +import com.hotent.lpg.common.model.WHyxx; | |
8 | +import com.hotent.lpg.user.manager.HyxxManager; | |
9 | +import io.swagger.annotations.ApiOperation; | |
10 | +import org.springframework.beans.factory.annotation.Autowired; | |
11 | +import org.springframework.web.bind.annotation.GetMapping; | |
12 | +import org.springframework.web.bind.annotation.PathVariable; | |
13 | +import org.springframework.web.bind.annotation.RequestMapping; | |
14 | +import org.springframework.web.bind.annotation.RestController; | |
15 | + | |
16 | + | |
17 | +/** | |
18 | + * @author 超级管理员 | |
19 | + * @company 广州宏天软件股份有限公司 | |
20 | + * @since 2024-03-12 | |
21 | + */ | |
22 | +@RestController | |
23 | +@RequestMapping("/user/mHyxx/v1/") | |
24 | +public class HyxxController extends BaseController<HyxxManager, WHyxx> { | |
25 | + | |
26 | + @Autowired | |
27 | + private HyxxManager hyxxManager; | |
28 | + | |
29 | + @GetMapping(value = "/detail/{id}") | |
30 | + @ApiOperation(value = "会员认证详情", httpMethod = "POST", notes = "会员认证详情") | |
31 | + public CommonResult<Object> detail(@PathVariable("id") String id) throws Exception { | |
32 | + if (ObjectUtils.isEmpty(id)) { | |
33 | + return CommonResult.error("请传入会员id"); | |
34 | + } | |
35 | + Object detail = new Object(); | |
36 | + try { | |
37 | + detail = hyxxManager.detail(id); | |
38 | + } catch (Exception e) { | |
39 | + return CommonResult.error(e.getMessage()); | |
40 | + } | |
41 | + return CommonResult.<Object>ok().value(detail); | |
42 | + } | |
43 | +} | ... | ... |
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java
... | ... | @@ -260,5 +260,9 @@ public class HyxxManagerImpl extends BaseManagerImpl<HyxxDao, WHyxx> implements |
260 | 260 | wHyxx.setFHtzzcode(USER_ORG_CODE); |
261 | 261 | return wHyxx; |
262 | 262 | } |
263 | - | |
263 | + @Override | |
264 | + public Object detail(String id) { | |
265 | + WHyxx wHyxx = baseMapper.selectById(id); | |
266 | + return wHyxx; | |
267 | + } | |
264 | 268 | } | ... | ... |