计量bug

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterTreeContract.java

@@ -8,7 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 import java.math.BigDecimal;
 
 /**
- * 合同段计量单元树详情表
+ * 合同段计量单元树
  */
 @Data
 @TableName(value = "s_meter_tree_contract")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterTreeProject.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * 项目级计量单元树详情表
+ * 项目级计量单元树
  */
 @Data
 @TableName(value = "s_meter_tree_project")
@@ -33,7 +33,7 @@ public class MeterTreeProject extends BaseEntity {
     @ApiModelProperty(value = "数据源类型 1=原始引用、2=新增、3=导入、4=复制")
     private Integer dataSourceType;
 
-    @ApiModelProperty(value = "源节点id（项目树节点id）")
+    @ApiModelProperty(value = "源节点id（系统树节点id）")
     private Long sourceNodeId;
 
     @ApiModelProperty(value = "编辑状态 0=非编辑，1=是编辑")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterTreeSystem.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
- * 系统级计量单元树详情表
+ * 系统级计量单元树
  */
 @Data
 @TableName(value = "s_meter_tree_system")

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MidPayItemController.java

@@ -75,7 +75,12 @@ public class MidPayItemController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "系统中期支付项删除", notes = "传入id")
     public R<Object> systemRemove(@RequestParam String id) {
-        return R.data(payItemSystemService.removeById(id));
+        if (payItemSystemService.removeById(id)) {
+            /*删除关联信息*/
+            jdbcTemplate.execute("DELETE FROM s_meter_mid_pay_item_relation WHERE mid_pay_id = " + id);
+            return R.success("操作成功");
+        }
+        return R.fail("操作失败");
     }
 
     @PostMapping("/system/page")
@@ -168,7 +173,10 @@ public class MidPayItemController extends BladeController {
         if (obj != null && ObjectUtil.isNotEmpty(obj.getDataSourceId())) {
             /*修改回未被引用状态*/
             if (payItemSystemService.update(Wrappers.<MeterMidPayItemSystem>lambdaUpdate().set(MeterMidPayItemSystem::getIsReferenced, 0).eq(MeterMidPayItemSystem::getId, obj.getDataSourceId()))) {
-                return R.data(payItemProjectService.removeById(id));
+                if (payItemProjectService.removeById(id)) {
+                    jdbcTemplate.execute("DELETE FROM s_meter_mid_pay_item_relation WHERE mid_pay_id = " + id);
+                    return R.success("操作成功");
+                }
             }
         }
         return R.fail("操作失败");
@@ -266,7 +274,10 @@ public class MidPayItemController extends BladeController {
         if (obj != null && ObjectUtil.isNotEmpty(obj.getDataSourceId())) {
             /*修改回未被引用状态*/
             if (payItemProjectService.update(Wrappers.<MeterMidPayItemProject>lambdaUpdate().set(MeterMidPayItemProject::getIsReferenced, 0).eq(MeterMidPayItemProject::getId, obj.getDataSourceId()))) {
-                return R.data(payItemContractService.removeById(id));
+                if (payItemContractService.removeById(id)) {
+                    jdbcTemplate.execute("DELETE FROM s_meter_mid_pay_item_relation WHERE mid_pay_id = " + id);
+                    return R.success("操作成功");
+                }
             }
         }
         return R.fail("操作失败");