Commit 062d544e authored by 周昊's avatar 周昊
Browse files

1、修改app端删除固有风险、现有风险逻辑删除

parent c6e45ac6

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

+8 −2
Original line number Diff line number Diff line
@@ -450,7 +450,10 @@ public class RiskPlanAppController extends BaseController { 
     */

    @GetMapping("/inherent/delete/{inherentId}")

    public R<Boolean> deleteRiskPlanAppInherentByInherentId(@PathVariable("inherentId") Long inherentId) {

        return R.ok(riskPlanInherentListService.removeById(inherentId));

        RiskPlanInherentList riskPlanInherentList = new RiskPlanInherentList();

        riskPlanInherentList.setId(inherentId);

        riskPlanInherentList.setDelFlag("1");

        return R.ok(riskPlanInherentListService.updateRiskPlanInherentList(riskPlanInherentList)>0);

    }



    /**
@@ -563,7 +566,10 @@ public class RiskPlanAppController extends BaseController { 
     */

    @GetMapping("/existing/delete/{existingId}")

    public R<Boolean> deleteRiskPlanAppExistingByExistingId(@PathVariable("existingId") Long existingId) {

        return R.ok(riskPlanExistingListService.removeById(existingId));

        RiskPlanExistingList existingList = new RiskPlanExistingList();

        existingList.setId(existingId);

        existingList.setDelFlag("1");

        return R.ok(riskPlanExistingListService.updateById(existingList));

    }



    /**

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

+8 −0
Original line number Diff line number Diff line
@@ -379,6 +379,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
                LEFT JOIN ledger_building lb ON lb.id = lf.building_id

        WHERE

            reil.inherent_id = #{inherentId}

          AND reil.del_flag = '0'

          AND rpil.del_flag = '0'

          AND lr.del_flag = '0'

          AND lr.`status` = '0'

          AND lf.del_flag = '0'

          AND lf.`status` = '0'

          AND lb.del_flag = '0'

          AND lb.`status` = '0'

    </select>

    <select id="getRiskNotificationExportWordDto"

            resultType="com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto">

censoft-rongtong/src/main/resources/mapper/system/RiskPlanUserBuildingMapper.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
                LEFT JOIN ledger_building lb ON lb.id = rpub.building_id

        WHERE

            rp.id = #{planId}

          AND lb.del_flag = '0'

          AND lb.`status` = '0'

    </select>

</mapper>
 
 No newline at end of file