张延森 5 anni fa
parent
commit
365970344f

+ 1
- 1
pom.xml Vedi File

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.huiju</groupId>
12 12
 	<artifactId>estateagents</artifactId>
13
-	<version>v3.4.2</version>
13
+	<version>v3.4.4</version>
14 14
 	<name>estateages</name>
15 15
 	<description>置业经纪人</description>
16 16
 

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/HelpInitiateRecordController.java Vedi File

@@ -164,7 +164,7 @@ public class HelpInitiateRecordController extends BaseController {
164 164
      * @return
165 165
      */
166 166
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
167
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
167
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
168 168
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
169 169
                                                  HttpServletRequest request){
170 170
         String openid = getOpenId(request);

+ 10
- 15
src/main/java/com/huiju/estateagents/controller/TaDocumentVerifyController.java Vedi File

@@ -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 {

+ 1
- 5
src/main/java/com/huiju/estateagents/entity/TaDocumentVerifyModel.java Vedi File

@@ -1,8 +1,5 @@
1 1
 package com.huiju.estateagents.entity;
2 2
 import lombok.Data;
3
-import lombok.EqualsAndHashCode;
4
-import lombok.experimental.Accessors;
5
-
6 3
 import java.io.Serializable;
7 4
 import java.time.LocalDateTime;
8 5
 
@@ -15,8 +12,7 @@ import java.time.LocalDateTime;
15 12
  * @since 2019-10-23
16 13
  */
17 14
 @Data
18
-@EqualsAndHashCode(callSuper = false)
19
-@Accessors(chain = true)
15
+
20 16
 public class TaDocumentVerifyModel implements Serializable {
21 17
 
22 18
     private static final long serialVersionUID = 1L;

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Vedi File

@@ -87,6 +87,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
87 87
         Page<TaBuilding> page = new Page<>();
88 88
         page.setSize(pageSize == null ? 10 : pageSize);
89 89
         page.setCurrent(pageNum == null ? 1 : pageNum);
90
+
90 91
         List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
91 92
 
92 93
         if (null != buildings) {

+ 1
- 0
src/main/resources/mapper/TaPersonIntentionRecordMapper.xml Vedi File

@@ -34,5 +34,6 @@
34 34
             </trim>
35 35
         GROUP BY
36 36
             tpir.person_id, tpir.building_id
37
+        ORDER BY SUM(tpir.intention) DESC
37 38
     </select>
38 39
 </mapper>