|
@@ -91,7 +91,7 @@ public class ContractInfoController extends BladeController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 分页 合同段信息表
|
|
|
+ * 分页 合同段信息
|
|
|
*/
|
|
|
@GetMapping("/list")
|
|
|
@ApiOperationSupport(order = 2)
|
|
@@ -102,7 +102,7 @@ public class ContractInfoController extends BladeController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 自定义分页 合同段信息表
|
|
|
+ * 自定义分页 合同段信息
|
|
|
*/
|
|
|
@GetMapping("/page")
|
|
|
@ApiOperationSupport(order = 3)
|
|
@@ -114,7 +114,7 @@ public class ContractInfoController extends BladeController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 新增 合同段信息表
|
|
|
+ * 新增 合同段信息
|
|
|
*/
|
|
|
@PostMapping("/save")
|
|
|
@ApiOperationSupport(order = 4)
|
|
@@ -124,7 +124,7 @@ public class ContractInfoController extends BladeController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 修改 合同段信息表
|
|
|
+ * 修改 合同段信息
|
|
|
*/
|
|
|
@PostMapping("/update")
|
|
|
@ApiOperationSupport(order = 5)
|
|
@@ -145,7 +145,7 @@ public class ContractInfoController extends BladeController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 新增或修改 合同段信息表
|
|
|
+ * 新增或修改 合同段信息
|
|
|
*/
|
|
|
@PostMapping("/submit")
|
|
|
@ApiOperationSupport(order = 6)
|
|
@@ -159,13 +159,13 @@ public class ContractInfoController extends BladeController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 删除 合同段信息表
|
|
|
+ * 删除 合同段信息
|
|
|
*/
|
|
|
@PostMapping("/remove")
|
|
|
@ApiOperationSupport(order = 7)
|
|
|
@ApiOperation(value = "逻辑删除", notes = "传入ids")
|
|
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
|
|
- //白马合同段不允许删除,syncProjectUserInfo合同段同步白马人员接口使用中
|
|
|
+ /*白马合同段不允许删除,syncProjectUserInfo合同段同步白马人员接口使用中*/
|
|
|
List<String> baiMaList = Arrays.asList("1612335077269143554", "1613022750656921601", "1613823243083792385", "1687370014959017986", "1687370619295309826");
|
|
|
if (baiMaList.contains(ids)) {
|
|
|
return R.fail("该项目合同段不允许删除,请联系管理员");
|
|
@@ -179,6 +179,19 @@ public class ContractInfoController extends BladeController {
|
|
|
if (saveUserInfoByProjectMapper.selectSGJL(ids) > 0) {
|
|
|
return R.fail("当前监理合同段存在关联的施工合同信息,删除失败");
|
|
|
}
|
|
|
+
|
|
|
+ /*逻辑删除计量相关信息*/
|
|
|
+ ContractInfo info = contractInfoService.getById(ids);
|
|
|
+ if (info != null && info.getContractType().equals(4)) {
|
|
|
+ /*逻辑删除关联信息*/
|
|
|
+ jdbcTemplate.execute("UPDATE s_meter_contract_info SET is_deleted = 1 WHERE contract_id = " + ids);
|
|
|
+ /*逻辑删除合同段计量单元信息*/
|
|
|
+ jdbcTemplate.execute("UPDATE s_meter_tree_contract SET is_deleted = 1 WHERE contract_id = " + ids);
|
|
|
+ /*逻辑删除合同段中期支付项信息*/
|
|
|
+ jdbcTemplate.execute("UPDATE s_meter_mid_pay_item_contract SET is_deleted = 1 WHERE contract_id = " + ids);
|
|
|
+ }
|
|
|
+
|
|
|
+ /*逻辑删除合同段信息*/
|
|
|
return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));
|
|
|
}
|
|
|
|