bug fix

pom.xml

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

src/main/java/com/huiju/estateagents/controller/HelpInitiateRecordController.java

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

src/main/java/com/huiju/estateagents/controller/TaDocumentVerifyController.java

@@ -12,6 +12,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
 import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,11 +111,11 @@ public class TaDocumentVerifyController extends BaseController {
 
     /**
      * 保存对象
-     * @param list List<TaDocumentImg>
+     * @param documentVerify List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list,@RequestParam(value ="documentTitle",required = false)String documentTitle, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody TaDocumentVerify documentVerify, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -123,13 +124,12 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = new TaDocumentVerify();
         documentVerify.setCreateDate(LocalDateTime.now());
         documentVerify.setOrgId(orgId);
         documentVerify.setPersonId(person.getPersonId());
         documentVerify.setStatus(CommConstant.STATUS_NORMAL);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
-        documentVerify.setDocumentTitle(documentTitle);
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
                 for(int i =0; i<list.size();i++){
@@ -200,13 +200,11 @@ public class TaDocumentVerifyController extends BaseController {
     /**
      * 微信修改对象
      * @param id  实体ID
-     * @param list List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
-                                               @RequestBody List<TaDocumentImg>list,
-                                               @RequestParam(value ="documentTitle",required = false)String documentTitle,
+                                               @RequestBody TaDocumentVerify documentVerify,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -216,11 +214,9 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+        documentVerify.setDocumentVerifyId(id);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
-        if(!StringUtils.isEmpty(documentTitle)){
-            documentVerify.setDocumentTitle(documentTitle);
-        }
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
                 QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
@@ -258,9 +254,8 @@ public class TaDocumentVerifyController extends BaseController {
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         if (documentVerify.getVerifyStatus().equals(CommConstant.STATUS_NORMAL)){
-            String personId = getPersonId(request);
-            TaPerson person = taPersonService.getById(personId);
-            documentVerify.setVerifyUser(person.getUserId().toString());
+            Integer userId = getUserId(request);
+            documentVerify.setVerifyUser(userId.toString());
         }
         try {
             documentVerify.setDocumentVerifyId(id);
@@ -294,7 +289,7 @@ public class TaDocumentVerifyController extends BaseController {
     @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
     public ResponseBean documentVerifyGet(@PathVariable String id,
                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize,
                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/entity/TaDocumentVerifyModel.java

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

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

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

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

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