From 66318f917918b8e718f93fe30f9c3103bab54e78 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 21 Jul 2022 08:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 10 +++++++---
src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java | 6 ++++++
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml | 4 ++++
src/main/java/org/springblade/modules/stock/controller/StockController.java | 15 ++++++++-------
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 8c70753..1899fed 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,10 +4,14 @@
<!--自定义查询采收记录分页数据-->
<select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
- select sr.*,sl.land_name landName,ss.strain_name strainName from sys_recovery sr
+ select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName from sys_recovery sr
left join sys_land sl on sl.id = sr.land_id
left join sys_strain ss on ss.id = sr.strain_id
+ left join blade_user user ON user.id = sr.operator
where 1=1
+ <if test="recovery.strainName!=null and recovery.strainName!=''">
+ and ss.strain_name like concat ('%',#{recovery.strainName},'%')
+ </if>
<if test="recovery.strainId!=null and recovery.strainId!=''">
and sr.strain_id = #{recovery.strainId}
</if>
@@ -23,8 +27,8 @@
<if test="recovery.operator!=null and recovery.operator!=''">
and sr.operator = #{recovery.operator}
</if>
- <if test="recovery.deptId!=null and recovery.deptId!=''">
- and sr.dept_id = #{recovery.deptId}
+ <if test="recovery.farmId != null and recovery.farmId != ''">
+ and sl.farm_id = #{recovery.farmId}
</if>
<if test="recovery.tenantId!=null and recovery.tenantId!=''">
and sr.tenant_id = #{recovery.tenantId}
diff --git a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
index 5514f12..aa5f08e 100644
--- a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
+++ b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
@@ -35,4 +35,10 @@
* 农场id
*/
private String farmId;
+
+ /**
+ * 操作人
+ */
+ private String realName;
+
}
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index d1b9329..e3d4735 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -41,6 +41,7 @@
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
@@ -255,8 +256,8 @@
* @return
*/
@GetMapping("/StockCount")
- public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201");
+ public R StockCount(String deptId) {
+ List<Map<String, Object>> maps = stockService.StockCount(deptId);
//化肥0
double hf = 0;
//有机肥1
@@ -426,19 +427,19 @@
}
Map map = new HashMap();
map.put("name", "化肥");
- map.put("val", hf);
+ map.put("val", new BigDecimal(hf).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map1 = new HashMap();
map1.put("name", "有机肥");
- map1.put("val", yjf);
+ map1.put("val", new BigDecimal(String.valueOf(yjf)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map2 = new HashMap();
map2.put("name", "杀虫剂");
- map2.put("val", scj);
+ map2.put("val", new BigDecimal(String.valueOf(scj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map3 = new HashMap();
map3.put("name", "杀菌剂");
- map3.put("val", sjj);
+ map3.put("val", new BigDecimal(String.valueOf(sjj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map4 = new HashMap();
map4.put("name", "饲料");
- map4.put("val", sl);
+ map4.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
List list = new ArrayList();
list.add(map);
list.add(map1);
diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index 40a4184..7067928 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -80,12 +80,16 @@
LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1
WHERE st.is_deleted = 0
+ <if test="stockrecord.agrname!=null and stockrecord.agrname != ''">
+ and f.agricultural_name like concat ('%',#{stockrecord.agrname},'%')
+ </if>
<if test="stockrecord.stype!=null and stockrecord.stype != ''">
and stf.type = #{stockrecord.stype}
</if>
<if test="stockrecord.sid!=null and stockrecord.sid != ''">
and st.sid = #{stockrecord.sid}
</if>
+ ORDER BY st.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3