From 258c781597200e0d82fda71fd53a9f8254b9ad91 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Jun 2022 11:57:46 +0800
Subject: [PATCH] 农场，农产品，种类，种植，农事，采收，农产品库存新增租户农场id 字段，接口修改
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 18 ++++++
src/main/java/org/springblade/modules/farm/entity/Farm.java | 10 +--
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 12 ++++
src/main/java/org/springblade/modules/recovery/entity/Recovery.java | 13 ++++
src/main/java/org/springblade/modules/stock/controller/StockController.java | 2
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 6 ++
src/main/java/org/springblade/modules/traceability/entity/Traceability.java | 13 ++++
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 6 ++
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 6 ++
src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java | 15 ++++
src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml | 3 +
src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java | 14 ++++
src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java | 14 ++++
src/main/java/org/springblade/modules/farmplant/entity/Strain.java | 16 ++++-
src/main/java/org/springblade/modules/farm/entity/FarmPaper.java | 4
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 1
16 files changed, 134 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/entity/Farm.java b/src/main/java/org/springblade/modules/farm/entity/Farm.java
index fc5d7a3..41582e1 100644
--- a/src/main/java/org/springblade/modules/farm/entity/Farm.java
+++ b/src/main/java/org/springblade/modules/farm/entity/Farm.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -65,11 +66,6 @@
private String position;
/**
- * 租户id
- */
- private String tenantId;
-
- /**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -84,8 +80,8 @@
private Date updateTime;
/**
- * 用户id
+ * 农场id
*/
- private String userId;
+ private String deptId;
}
diff --git a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
index f928445..4166f2e 100644
--- a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
+++ b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
@@ -63,9 +63,9 @@
private String type;
/**
- * 租户id
+ * 农场id
*/
- private Integer farmId;
+ private String deptId;
/**
* 创建时间
diff --git a/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java b/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
index a016dea..b0d64af 100644
--- a/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
+++ b/src/main/java/org/springblade/modules/farm/entity/FarmingRecord.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -25,7 +26,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 土地id
@@ -82,4 +83,16 @@
*/
private Integer strainId;
+
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
+
}
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index 3323445..b756b23 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -22,6 +22,12 @@
<if test="farmingRecord.operator!=null and farmingRecord.operator!=''">
and sfr.operator = #{farmingRecord.operator}
</if>
+ <if test="farmingRecord.deptId!=null and farmingRecord.deptId!=''">
+ and sfr.dept_id = #{farmingRecord.deptId}
+ </if>
+ <if test="farmingRecord.tenantId!=null and farmingRecord.tenantId!=''">
+ and sfr.tenant_id = #{farmingRecord.tenantId}
+ </if>
</select>
<!--查询统计本年农事记录操作总数-->
diff --git a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
index baa461a..20eb127 100644
--- a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
@@ -36,6 +36,7 @@
recordVOS.forEach(recordVO->{
//查询字典对应的名称
DictBiz dictBiz = new DictBiz();
+ dictBiz.setTenantId(farm.getTenantId());
dictBiz.setCode("farmingType");
dictBiz.setDictKey(recordVO.getType());
DictBiz one = dictBizService.getOne(new QueryWrapper<>(dictBiz));
diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
index e409ce5..37ee67e 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -6,7 +6,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-
import java.io.Serializable;
import java.util.Date;
@@ -25,7 +24,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 土地id
@@ -124,4 +123,15 @@
*/
private String status;
+
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
+
}
diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
index 00d1759..7b5a45d 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -25,7 +26,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 品种id
@@ -72,4 +73,15 @@
*/
private Integer farmPlantId;
+
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
+
}
diff --git a/src/main/java/org/springblade/modules/farmplant/entity/Strain.java b/src/main/java/org/springblade/modules/farmplant/entity/Strain.java
index 13eb149..4b80630 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/Strain.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/Strain.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
-
import java.io.Serializable;
import java.util.Date;
@@ -17,7 +17,7 @@
*/
@Data
@TableName("sys_strain")
-public class Strain implements Serializable {
+public class Strain implements Serializable{
private static final long serialVersionUID = 1L;
@@ -25,7 +25,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 名称
@@ -55,4 +55,14 @@
* 别名
*/
private String alias;
+
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
}
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 4aaf932..31aaa60 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -36,6 +36,12 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
+ <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
+ and sfp.dept_id = #{farmPlant.deptId}
+ </if>
+ <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
+ and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
order by sfp.id desc
</select>
@@ -52,6 +58,12 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
+ <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
+ and sfp.dept_id = #{farmPlant.deptId}
+ </if>
+ <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
+ and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
group by sfp.strain_id,strain_name,land_unit
</select>
@@ -68,6 +80,12 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
+ <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
+ and sfp.dept_id = #{farmPlant.deptId}
+ </if>
+ <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
+ and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
group by sfp.strain_id,strain_name,land_unit
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 873edb4..2ce7dbc 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -20,6 +20,12 @@
<if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''">
and sfps.time <= #{farmProductStock.endTime}
</if>
+ <if test="farmProductStock.deptId!=null and farmProductStock.deptId!=''">
+ and sfps.dept_id = #{farmProductStock.deptId}
+ </if>
+ <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
+ and sfps.tenant_id = #{farmProductStock.tenantId}
+ </if>
group by sfps.strain_id,ss.url,ss.strain_name
</select>
@@ -42,6 +48,12 @@
<if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''">
and sfps.time <= #{farmProductStock.endTime}
</if>
+ <if test="farmProductStock.deptId!=null and farmProductStock.deptId!=''">
+ and sfps.dept_id = #{farmProductStock.deptId}
+ </if>
+ <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
+ and sfps.tenant_id = #{farmProductStock.tenantId}
+ </if>
group by sfps.strain_id,ss.url,ss.strain_name
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
index 879db30..cad71a6 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
@@ -8,6 +8,9 @@
<if test="strain.strainType!=null and strain.strainType!=''">
and strain_type = #{strain.strainType}
</if>
+ <if test="strain.tenantId!=null and strain.tenantId!=''">
+ and tenant_id = #{strain.tenantId}
+ </if>
<if test="strain.strainName!=null and strain.strainName!=''">
and strain_name like concat('%',#{strain.strainName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
index af0d347..b49656d 100644
--- a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
+++ b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -24,7 +25,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 种植记录id
@@ -81,4 +82,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
}
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 fc5f121..d905329 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -23,6 +23,12 @@
<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>
+ <if test="recovery.tenantId!=null and recovery.tenantId!=''">
+ and sr.tenant_id = #{recovery.tenantId}
+ </if>
</select>
<!--查询当前前缀已有的溯源码编号,取倒数7位的最大值-->
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 5c1c764..2743915 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -456,7 +456,7 @@
cknu += cknum;
}
Map map= new HashMap();
- DecimalFormat df = new DecimalFormat("#0.00");
+ DecimalFormat df = new DecimalFormat("#0.000");
String format = df.format(rknu);
Double a = Double.parseDouble(format);
String format1 = df.format(cknu);
diff --git a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
index 02f553b..d7ad4fd 100644
--- a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
+++ b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
@@ -24,7 +24,7 @@
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 商品名称
@@ -86,4 +86,15 @@
*/
private Integer recoveryId;
+ /**
+ * 农场id
+ */
+ private String deptId;
+
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
+
}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index 7860287..e81fbd6 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -10,5 +10,11 @@
<if test="traceability.code!=null and traceability.code!=''">
and st.code = #{traceability.code}
</if>
+ <if test="traceability.deptId!=null and traceability.deptId!=''">
+ and st.dept_id = #{traceability.deptId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and st.tenant_id = #{traceability.tenantId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3