Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/PendingTaskApiService.java

@@ -91,6 +91,15 @@ public interface PendingTaskApiService {
      */
     public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId);
 
+
+    /**
+     * 删除执行人
+     *
+     * @param businessId
+     * @return
+     */
+    public ServiceResponse<Boolean> deletePendingTaskByBusinessId(String businessId);
+
     /**
      * 更新失效或者结束时间
      *

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

@@ -85,4 +85,13 @@ public interface PendingTaskMapper {
      */
     public int updateInvalidTimeByBusinessId(@Param("businessId") String businessId, @Param("") Date invalidTime);
 
+    /**
+     * 更新失效时间
+     *
+     * @param businessId
+     * @return
+     */
+    public int deleteByBusinessId(@Param("businessId") String businessId);
+
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java

@@ -56,6 +56,14 @@ public interface PendingTaskService {
     public boolean deletePendingTask(List<String> relationIds);
 
     /**
+     * 删除执行人列表
+     *
+     * @param businessId
+     * @return
+     */
+    public boolean deletePendingTaskByBusinessId(String businessId);
+
+    /**
      * 更新失效时间
      *
      * @param businessId

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java

@@ -67,6 +67,12 @@ public class PendingTaskServiceImpl implements PendingTaskService {
     }
 
     @Override
+    public boolean deletePendingTaskByBusinessId(String businessId) {
+        pendingTaskMapper.deleteByBusinessId(businessId);
+        return true;
+    }
+
+    @Override
     public boolean updateInvalidTimeByBusinessId(String businessId, Date time) {
         pendingTaskMapper.updateInvalidTimeByBusinessId(businessId, time);
         return true;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -173,6 +173,12 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
     }
 
     @Override
+    public ServiceResponse<Boolean> deletePendingTaskByBusinessId(String businessId) {
+        pendingTaskService.deletePendingTaskByBusinessId(businessId);
+        return ServiceResponse.success(true);
+    }
+
+    @Override
     public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime) {
         PendingTaskBO pendingTaskBO = new PendingTaskBO();
         pendingTaskBO.setRelationId(relationId);

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -313,4 +313,12 @@
         invalid_time = #{invalidTime}
         where business_id = #{businessId}
     </update>
+
+    <update id="deleteByBusinessId">
+        update tab_haoban_pending_task
+        set
+            delete_flag = 1,
+            update_time = now()
+        where business_id = #{businessId} and delete_flag=0
+    </update>
 </mapper>
\ No newline at end of file