diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
index 3a6556e8..7930eab4 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
@@ -131,4 +131,11 @@ public interface TmTaskMapper {
* @return
*/
String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType);
+
+ /**
+ * 根据任务id删除任务协议关联表
+ * @param taskId
+ * @return
+ */
+ int deleteTaskAgreementByTaskId(@Param("taskId") String taskId);
}
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 54db21d3..09b18d4d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -954,10 +954,11 @@ public class TmTaskServiceImpl implements TmTaskService {
public AjaxResult deleteByPrimaryKey(String taskId) {
int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId);
int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId);
- if (i == 1 && j == 1) {
+ int m = tmTaskMapper.deleteTaskAgreementByTaskId(taskId);
+ if (i == 1 && j == 1 && m == 1) {
return AjaxResult.success("删除成功");
- } else if (i < 1 || j < 1) {
- return AjaxResult.error("删除失败,任务表或信息表未删除!");
+ } else if (i < 1 || j < 1 || m < 1) {
+ return AjaxResult.error("删除失败,任务表或信息表或任务协议关联表未删除!");
} else {
return AjaxResult.error("删除失败,请检查任务ID是否正确!!");
}
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 45f8f0b7..4a9ed949 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -71,6 +71,9 @@
delete from lease_apply_details where parennt_id = #{parentId}
+
+ delete from tm_task_agreement where task_id = #{taskId}
+
insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id)