合并

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

@@ -110,6 +110,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		if (null == helpInitiateRecord.getEnlistNum()){
 			helpInitiateRecord.setEnlistNum(0);
 		}
+		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		if (helpInitiateRecord.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送
 			try{
@@ -122,7 +123,6 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 			helpInitiateRecord.setStatus(0);
 		}
 		
-		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		Map<String,Object> map = new HashMap<>();
 		map.put("helpRecord",helpRecord);

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

@@ -180,6 +180,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             taShareRecord.setVerificationCode(String.valueOf(taShareRecord.getRecordId()+System.currentTimeMillis()));
             taShareRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             taShareRecord.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taShareRecord.setEndTime(LocalDateTime.now());
         }
         tashareRecordmapper.updateById(taShareRecord);
         Map<String,Object> map = new HashMap<>();
@@ -223,6 +224,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
      * @param groupActivityId
      */
     private void changeChildRecord(Integer recordId, Integer orgId, Integer groupActivityId) {
+        LocalDateTime dateTime = LocalDateTime.now();
         QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
         taShareChildRecordQueryWrapper.eq("record_id",recordId);
         taShareChildRecordQueryWrapper.eq("org_id",orgId);
@@ -232,6 +234,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
             e.setVerificationCode(String.valueOf(e.getChildRecordId()+System.currentTimeMillis()));
             e.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
             e.setStatus(CommConstant.STATUS_UNACCALIMED);
+            e.setEndTime(dateTime);
         });
         this.updateBatchById(shareChildRecordList);
     }