合并

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

@@ -202,7 +202,7 @@ public class HelpInitiateRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try {
-            helpInitiateRecord.setPersionId(person.getPersonId());
+            helpInitiateRecord.setPersonId(person.getPersonId());
             helpInitiateRecord.setCreateDate(LocalDateTime.now());
             helpInitiateRecord.setOrgId(orgId);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){

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

@@ -72,7 +72,7 @@ public class HelpActivity implements Serializable {
     /**
      * 助力人数
      */
-    private Integer persionNum;
+    private Integer personNum;
 
     /**
      * 助力次数 0不限制，大于零表示限制次数

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

@@ -56,7 +56,7 @@ public class HelpInitiateRecord implements Serializable {
     /**
      * 人员Id 人员自己
      */
-    private String persionId;
+    private String personId;
 
     /**
      * 人员姓名

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

@@ -73,7 +73,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         //查询当前助力成功所需的人数限制（persion_num）
         HelpActivity helpActivity = taHelpActivityMapper.selectById(helpActivityId);
         // 得到活动限制助力的总数
-        int persionNumCount = helpActivity.getPersionNum();
+        int persionNumCount = helpActivity.getPersonNum();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
         IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status);
 

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

@@ -56,7 +56,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
-		if (helpActivity.getEnlistNum() >= helpActivity.getPersionNum()){
+		if (helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
 			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
@@ -90,7 +90,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		helpRecord.setCreateDate(LocalDateTime.now());
 		helpRecord.setPersionId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
-		if (helpActivity.getEnlistNum().equals(helpActivity.getPersionNum())){
+		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送--todo
 			
 			//生成核销码