更新备注

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatPlanApiService.java

@@ -28,6 +28,9 @@ public interface GroupChatPlanApiService {
     // 保存/更新
     public ServiceResponse<GroupChatPlanDTO> save(GroupChatPlanDTO dto);
     
+    // 更新备注
+    public ServiceResponse<GroupChatPlanDTO> updateRemark(GroupChatPlanDTO dto);
+
     /**
      * 
     * @Title: doPlanTimer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan;
 
@@ -36,4 +37,6 @@ public interface GroupChatPlanMapper {
 
     public void updateData(@Param("planId") Long planId, @Param("sendCount") int sendCount,
             @Param("successChatCount") int successChatCount, @Param("failChatCount") int failChatCount);
+
+    public void updateRemark(GroupChatPlanDTO dto);
 }
\ No newline at end of file

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

@@ -27,4 +27,6 @@ public interface GroupChatPlanService {
     
     public void stop(String clerkId, String clerkName, Long planId) ;
 
+    public void updateRemark(GroupChatPlanDTO dto);
+
 }
\ No newline at end of file

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

@@ -433,4 +433,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         return time;
     }
     
+    @Override
+    public void updateRemark(GroupChatPlanDTO dto) {
+        this.groupChatPlanMapper.updateRemark(dto) ;
+    }
+
 }
\ No newline at end of file

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

@@ -50,6 +50,12 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
         return ServiceResponse.success(dto);
     }
     
+    @Override
+    public ServiceResponse<GroupChatPlanDTO> updateRemark(GroupChatPlanDTO dto) {
+        this.groupChatPlanService.updateRemark(dto);
+        return ServiceResponse.success(dto);
+    }
+
     /**
      * 
     * @Title: doPlan

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml

@@ -142,6 +142,19 @@
 		  ]]>
 	</update>
 	
+	<update id="updateRemark"
+		parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan">
+		  <![CDATA[
+		  UPDATE tab_haoban_group_chat_plan SET
+			  remark=#{remark},
+			  modifier_id=#{modifierId},
+			  modifier_name=#{modifierName},
+			  update_time=now()
+		  where plan_id = #{planId}
+		  ]]>
+	</update>
+	
+	
 	<!-- ============ 查询============= -->
 	<select id="selectById" parameterType="long"
 		resultMap="result-map-tabHaobanGroupChatPlan">

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

@@ -128,8 +128,8 @@ public class GroupChatPlanController {
             GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "任务不存在");
         }
-        GroupChatPlanDTO plan = planResp.getResult() ;
-        if(plan.getEndTime().getTime()<=new Date().getTime()) {
+        GroupChatPlanDTO plan = planResp.getResult();
+        if (plan.getEndTime().getTime() <= new Date().getTime()) {
             GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "任务已结束");
         }
@@ -151,22 +151,21 @@ public class GroupChatPlanController {
             GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999", "任务不存在");
         }
-        if (oldPlan.getSendType() == 1) {
-            GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "已发送的不能编辑");
-        }
-        if (null != oldPlan.getSendTime() && oldPlan.getSendTime().before(new Date())) {
-            GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "已发送的不能编辑");
-        }
-        if (oldPlan.getStartTime().before(new Date())) {
+        long now = System.currentTimeMillis();
+        if (oldPlan.getEndTime().getTime() <= now || oldPlan.getStatusFlag() == 0) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "进行中的不能编辑");
+            return RestResponse.failure("9999", "任务已结束");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());
-        ServiceResponse<GroupChatPlanDTO> resp = this.groupChatPlanApiService.save(dto);
+        ServiceResponse<GroupChatPlanDTO> resp = null;
+        // 任务进行中只能编辑备注
+        if (oldPlan.getStartTime().getTime() <= now && oldPlan.getEndTime().getTime() >= now) {
+            resp = this.groupChatPlanApiService.updateRemark(dto);
+        } else {
+            resp = this.groupChatPlanApiService.save(dto);
+        }
         if (resp.isSuccess()) {
             String logContent = this.getUpdateLog(oldPlan, dto);
             if (StringUtils.isBlank(logContent)) {
@@ -176,7 +175,6 @@ public class GroupChatPlanController {
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
-
         return RestResponse.successResult();
     }