From a2f9136f50c1f4d9a083cf8cc1f2a280d5f5b13f Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 14 十月 2025 09:16:08 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java | 3 ++-
multi-system/src/main/resources/mapper/system/FactorContentMapper.xml | 12 ++++++++++++
multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java | 2 +-
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java | 4 ++--
multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java | 2 ++
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
index 6e3f562..1497f7c 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
@@ -131,8 +131,8 @@
*/
@ApiOperation(value = "内外部环境要素控制删除")
@GetMapping("/factor/control/deleted")
- public CommonResult deletedFactorControl(@RequestParam("factorControlId") Integer factorControlId){
- return factorControlService.deletedFactorControl(factorControlId);
+ public CommonResult deletedFactorControl(@RequestParam("factorControlId") Integer factorControlId,@RequestParam("factorDiscrenId") Integer factorDiscrenId){
+ return factorControlService.deletedFactorControl(factorControlId,factorDiscrenId);
}
/**
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java
index 9c6252d..2030738 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java
@@ -14,4 +14,6 @@
void insertBatch(@Param("factorContents") List<FactorContent> factorContents);
void deletedByFactorId(@Param("id") Integer id);
+
+ void updateByFactorId(@Param("factorDiscrenId") Integer factorDiscrenId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java
index b5d149e..02546b8 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java
@@ -12,5 +12,5 @@
CommonResult updateFactorControl(FactorControl factorControl);
- CommonResult deletedFactorControl(Integer factorControlId);
+ CommonResult deletedFactorControl(Integer factorControlId,Integer factorDiscrenId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java
index 89aa777..493e830 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java
@@ -76,13 +76,14 @@
}
@Override
- public CommonResult deletedFactorControl(Integer factorControlId) {
+ public CommonResult deletedFactorControl(Integer factorControlId,Integer factorDiscrenId) {
FactorControl factorControl = new FactorControl();
factorControl.setId(factorControlId);
factorControl.setUpdateTime(LocalDateTime.now());
factorControl.setUpdateBy(SecurityUtils.getUsername());
factorControl.setDelFlag(2);
factorControlMapper.updateById(factorControl);
+ factorContentMapper.updateByFactorId(factorDiscrenId);
return CommonResult.success();
}
}
diff --git a/multi-system/src/main/resources/mapper/system/FactorContentMapper.xml b/multi-system/src/main/resources/mapper/system/FactorContentMapper.xml
index 2e89a43..5fd3eab 100644
--- a/multi-system/src/main/resources/mapper/system/FactorContentMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/FactorContentMapper.xml
@@ -18,6 +18,18 @@
#{item.type})
</foreach>
</insert>
+ <update id="updateByFactorId">
+ UPDATE
+ `factor_content`
+ SET
+ `influence` = NULL,
+ `monitor_method` = NULL,
+ `review` = NULL,
+ `solutions` = NULL,
+ `result` = NULL
+ WHERE
+ `factor_discern_id` = #{factorDiscrenId}
+ </update>
<delete id="deletedByFactorId">
DELETE
FROM
--
Gitblit v1.9.2