Browse Source

测站点bug修复

yangyj 3 years ago
parent
commit
8882062dfd

+ 19 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/MileagePartDTO.java

@@ -0,0 +1,19 @@
+package org.springblade.business.dto;
+
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2022/6/10 16:28
+ * @description TODO
+ */
+@Data
+public class MileagePartDto {
+    private String id;
+    private String name;
+    private String prefix;
+    private String remark;
+    private String contractId;
+    private String projectId;
+    private Integer sort;
+}

+ 2 - 2
blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/Mileagexy.java

@@ -49,12 +49,12 @@ public class Mileagexy   extends TenantEntity {
 
 
 	public String getValueStr() {
-		return MileageUtill.convertToMileage(value);
+		return partNo+MileageUtill.convertToMileage(value);
 	}
 
 
 	public String getValueEndStr() {
-		return MileageUtill.convertToMileage(valueEnd);
+		return partNo+MileageUtill.convertToMileage(valueEnd);
 	}
 
 	public String getXxStr() {

+ 3 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/MileageController.java

@@ -97,6 +97,9 @@ public class MileageController {
         if(StringUtil.isBlank(ids)){
             return R.fail("对象不存在");
         }
+        if(this.service.count(Wrappers.<Mileagexy>lambdaQuery().in(Mileagexy::getPartId,Func.toLongList(ids)))>0){
+             return  R.fail("已经存关联线元信息,无法删除");
+        }
         return R.status(partService.removeByIds(Func.toLongList(ids)));
     }