Merge branch 'feature/xgh/202507迭代' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatPlanDTO.java

@@ -37,6 +37,7 @@ public class GroupChatPlanDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private java.util.Date sendTime;
     private java.util.Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private java.util.Date endTime;
     /**几天后失效*/
     private Integer expireDays;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -187,9 +187,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         //处理群发素材上传生成新的url
 //        String chatContent = dealContentMaterial(dto.getEnterpriseId(), entity);
 //        entity.setChatContent(chatContent);
-        entity.setStartTime(entity.getSendTime()); 
-        Date endTime = DateUtil.addDay(entity.getStartTime(), entity.getExpireDays());
-        entity.setEndTime(DateUtil.getEndTimeOfDay(endTime));
+        entity.setStartTime(entity.getSendTime());
+        /*Date endTime = DateUtil.addDay(entity.getStartTime(), entity.getExpireDays());
+        entity.setEndTime(DateUtil.getEndTimeOfDay(endTime));*/
         String staffIdList = dto.getStaffIdList();
         if (null == planId) {
             planId = UniqueIdUtils.uniqueLong();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -153,8 +153,11 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         }
         boolean createFlag = false ;
         plan.setBeginDate(plan.getPublishTime());
-        Date endTime = DateUtil.getEndTimeOfDay(DateUtil.addDay(plan.getBeginDate(), plan.getExpireDays()));
-        plan.setEndDate(endTime);
+        /*Date endTime = DateUtil.getEndTimeOfDay(DateUtil.addDay(plan.getBeginDate(), plan.getExpireDays()));
+        plan.setEndDate(endTime);*/
+        if(null == plan.getEndDate()) {
+            return ServiceResponse.failure("9999","请设置活动结束时间") ;
+        }
         if(null == planId || null == this.qwMomentPlanMapper.getById(planId)) {
             createFlag = true ;
             if(null == planId) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

@@ -77,6 +77,10 @@ public class GroupChatPlanController {
             GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "请选择群主");
         }
+        if(null == dto.getEndTime()) {
+            GicLogRecordEvaluationContext.noWriteLog();
+            return RestResponse.failure("9999", "请选择结束时间");
+        }
         logger.info("新增参数={}", JSON.toJSONString(dto));
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setCreatorId(loginUser.getClerkId());
@@ -161,6 +165,10 @@ public class GroupChatPlanController {
             GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "活动已结束");
         }
+        if(null == dto.getEndTime()) {
+            GicLogRecordEvaluationContext.noWriteLog();
+            return RestResponse.failure("9999", "请选择结束时间");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/moment/QwMomentPlanQO.java

@@ -72,6 +72,19 @@ public class QwMomentPlanQO implements Serializable {
 	private Integer analyseFlag ;
 	private Integer analyseDay ;
 
+	/**
+	 * 结束时间
+	 */
+	private Date endDate ;
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
 	public Integer getAnalyseFlag() {
 		return analyseFlag;
 	}