From ff057092893a5c3852d66d2423cfeb5463106079 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 四月 2024 18:03:19 +0800
Subject: [PATCH] 费用统计
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 7332011..eea8eed 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -76,9 +76,8 @@
@Resource
private InsReportMapper insReportMapper;
+ @Resource
private InsProductResultMapper insProductResultMapper;
-
- private InsProductMapper insProductMapper;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -192,7 +191,7 @@
JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
Map<String, Object> map = new HashMap<>();
map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
- if (insValue.get("u") == null && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+ if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
map.put("u", userId);
}else {
map.put("u", insValue.get("u"));
--
Gitblit v1.9.3