胡轶钦 5 lat temu
rodzic
commit
db05a1156f

+ 10
- 15
src/main/java/com/huiju/estateagents/controller/TaDocumentVerifyController.java Wyświetl plik

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

+ 3
- 0
src/main/java/com/huiju/estateagents/entity/TaDocumentVerifyModel.java Wyświetl plik

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
+import lombok.Data;
3
+
2
 import java.io.Serializable;
4
 import java.io.Serializable;
3
 import java.time.LocalDateTime;
5
 import java.time.LocalDateTime;
4
 
6
 
10
  * @author jobob
12
  * @author jobob
11
  * @since 2019-10-23
13
  * @since 2019-10-23
12
  */
14
  */
15
+@Data
13
 public class TaDocumentVerifyModel implements Serializable {
16
 public class TaDocumentVerifyModel implements Serializable {
14
 
17
 
15
     private static final long serialVersionUID = 1L;
18
     private static final long serialVersionUID = 1L;