“djh”
2025-10-14 a2f9136f50c1f4d9a083cf8cc1f2a280d5f5b13f
修改
已修改5个文件
23 ■■■■ 文件已修改
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
multi-system/src/main/java/com/gkhy/exam/system/mapper/FactorContentMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
multi-system/src/main/java/com/gkhy/exam/system/service/FactorControlService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
multi-system/src/main/java/com/gkhy/exam/system/service/impl/FactorControlServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
multi-system/src/main/resources/mapper/system/FactorContentMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
    /**
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);
}
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);
}
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();
    }
}
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