feat(tcm): 风险报送 接口开发

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/IRiskReportService.java

@@ -33,4 +33,6 @@ public interface IRiskReportService {
     Boolean forWardeBySeq(Long riskReportSeq, RiskProcessesDto riskProcessesDto);
 
     List<String> permissionButton(Long sequenceNbr);
+
+    Boolean riskDisposal(Long sequenceNbr, RiskProcessesDto riskProcessesDto);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/RiskReportController.java

@@ -80,7 +80,6 @@ public class RiskReportController extends BaseController {
     public ResponseModel<Page<RiskReport>> queryForRiskReportPage(@RequestParam(value = "current") int current,
                                                                   @RequestParam(value = "size") int size,
                                                                   @RequestBody RiskReportDto reportDto) {
-        ;
         return ResponseHelper.buildResponse(iRiskReportService.queryForRiskReportPage(reportDto, current, size));
     }
 
@@ -103,8 +102,8 @@ public class RiskReportController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<RiskReportDto> selectRiskDetail(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(iRiskReportService.selectRiskDetail(sequenceNbr));
+    public ResponseModel<RiskReportDto> selectRiskDetail(@PathVariable String sequenceNbr) {
+        return ResponseHelper.buildResponse(iRiskReportService.selectRiskDetail(Long.parseLong(sequenceNbr)));
     }
 
     /**
@@ -113,9 +112,9 @@ public class RiskReportController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/forWarde/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "转办", notes = "转办")
-    public ResponseModel<Boolean> forWardeBySeq(@PathVariable Long sequenceNbr,
+    public ResponseModel<Boolean> forWardeBySeq(@PathVariable String sequenceNbr,
                                                 @RequestBody RiskProcessesDto riskProcessesDto) {
-        return ResponseHelper.buildResponse(iRiskReportService.forWardeBySeq(sequenceNbr, riskProcessesDto));
+        return ResponseHelper.buildResponse(iRiskReportService.forWardeBySeq(Long.parseLong(sequenceNbr), riskProcessesDto));
     }
 
 
@@ -125,8 +124,20 @@ public class RiskReportController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/permissionButton/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "风险详情中的按钮权限", notes = "风险详情中的按钮权限")
-    public ResponseModel<List<String>> permissionButton(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(iRiskReportService.permissionButton(sequenceNbr));
+    public ResponseModel<List<String>> permissionButton(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(iRiskReportService.permissionButton(Long.parseLong(sequenceNbr)));
+    }
+
+
+    /**
+     * 风险处置
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/riskDisposal/{sequenceNbr}")
+    @ApiOperation(httpMethod = "POST", value = "风险处置", notes = "风险处置")
+    public ResponseModel<Boolean> riskDisposal(@PathVariable(value = "sequenceNbr") String sequenceNbr,
+                                               @RequestBody RiskProcessesDto riskProcessesDto) {
+        return ResponseHelper.buildResponse(iRiskReportService.riskDisposal(Long.parseLong(sequenceNbr), riskProcessesDto));
     }
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/RiskReportServiceImpl.java

@@ -382,4 +382,69 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
         // 已办理 or 其他情况
         return Collections.emptyList();
     }
+
+    /**
+     * 风险处置
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean riskDisposal(Long sequenceNbr, RiskProcessesDto riskProcessesDto) {
+
+        CompanyBo company = getSelectedOrgInfo().getCompany();
+        AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
+
+        RiskReport riskReport = this.getById(sequenceNbr);
+        RiskProcesses processes = RiskProcesses.builder()
+                .riskReportSeq(sequenceNbr.toString())
+                .disposalContent(riskProcessesDto.getDisposalContent())
+                .operationCompanySeq(company.getSequenceNbr().toString())
+                .operationCompanyName(company.getCompanyName())
+                .operationUserId(userModel.getUserId())
+                .operationUserName(userModel.getRealName())
+                .createDate(new Date())
+                .createUserId(userModel.getUserId())
+                .createUserName(userModel.getRealName())
+                .build();
+
+        // 确认已处置
+        if (riskProcessesDto.getDisposalWayCode().equals(DisposalMethodEnums.CONFIRM_DISPOSAL.getCode())) {
+            riskReport.setCurrentStage(RiskReportStage.SUPERVISION.getName());
+            riskReport.setCurrentStatus(RiskReportProcessStatus.COMPLETED.getName());
+            riskReport.setEndDate(new Date());
+            processes.setUnitType(RiskUnitType.DISPOSAL.getLabel());
+            processes.setDisposalWayCode(DisposalMethodEnums.CONFIRM_DISPOSAL.getCode());
+            processes.setDisposalWayName(DisposalMethodEnums.CONFIRM_DISPOSAL.getName());
+        }
+        // 无需处置
+        if (riskProcessesDto.getDisposalWayCode().equals(DisposalMethodEnums.NOT_NEED_DISPOSAL.getCode())) {
+            riskReport.setCurrentStage(RiskReportStage.SUPERVISION.getName());
+            riskReport.setCurrentStatus(RiskReportProcessStatus.COMPLETED.getName());
+            riskReport.setEndDate(new Date());
+            processes.setUnitType(RiskUnitType.DISPOSAL.getLabel());
+            processes.setDisposalWayCode(DisposalMethodEnums.NOT_NEED_DISPOSAL.getCode());
+            processes.setDisposalWayName(DisposalMethodEnums.NOT_NEED_DISPOSAL.getName());
+        }
+        // 下发整改
+        if (riskProcessesDto.getDisposalWayCode().equals(DisposalMethodEnums.ISSUED_DISPOSAL.getCode())) {
+            riskReport.setCurrentStage(RiskReportStage.COMPANY_RECTIFICATION.getName());
+            riskReport.setCurrentStatus(RiskReportProcessStatus.TO_RECTIFY.getName());
+            riskReport.setEndDate(new Date());
+            processes.setUnitType(RiskUnitType.DISPOSAL.getLabel());
+            processes.setDisposalWayCode(DisposalMethodEnums.ISSUED_DISPOSAL.getCode());
+            processes.setDisposalWayName(DisposalMethodEnums.ISSUED_DISPOSAL.getName());
+        }
+        // 整改上报
+        if (riskProcessesDto.getDisposalWayCode().equals(DisposalMethodEnums.REPORT_DISPOSAL.getCode())) {
+            riskReport.setCurrentStage(RiskReportStage.SUPERVISION.getName());
+            riskReport.setCurrentStatus(RiskReportProcessStatus.TO_CONFIRM.getName());
+            riskReport.setEndDate(new Date());
+            processes.setUnitType(RiskUnitType.RECTIFICATION.getLabel());
+            processes.setDisposalWayCode(DisposalMethodEnums.REPORT_DISPOSAL.getCode());
+            processes.setDisposalWayName(DisposalMethodEnums.REPORT_DISPOSAL.getName());
+        }
+        riskReport.setOperationUserId(userModel.getUserId());
+        updateById(riskReport);
+        riskProcessesService.save(processes);
+        return Boolean.TRUE;
+    }
 }
\ No newline at end of file