From 3c1f9d699497dcfc4b682502945a4ebee4c37e03 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 27 十二月 2024 16:54:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
index 54b6899..6d74d70 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -1,7 +1,9 @@
package com.example.erp.service.sd;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.sd.BasicData;
+import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.entity.sd.Customer;
import com.example.erp.mapper.sd.BasicDateMapper;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
@@ -42,7 +44,10 @@
orderBasicDataMap.get("customer").add(customer);
}
- orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ orderBasicDataMap.put("orderOtherMoney",
+ Collections.singletonList(
+ basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))
+ ));
//杩斿洖Map瀵硅薄
@@ -90,7 +95,7 @@
//灏嗘暟鎹斁鍏ist涓�
BasicDataMap.get(item.getBasicCategory()).add(item);
}
- BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ BasicDataMap.put("deliveryOtherMoney", Collections.singletonList( basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))));
return BasicDataMap;
}
@@ -136,6 +141,7 @@
basicData.setBasicType(basicTypeList.get(0));
basicData.setBasicCategory(basicTypeList.get(1));
basicData.setBasicName(map.get("input").toString());
+ basicData.setNickname(map.get("nickname").toString());
basicDateMapper.insert(basicData);
}
return true;
--
Gitblit v1.8.0