合并

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

@@ -158,12 +158,12 @@ public class HelpInitiateRecordController extends BaseController {
     
     /**
      * 微信端分页查询我发起的助力活动
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         String openid = getOpenId(request);
@@ -176,7 +176,7 @@ public class HelpInitiateRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //分页获取数据
-            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNum, pageSize,orgId,person.getPersonId());
+            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNumber, pageSize,orgId,person.getPersonId());
         }catch (Exception e){
             e.printStackTrace();
             logger.error("helpInitiateRecordList -=- {}",e.toString());
@@ -208,9 +208,10 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
             helpInitiateRecordQueryWrapper.eq("org_id",orgId);
             helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+            helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(helpInitiateRecord);
+                responseBean.addSuccess(recordServiceOne);
                 return responseBean;
             }
  

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

@@ -64,10 +64,11 @@ public class TaDocumentVerifyController extends BaseController {
     public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value ="name",required = false) String name,
-                                           @RequestParam(value ="tel",required = false) String tel){
+                                           @RequestParam(value ="tel",required = false) String tel,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel);
+            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -287,12 +287,12 @@ public class TaShareRecordController extends BaseController {
     }
     /**
      * 微信端分页获取团长记录
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -304,7 +304,7 @@ public class TaShareRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try {
-            responseBean = iTaShareRecordService.getShareRecordList(pageNum, pageSize, orgId, person);
+            responseBean = iTaShareRecordService.getShareRecordList(pageNumber, pageSize, orgId, person);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareRecordList -=- {}",e.toString());

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

@@ -1,6 +1,8 @@
 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 java.time.LocalDateTime;
 import java.io.Serializable;
@@ -27,7 +29,8 @@ public class HelpRecord implements Serializable {
     /**
      * ID
      */
-    private String helpRecordId;
+    @TableId(value = "help_record_id", type = IdType.AUTO)
+    private Integer helpRecordId;
 
     /**
      * 创建时间

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

@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel);
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
 
 }

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

@@ -14,6 +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);
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
 
 }

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

@@ -13,11 +13,15 @@ import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.service.IHelpRecordService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,6 +32,7 @@ import java.util.List;
  * @since 2019-10-17
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRecord> implements IHelpRecordService {
 	
 	@Autowired
@@ -57,7 +62,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
+		if (null != helpActivity.getEnlistNum() && helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
@@ -69,8 +74,8 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_id",orgId);
 		queryWrapper.eq("help_activity_id",helpRecord.getHelpActivityId());
-		queryWrapper.eq("persion_id",person.getPersonId());
-		if (null != helpNum && helpNum >= 0){
+		queryWrapper.eq("person_id",person.getPersonId());
+		if (null != helpNum && helpNum > 0){
 			//查看这个人是否助力过，和助力了几次
 			List<HelpRecord> helpRecords = helpRecordMapper.selectList(queryWrapper);
 			if (helpRecords.size() >= helpNum){
@@ -84,6 +89,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			return ResponseBean.error("您已经助力过了,无需重复助力", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		//反更新在入库
+		if (null == helpActivity.getEnlistNum()){
+			helpActivity.setEnlistNum(0);
+		}
 		helpActivity.setEnlistNum(helpActivity.getEnlistNum()+1);
 		helpActivityMapper.updateById(helpActivity);
 		//插入数据
@@ -99,9 +107,15 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			helpInitiateRecord.setSucceedDate(LocalDateTime.now());
 			helpInitiateRecord.setStatus(0);
 		}
+		if (null == helpInitiateRecord.getEnlistNum()){
+			helpInitiateRecord.setEnlistNum(0);
+		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
-		return ResponseBean.success(helpInitiateRecord);
+		Map<String,Object> map = new HashMap<>();
+		map.put("helpRecord",helpRecord);
+		map.put("helpInitiateRecord",helpInitiateRecord);
+		return ResponseBean.success(map);
 	}
 
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,15 +33,19 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     TaDocumentImgMapper taDocumentImgMapper;
 
     @Override
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel){
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
         List<Integer> idList = new ArrayList<>();
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
         }
+
         if (CollectionUtils.isNotEmpty(idList)) {
-            List<TaDocumentImg>allImgList = taDocumentImgMapper.selectBatchIds(idList);
+            QueryWrapper<TaDocumentImg>imgQueryWrapper = new QueryWrapper<>();
+            imgQueryWrapper.in("document_verify_id",idList);
+            imgQueryWrapper.eq("org_id",orgId);
+            List<TaDocumentImg>allImgList = taDocumentImgMapper.selectList(imgQueryWrapper);
             for (int i = 0;i<data.getRecords().size();i++){
                 List<TaDocumentImg>imgList = new ArrayList<>();
                 for(int j = 0; j<allImgList.size();j++){

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -87,6 +87,6 @@
         LEFT JOIN ta_help_activity a ON t.help_activity_id = a.help_activity_id
     WHERE
         t.org_id = #{orgId}
-        AND t.persion_id = #{personId}
+        AND t.person_id = #{personId}
     </select>
 </mapper>

src/main/resources/mapper/TaDocumentVerifyMapper.xml

@@ -5,13 +5,14 @@
     SELECT
 	a.* ,
 	IFNULL(b.name,b.nickname) as name,
-	b.phone as tel
+    IFNULL(b.tel,b.phone) as tel
     FROM
 	ta_document_verify a
 	LEFT JOIN ta_person b ON a.person_id = b.person_id
-	where 1=1
+	where a.status = 1
+	and a.org_id = #{orgId}
 	    <if test="name != '' and name !=null">
-            and IFNULL(b.name,b.nickname) = #{name}
+            and IFNULL(b.name,b.nickname) like CONCAT('%',#{name}, '%')
          </if>
         <if test="name != '' and name !=null">
             and IFNULL(b.tel,b.phone) = #{tel}

src/main/resources/mapper/TaPersonMapper.xml

@@ -18,6 +18,7 @@
         WHERE
             t.person_type = #{personType}
         AND t.status = #{status}
+        and u.status != 9
         and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and p.building_id = #{buildingId}