bug fix

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

@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -611,7 +612,11 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark, HttpServletRequest request){
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,
+                                                  @RequestParam Integer verifyStatus,
+                                                  @RequestParam(required = false) String verifyRemark,
+                                                  @RequestParam(required = false) String realtyConsultant,
+                                                  HttpServletRequest request){
         if (null == verifyStatus) {
             return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -623,14 +628,24 @@ public class TaRecommendCustomerController extends BaseController {
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
-                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
-                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
-                    }
+//                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
+//                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
+//                    }
                 }
 
                 // 审核不通过的时候，移除置业顾问选择
                 if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
                     taRecommendCustomer.setRealtyConsultant(null);
+                } else {
+                    if (null != realtyConsultant) {
+                        List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
+                        taRecommendCustomer.setRealtyConsultant(realtyConsultant);
+                        if (taBuildings != null && taBuildings.size() > 0) {
+                            TaBuilding taBuilding = taBuildings.get(0);
+                            taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
+                            taRecommendCustomer.setIntention(taBuilding.getBuildingName());
+                        }
+                    }
                 }
 
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){

src/main/java/com/huiju/estateagents/mapper/TaPersonBuildingMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPointsExchange;
@@ -23,4 +24,6 @@ public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
     List<TaPersonBuilding> selectListByParams(Page page, @Param("orgId")Integer orgId, @Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("personBuildingList")List<TaPersonBuilding> taPersonBuildingList);
 
     List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
+
+    List<TaBuilding> getBuildingsOf(@Param("personOrUser") String personOrUser);
 }

src/main/resources/mapper/TaPersonBuildingMapper.xml

@@ -63,4 +63,15 @@
         t.user_id
     </select>
 
+    <select id="getBuildingsOf" resultType="com.huiju.estateagents.entity.TaBuilding">
+        SELECT
+            t.*
+        FROM
+        ta_person_building t
+        JOIN ta_building s ON s.building_id = t.building_id
+        WHERE
+            t.person_id = #{personOrUser}
+            OR t.user_id = #{personOrUser}
+    </select>
+
 </mapper>