合并

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

 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.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 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 org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value ="name",required = false) String name,
                                            @RequestParam(value ="tel",required = false) String tel,
+                                           @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                           @RequestParam(value = "endDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime endDate,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
+            IPage<TaDocumentVerifyModel> result = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信查询我的审核列表
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/list",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyList(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);
+        try {
+            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByAsc("verify_status");
+            List<TaDocumentVerify>result = iTaDocumentVerifyService.list(queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list,@RequestParam(value ="documentTitle",required = false)String documentTitle, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
         documentVerify.setPersonId(person.getPersonId());
         documentVerify.setStatus(CommConstant.STATUS_NORMAL);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        documentVerify.setDocumentTitle(documentTitle);
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
                 for(int i =0; i<list.size();i++){
      * 微信查询对象
      * @return
      */
-    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.GET)
-    public ResponseBean wxDocumentVerifyUpdate(HttpServletRequest request){
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyGetThis(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String personId = getPersonId(request);
         Integer orgId = getOrgId(request);
-        QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", personId);
-        queryWrapper.eq("org_id", orgId);
-        TaDocumentVerify verify = iTaDocumentVerifyService.getOne(queryWrapper);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getById(id);
         if (null != verify) {
             QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
             documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
     @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,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         TaPerson person = taPersons.get(0);
         TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        if(!StringUtils.isEmpty(documentTitle)){
+            documentVerify.setDocumentTitle(documentTitle);
+        }
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
                 QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
      * @param id  实体ID
      */
     @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
-    public ResponseBean documentVerifyGet(@PathVariable Integer id){
+    public ResponseBean documentVerifyGet(@PathVariable String id,
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            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);
+            IPage<TaDocumentVerify> documentVerify = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,id,getOrgId(request));
             responseBean.addSuccess(documentVerify);
         }catch (Exception e){
             e.printStackTrace();

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

     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
+            if (count != null && count > 0) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
         ResponseBean responseBean = new ResponseBean();
         try {
 
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
+
             // 如果是删除，状态为 -1
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageService taDrainageService;
     /**
      * 分页查询列表
      * @param pageNum
             taDrainageRecord.setUserName(jsonParse.getString("userName"));
             taDrainageRecord.setCreateDate(LocalDateTime.now());
             taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setOrgId(taThirdPartyMiniappConfig.getOrgId());
+            //获取buildingID
+            TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
             if (iTaDrainageRecordService.save(taDrainageRecord)){
                 return ResponseBean.success(taDrainageRecord);
             }

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

      */
     private Integer verifyStatus;
 
+    private String documentTitle;
+
+    private String rejectReason;
+
     @TableField(exist = false)
     private List<TaDocumentImg> imgList;
 

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

+package com.huiju.estateagents.entity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资料审核 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+public class TaDocumentVerifyModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer totalSummit;
+
+    private LocalDateTime summitDate;
+
+    private Integer unverified;
+
+    private String name;
+
+    private String tel;
+
+    private String personId;
+
+
+
+
+}

src/main/java/com/huiju/estateagents/excel/HelpRecordExport.java

     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(24)
+    @ColumnWidth(36)
     @ExcelProperty(value = "助力时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
+    @DateTimeFormat("yyyy年MM月dd日 HH时mm分ss秒")
     private Date createDate;
 
 

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

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 资料审核  Mapper 接口
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("personId") String personId, @Param("orgId")Integer orgId);
+
+    IPage<TaDocumentVerifyModel> getAdminDocumentList(IPage<TaDocumentVerifyModel> page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate,@Param("endDate")LocalDateTime endDate);
 
 }

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

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId);
+
+    IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel,Integer orgId,  LocalDateTime startDate, LocalDateTime endDate);
 
 }

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

             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
+        if(null != buildingDynamic.getEnlistEnd() && buildingDynamic.getEnlistEnd().isBefore(LocalDateTime.now())){
+            responseBean.addError("当前活动已结束报名");
+            return responseBean;
+        }
         // 判断是否报名根据电话号码校验
         QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
         taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 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.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
     TaDocumentImgMapper taDocumentImgMapper;
 
     @Override
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId){
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,personId,orgId);
         List<Integer> idList = new ArrayList<>();
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
         return data;
     }
 
+    @Override
+    public IPage<TaDocumentVerifyModel> getAdminDocumentList(Integer pageNum,Integer pageSize,String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
+        IPage<TaDocumentVerifyModel>page = new Page<>(pageNum,pageSize);
+        IPage<TaDocumentVerifyModel> data = documentVerifyMapper.getAdminDocumentList(page,name,tel,orgId,startDate,endDate);
+        return data;
+    }
+
 }

src/main/resources/mapper/TaDocumentVerifyMapper.xml

 	LEFT JOIN ta_person b ON a.person_id = b.person_id
 	where a.status = 1
 	and a.org_id = #{orgId}
-	    <if test="name != '' and name !=null">
-            and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
-         </if>
+	and a.person_id = #{personId}
+        order by a.verify_status asc,a.create_date desc
+    </select>
+
+    <select id="getAdminDocumentList" resultType="com.huiju.estateagents.entity.TaDocumentVerifyModel">
+        SELECT
+	t.*
+FROM
+	(
+SELECT
+	IFNULL( b.NAME, b.nickname ) AS name,
+	IFNULL( b.tel, b.phone ) AS tel,
+	a.person_id,
+	( SELECT c.create_date FROM ta_document_verify c WHERE c.person_id = a.person_id ORDER BY c.create_date DESC LIMIT 1 ) AS summit_date,
+	( SELECT COUNT( 1 ) FROM ta_document_verify d WHERE d.person_id = a.person_id and d.verify_status != 0) AS total_summit,
+	( SELECT COUNT( 1 ) FROM ta_document_verify e WHERE e.person_id = a.person_id AND e.verify_status = 0 ) AS unverified
+FROM
+	ta_document_verify a
+	LEFT JOIN ta_person b ON a.person_id = b.person_id
+	where a.org_id = #{orgId}
+GROUP BY
+	a.person_id
+	) t
+	<where>
+	    1=1
+        <if test="name != '' and name !=null">
+            and t.name like CONCAT('%',#{name}, '%')
+        </if>
         <if test="tel != '' and tel !=null">
-            and IFNULL(b.tel,b.phone) = #{tel}
+            and t.tel = #{tel}
+        </if>
+        <if test="startDate != null">
+            and t.summit_date &gt; #{startDate}
+        </if>
+        <if test="endDate != null">
+            and t.summit_date &lt; #{ednDate}
         </if>
-        order by a.create_date desc
+    </where>
+ORDER BY
+	t.unverified DESC,t.summit_date DESC
     </select>
 
 </mapper>

src/main/resources/mapper/TaPointsExchangeMapper.xml

             and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
         </if>
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
-            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
         order by t.create_date desc
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         SELECT
           b.nickname as nickname,
           b.phone as phone,
-          if(b.sex = 1, '男', if(b.sex = 2, '女', '未知')) as sex
+          if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
         FROM
         ta_person b
         <where>