胡轶钦 5 лет назад
Родитель
Сommit
a60eb79c00

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaDocumentVerifyController.java Просмотреть файл

59
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
59
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
60
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
60
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
61
                                            @RequestParam(value ="name",required = false) String name,
61
                                            @RequestParam(value ="name",required = false) String name,
62
-                                           @RequestParam(value ="tel",required = false) String tel){
62
+                                           @RequestParam(value ="tel",required = false) String tel,
63
+                                           HttpServletRequest request){
63
         ResponseBean responseBean = new ResponseBean();
64
         ResponseBean responseBean = new ResponseBean();
64
         try {
65
         try {
65
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel);
66
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
66
             responseBean.addSuccess(result);
67
             responseBean.addSuccess(result);
67
         }catch (Exception e){
68
         }catch (Exception e){
68
             e.printStackTrace();
69
             e.printStackTrace();

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaDocumentVerifyMapper.java Просмотреть файл

17
 @Mapper
17
 @Mapper
18
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
18
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
19
 
19
 
20
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel);
20
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
21
 
21
 
22
 }
22
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaDocumentVerifyService.java Просмотреть файл

14
  */
14
  */
15
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
15
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
16
 
16
 
17
-    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel);
17
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
18
 
18
 
19
 }
19
 }

+ 8
- 3
src/main/java/com/huiju/estateagents/service/impl/TaDocumentVerifyServiceImpl.java Просмотреть файл

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
+import com.huiju.estateagents.entity.TaApartmentImg;
6
 import com.huiju.estateagents.entity.TaDocumentImg;
8
 import com.huiju.estateagents.entity.TaDocumentImg;
7
 import com.huiju.estateagents.entity.TaDocumentVerify;
9
 import com.huiju.estateagents.entity.TaDocumentVerify;
8
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
10
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
31
     TaDocumentImgMapper taDocumentImgMapper;
33
     TaDocumentImgMapper taDocumentImgMapper;
32
 
34
 
33
     @Override
35
     @Override
34
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel){
36
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
35
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
37
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
36
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel);
38
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
37
         List<Integer> idList = new ArrayList<>();
39
         List<Integer> idList = new ArrayList<>();
38
         for (int i = 0; i<data.getRecords().size();i++){
40
         for (int i = 0; i<data.getRecords().size();i++){
39
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
41
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
40
         }
42
         }
41
-        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
43
+        QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
44
+        imgQueryWrapper.in("document_verify_id",idList);
45
+        imgQueryWrapper.eq("org_id",orgId);
46
+        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
42
         for (int i = 0;i<data.getRecords().size();i++){
47
         for (int i = 0;i<data.getRecords().size();i++){
43
             List<TaDocumentImg>imgList = new ArrayList<>();
48
             List<TaDocumentImg>imgList = new ArrayList<>();
44
             for(int j = 0; j<allImgList.size();j++){
49
             for(int j = 0; j<allImgList.size();j++){

+ 1
- 0
src/main/resources/mapper/TaDocumentVerifyMapper.xml Просмотреть файл

10
 	ta_document_verify a
10
 	ta_document_verify a
11
 	LEFT JOIN ta_person b ON a.person_id = b.person_id
11
 	LEFT JOIN ta_person b ON a.person_id = b.person_id
12
 	where a.status = 1
12
 	where a.status = 1
13
+	and a.org_id = #{orgId}
13
 	    <if test="name != '' and name !=null">
14
 	    <if test="name != '' and name !=null">
14
             and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
15
             and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
15
          </if>
16
          </if>