查询详情

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SettledCompanyInfoController.java

@@ -57,5 +57,16 @@ public class SettledCompanyInfoController {
         return settledCompanyInfoService.selectSettledCompanyInfo(settledCompanyInfo);
     }
 
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/getSettledCompanyInfo")
+    public SettledCompanyInfo getSettledCompanyInfo(String id){
+        return settledCompanyInfoService.getSettledCompanyInfo(id);
+    }
+
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SettledCompanyInfo.java

@@ -131,6 +131,10 @@ public class SettledCompanyInfo extends BaseModel<SettledCompanyInfo> {
 
     @TableField(exist = false)
     private List<SettledCompanyContacts> settledCompanyContacts;
+
+
+    @TableField(exist = false)
+    private List<SettledCompanyError> settledCompanyErrorList;
     /**
      * 查询类型
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISettledCompanyInfoService.java

@@ -37,4 +37,11 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
      */
     Page<SettledCompanyInfo> selectSettledCompanyInfo(SettledCompanyInfo settledCompanyInfo);
 
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    SettledCompanyInfo getSettledCompanyInfo(String id);
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyInfoServiceImpl.java

@@ -6,13 +6,11 @@ import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.SalePlanInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.SettledCompanyContacts;
-import com.yh.saas.plugin.yiliangyiyun.entity.SettledCompanyInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SettledCompanyInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyContactsService;
+import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyErrorService;
 import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +39,10 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     @Autowired
     private ISettledCompanyContactsService settledCompanyContactsService;
 
+
+    @Autowired
+    private ISettledCompanyErrorService settledCompanyErrorService;
+
     /**
      * 添加入住公司信息
      * @param settledCompanyInfo
@@ -131,6 +133,10 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         pageView.put("createPhone",settledCompanyInfo.getCreatePhone());
         pageView.put("mainBusinessType",settledCompanyInfo.getMainBusinessType());
         pageView.put("searchKeyWord",settledCompanyInfo.getSearchKeyWord());
+        pageView.put("province",settledCompanyInfo.getProvince());
+        pageView.put("city",settledCompanyInfo.getCity());
+        pageView.put("area",settledCompanyInfo.getArea());
+        pageView.put("detailedAddress",settledCompanyInfo.getDetailedAddress());
         pageView.put("searchType", settledCompanyInfo.getSearchType());
         pageView.put("pageSize",settledCompanyInfo.getPageSize());
         pageView.put("currentPage",settledCompanyInfo.getCurrentPage());
@@ -145,4 +151,25 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         return page;
     }
 
+    /**
+     * 查看详情
+     * @param id
+     * @return
+     */
+    @Override
+    public SettledCompanyInfo getSettledCompanyInfo(String id) {
+        //查看信息
+        SettledCompanyInfo settledCompanyInfo = this.selectById(id);
+        // 联系人
+        List<SettledCompanyContacts> settledCompanyContactsList = settledCompanyContactsService.selectList(new EntityWrapper<SettledCompanyContacts>()
+                .eq("info_id",settledCompanyInfo.getId()));
+        // 举报
+        List<SettledCompanyError> settledCompanyErrors = settledCompanyErrorService.selectList(new EntityWrapper<SettledCompanyError>()
+                .eq("info_id",settledCompanyInfo.getId()));
+        settledCompanyInfo.setSettledCompanyContacts(settledCompanyContactsList);
+        settledCompanyInfo.setSettledCompanyErrorList(settledCompanyErrors);
+        return settledCompanyInfo;
+    }
+
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -30,6 +30,18 @@
         <if test="showFlag != null and showFlag != ''">
             AND show_flag = #{showFlag}
         </if>
+        <if test="province != null and province != ''">
+            AND province = #{province}
+        </if>
+        <if test="city != null and city != ''">
+            AND city = #{city}
+        </if>
+        <if test="area != null and area != ''">
+            AND area = #{area}
+        </if>
+        <if test="detailedAddress != null and detailedAddress != ''">
+            AND (lower(detailed_address) like lower(CONCAT('%',#{detailedAddress},'%')))
+        </if>
         <if test="mainBusinessType != null and mainBusinessType != ''">
             AND main_business_type = #{mainBusinessType}
         </if>
@@ -80,6 +92,18 @@
         <if test="showFlag != null and showFlag != ''">
             AND show_flag = #{showFlag}
         </if>
+        <if test="province != null and province != ''">
+            AND province = #{province}
+        </if>
+        <if test="city != null and city != ''">
+            AND city = #{city}
+        </if>
+        <if test="area != null and area != ''">
+            AND area = #{area}
+        </if>
+        <if test="detailedAddress != null and detailedAddress != ''">
+            AND (lower(detailed_address) like lower(CONCAT('%',#{detailedAddress},'%')))
+        </if>
         <if test="mainBusinessType != null and mainBusinessType != ''">
             AND main_business_type = #{mainBusinessType}
         </if>