Browse Source

修复解批后任务详情bug

lw 1 year ago
parent
commit
c990e09bea

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostListVO.java

@@ -19,7 +19,7 @@ public class ProjectCostListVO  implements Serializable {
     /**主键*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.String id;
     /**任务号/来自科研任务*/
     @Excel(name = "任务号/来自科研任务", width = 15)
     @ApiModelProperty(value = "任务号/来自科研任务")

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -139,7 +139,7 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
         future.join();
 
 
-        if (compareMap.isEmpty()) return Result.ok("没有找到结果");
+        if (compareMap.isEmpty()) return Result.ok("选择的任务号没有材料费");
 
         ArrayList<CompletableFuture<Void>> processFutures = new ArrayList<>();