verifyDocument

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

@@ -5,13 +5,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaApartmentImg;
+import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 资料审核  前端控制器
@@ -21,7 +34,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-10-23
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaDocumentVerifyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaDocumentVerifyController.class);
@@ -29,6 +42,12 @@ public class TaDocumentVerifyController extends BaseController {
     @Autowired
     public ITaDocumentVerifyService iTaDocumentVerifyService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    public ITaDocumentImgService documentImgService;
+
 
     /**
      * 分页查询列表
@@ -36,17 +55,14 @@ public class TaDocumentVerifyController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/documentVerify",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/documentVerify",method= RequestMethod.GET)
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="name",required = false) String name,
+                                           @RequestParam(value ="tel",required = false) String tel){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaDocumentVerify> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.page(pg, queryWrapper);
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -58,15 +74,37 @@ public class TaDocumentVerifyController extends BaseController {
 
     /**
      * 保存对象
-     * @param documentVerify 实体对象
+     * @param list List<TaDocumentImg>
      * @return
      */
-    @RequestMapping(value="/documentVerify",method= RequestMethod.POST)
-    public ResponseBean documentVerifyAdd(@RequestBody TaDocumentVerify documentVerify){
+    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
+    public ResponseBean wxDocumentVerifyAdd(List<TaDocumentImg>list, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            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);
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
                 responseBean.addSuccess(documentVerify);
+
             }else {
                 responseBean.addError("fail");
             }
@@ -100,15 +138,59 @@ public class TaDocumentVerifyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param list List<TaDocumentImg>
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
+    public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
+                                               List<TaDocumentImg>list,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+        documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        try {
+            if (iTaDocumentVerifyService.updateById(documentVerify)){
+                QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("document_verify_id",documentVerify.getDocumentVerifyId());
+                documentImgService.remove(queryWrapper);
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID
      * @param documentVerify 实体对象
      * @return
      */
-    @RequestMapping(value="/documentVerify/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean documentVerifyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaDocumentVerify documentVerify){
+                                             @RequestBody TaDocumentVerify documentVerify){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
@@ -132,7 +214,13 @@ public class TaDocumentVerifyController extends BaseController {
     public ResponseBean documentVerifyGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaDocumentVerifyService.getById(id));
+            TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+            QueryWrapper<TaDocumentImg>imgList = new QueryWrapper<>();
+            imgList.eq("document_verify_id",documentVerify.getDocumentVerifyId());
+            imgList.orderByAsc("sort");
+            List<TaDocumentImg>list = documentImgService.list(imgList);
+            documentVerify.setImgList(list);
+            responseBean.addSuccess(documentVerify);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("documentVerifyDelete -=- {}",e.toString());

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -55,12 +57,23 @@ public class TaDocumentVerify implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 审核状态 0未审核  1审核通过  2审核不通过
      */
     private Integer verifyStatus;
 
+    @TableField(exist = false)
+    private List<TaDocumentImg> imgList;
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String tel;
+
+
+
 
 }

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

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel);
+
 }

src/main/java/com/huiju/estateagents/service/ITaDocumentVerifyService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaDocumentVerify;
 
@@ -13,4 +14,6 @@ import com.huiju.estateagents.entity.TaDocumentVerify;
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel);
+
 }

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

@@ -1,11 +1,19 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.mapper.TaDocumentImgMapper;
 import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 资料审核  服务实现类
@@ -17,4 +25,30 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMapper, TaDocumentVerify> implements ITaDocumentVerifyService {
 
+    @Autowired
+    TaDocumentVerifyMapper documentVerifyMapper;
+    @Autowired
+    TaDocumentImgMapper taDocumentImgMapper;
+
+    @Override
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel){
+        IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel);
+        List<Integer> idList = new ArrayList<>();
+        for (int i = 0; i<data.getRecords().size();i++){
+            idList.add(data.getRecords().get(i).getDocumentVerifyId());
+        }
+        List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
+        for (int i = 0;i<data.getRecords().size();i++){
+            List<TaDocumentImg>imgList = new ArrayList<>();
+            for(int j = 0; j<allImgList.size();j++){
+                if(data.getRecords().get(i).getDocumentVerifyId().equals(allImgList.get(j).getDocumentVerifyId())){
+                    imgList.add(allImgList.get(j));
+                }
+            }
+            data.getRecords().get(i).setImgList(imgList);
+        }
+        return data;
+    }
+
 }

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaDocumentVerifyMapper">
+    <select id="getDocumentVerifyList" resultType="com.huiju.estateagents.entity.TaDocumentVerify">
+    SELECT
+	a.* ,
+	IFNULL(b.name,b.nickname) as name,
+	b.phone as tel
+    FROM
+	ta_document_verify a
+	LEFT JOIN ta_person b ON a.person_id = b.person_id
+	where 1=1
+	    <if test="name != '' and name !=null">
+            and IFNULL(b.name,b.nickname) = #{name}
+         </if>
+        <if test="name != '' and name !=null">
+            and IFNULL(b.tel,b.phone) = #{tel}
+        </if>
+        order by a.create_date desc
+    </select>
 
 </mapper>