|
@@ -12,6 +12,7 @@ import com.huiju.estateagents.event.EventBus;
|
12
|
12
|
import com.huiju.estateagents.service.ITaDocumentImgService;
|
13
|
13
|
import com.huiju.estateagents.service.ITaDocumentVerifyService;
|
14
|
14
|
import com.huiju.estateagents.service.ITaPersonService;
|
|
15
|
+import io.swagger.models.auth.In;
|
15
|
16
|
import org.apache.ibatis.annotations.Param;
|
16
|
17
|
import org.slf4j.Logger;
|
17
|
18
|
import org.slf4j.LoggerFactory;
|
|
@@ -110,11 +111,11 @@ public class TaDocumentVerifyController extends BaseController {
|
110
|
111
|
|
111
|
112
|
/**
|
112
|
113
|
* 保存对象
|
113
|
|
- * @param list List<TaDocumentImg>
|
|
114
|
+ * @param documentVerify List<TaDocumentImg>
|
114
|
115
|
* @return
|
115
|
116
|
*/
|
116
|
117
|
@RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
|
117
|
|
- public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list,@RequestParam(value ="documentTitle",required = false)String documentTitle, HttpServletRequest request){
|
|
118
|
+ public ResponseBean wxDocumentVerifyAdd(@RequestBody TaDocumentVerify documentVerify, HttpServletRequest request){
|
118
|
119
|
ResponseBean responseBean = new ResponseBean();
|
119
|
120
|
Integer orgId = getOrgId(request);
|
120
|
121
|
String openid = getOpenId(request);
|
|
@@ -123,13 +124,12 @@ public class TaDocumentVerifyController extends BaseController {
|
123
|
124
|
return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
|
124
|
125
|
}
|
125
|
126
|
TaPerson person = taPersons.get(0);
|
126
|
|
- TaDocumentVerify documentVerify = new TaDocumentVerify();
|
127
|
127
|
documentVerify.setCreateDate(LocalDateTime.now());
|
128
|
128
|
documentVerify.setOrgId(orgId);
|
129
|
129
|
documentVerify.setPersonId(person.getPersonId());
|
130
|
130
|
documentVerify.setStatus(CommConstant.STATUS_NORMAL);
|
131
|
131
|
documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
|
132
|
|
- documentVerify.setDocumentTitle(documentTitle);
|
|
132
|
+ List<TaDocumentImg>list = documentVerify.getImgList();
|
133
|
133
|
try {
|
134
|
134
|
if (iTaDocumentVerifyService.save(documentVerify)){
|
135
|
135
|
for(int i =0; i<list.size();i++){
|
|
@@ -200,13 +200,11 @@ public class TaDocumentVerifyController extends BaseController {
|
200
|
200
|
/**
|
201
|
201
|
* 微信修改对象
|
202
|
202
|
* @param id 实体ID
|
203
|
|
- * @param list List<TaDocumentImg>
|
204
|
203
|
* @return
|
205
|
204
|
*/
|
206
|
205
|
@RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
|
207
|
206
|
public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
|
208
|
|
- @RequestBody List<TaDocumentImg>list,
|
209
|
|
- @RequestParam(value ="documentTitle",required = false)String documentTitle,
|
|
207
|
+ @RequestBody TaDocumentVerify documentVerify,
|
210
|
208
|
HttpServletRequest request){
|
211
|
209
|
ResponseBean responseBean = new ResponseBean();
|
212
|
210
|
Integer orgId = getOrgId(request);
|
|
@@ -216,11 +214,9 @@ public class TaDocumentVerifyController extends BaseController {
|
216
|
214
|
return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
|
217
|
215
|
}
|
218
|
216
|
TaPerson person = taPersons.get(0);
|
219
|
|
- TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
|
|
217
|
+ documentVerify.setDocumentVerifyId(id);
|
220
|
218
|
documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
|
221
|
|
- if(!StringUtils.isEmpty(documentTitle)){
|
222
|
|
- documentVerify.setDocumentTitle(documentTitle);
|
223
|
|
- }
|
|
219
|
+ List<TaDocumentImg>list = documentVerify.getImgList();
|
224
|
220
|
try {
|
225
|
221
|
if (iTaDocumentVerifyService.updateById(documentVerify)){
|
226
|
222
|
QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
|
|
@@ -258,9 +254,8 @@ public class TaDocumentVerifyController extends BaseController {
|
258
|
254
|
HttpServletRequest request){
|
259
|
255
|
ResponseBean responseBean = new ResponseBean();
|
260
|
256
|
if (documentVerify.getVerifyStatus().equals(CommConstant.STATUS_NORMAL)){
|
261
|
|
- String personId = getPersonId(request);
|
262
|
|
- TaPerson person = taPersonService.getById(personId);
|
263
|
|
- documentVerify.setVerifyUser(person.getUserId().toString());
|
|
257
|
+ Integer userId = getUserId(request);
|
|
258
|
+ documentVerify.setVerifyUser(userId.toString());
|
264
|
259
|
}
|
265
|
260
|
try {
|
266
|
261
|
documentVerify.setDocumentVerifyId(id);
|
|
@@ -294,7 +289,7 @@ public class TaDocumentVerifyController extends BaseController {
|
294
|
289
|
@RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
|
295
|
290
|
public ResponseBean documentVerifyGet(@PathVariable String id,
|
296
|
291
|
@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
|
297
|
|
- @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
|
|
292
|
+ @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize,
|
298
|
293
|
HttpServletRequest request){
|
299
|
294
|
ResponseBean responseBean = new ResponseBean();
|
300
|
295
|
try {
|