fix bug：自动执行重复发邮件

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -821,6 +821,8 @@ public class ChangeFlowBiz {
                         // 更改变更结果确认时间
                         changeRecord.setChangeConfirmResultTime(changeConfirmResultTime);
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
+                        // 延期需要重新发邮件，改变执行邮件状态
+                        changeRecord.setAutoSubmitEmail(false);
                         changeFlowService.updateRecord(changeRecord);
                         return null;
                     default:

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFlowService.java

@@ -55,10 +55,11 @@ public interface ChangeFlowService {
      * 根据状态及时间获取数据
      *
      * @param entityId
+     * @param sendEmail
      * @param nodeId1
      * @param nodeId2
      * @param tomorrowSpecificTime
      * @return
      */
-    List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long tomorrowSpecificTime);
+    List<ChangeRecord> getByStatusAndTime(Long entityId, Integer sendEmail, String nodeId1, String nodeId2, long tomorrowSpecificTime);
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowServiceImpl.java

@@ -56,7 +56,7 @@ public class ChangeFlowServiceImpl implements ChangeFlowService {
     }
 
     @Override
-    public List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long tomorrowSpecificTime) {
-        return changeRecordMapper.getByStatusAndTime(entityId, nodeId1, nodeId2, tomorrowSpecificTime);
+    public List<ChangeRecord> getByStatusAndTime(Long entityId, Integer sendEmail, String nodeId1, String nodeId2, long tomorrowSpecificTime) {
+        return changeRecordMapper.getByStatusAndTime(entityId, sendEmail, nodeId1, nodeId2, tomorrowSpecificTime);
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/task/AutoSubmit.java

@@ -81,10 +81,10 @@ public class AutoSubmit extends IJobHandler {
         Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
         List<Long> count = new ArrayList<>();
         Long entityId = 0L;
-        // 查询今天时间之前的数据
+        // 查询今天时间之前的未发送邮件的数据
         try {
             while (true) {
-                List<ChangeRecord> records = changeFlowService.getByStatusAndTime(entityId,
+                List<ChangeRecord> records = changeFlowService.getByStatusAndTime(entityId, 0,
                     ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId(), ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId(),
                     tomorrowSpecificTime);
                 if (CollectionUtils.isEmpty(records)) {

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeRecord.java

@@ -168,6 +168,11 @@ public class ChangeRecord {
     private Integer todoId;
 
     /**
+     * 自动执行邮件发送
+     */
+    private Boolean autoSubmitEmail;
+
+    /**
      * 创建时间
      */
     private Long createTime;

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeRecordMapper.java

@@ -29,7 +29,7 @@ public interface ChangeRecordMapper extends tk.mybatis.mapper.common.Mapper<Chan
 
     List<ChangeRecord> selectByConditionAndLimit(ChangeFlowListQueryReq changeFlowListQueryReq);
 
-    @Select("select * from TB_YX_QC_CHANGE_RECORD where id > #{entityId} and `flow_node` in (#{nodeId1}, #{nodeId2}) and change_confirm_result_time <= #{currentTime} limit 200")
-    List<ChangeRecord> getByStatusAndTime(@Param("entityId") Long entityId, @Param("nodeId1") String nodeId1,
+    @Select("select * from TB_YX_QC_CHANGE_RECORD where id > #{entityId} and auto_submit_email = #{sendEmail} and `flow_node` in (#{nodeId1}, #{nodeId2}) and change_confirm_result_time <= #{currentTime} limit 200")
+    List<ChangeRecord> getByStatusAndTime(@Param("entityId") Long entityId, @Param("sendEmail") Integer sendEmail, @Param("nodeId1") String nodeId1,
                                           @Param("nodeId2") String nodeId2, @Param("currentTime") long currentTime);
 }