From 981a3d85848753a799da2d909089c2fe4fcd3ccf Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 18 Jul 2022 14:53:15 +0800
Subject: [PATCH] 农产品库存，操作人列表查询修改，溯源码详情查询修改，
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 ++++
src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java | 4 ++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 10 ++++-
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 10 ++---
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 5 +-
src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java | 5 ++
src/main/java/org/springblade/modules/system/controller/UserController.java | 2
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 8 ++++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 15 +++++--
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 8 ++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 2
src/main/java/org/springblade/modules/system/vo/UserVO.java | 5 ++
12 files changed, 65 insertions(+), 17 deletions(-)
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 74a1fd8..7742614 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -7,6 +7,7 @@
select sfps.id,sfps.strain_id strainId,sfps.land_id,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
sys_farm_product_stock sfps
left join sys_strain ss on ss.id = sfps.strain_id
+ left join sys_land sl on sl.id = sfps.land_id
where 1=1
<if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
and sfps.strain_id = #{farmProductStock.strainId}
@@ -25,6 +26,9 @@
</if>
<if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
and sfps.tenant_id = #{farmProductStock.tenantId}
+ </if>
+ <if test="farmProductStock.farmId!=null and farmProductStock.farmId!=''">
+ and sl.farm_id = #{farmProductStock.farmId}
</if>
group by sfps.id,sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
</select>
@@ -33,6 +37,7 @@
select sfps.strain_id strainId,sfps.land_id,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
sys_farm_product_stock sfps
left join sys_strain ss on ss.id = sfps.strain_id
+ left join sys_land sl on sl.id = sfps.land_id
where 1=1
<if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
and sfps.strain_id = #{farmProductStock.strainId}
@@ -52,6 +57,9 @@
<if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
and sfps.tenant_id = #{farmProductStock.tenantId}
</if>
+ <if test="farmProductStock.farmId!=null and farmProductStock.farmId!=''">
+ and sl.farm_id = #{farmProductStock.farmId}
+ </if>
group by sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
index a5c38e4..55e3959 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
@@ -32,6 +32,10 @@
* 结束时间
*/
private String endTime;
+
+ /**
+ * 农场id
+ */
private String farmId;
}
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 87a2960..7bec563 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -30,13 +30,15 @@
AND blade_dict_biz.tenant_id = #{land.tenantId}
</if> ) d
ON d.dict_key = l.land_type
- LEFT JOIN (SELECT dict_key, dict_value
+ LEFT JOIN
+ (SELECT dict_key, dict_value
FROM blade_dict_biz
WHERE CODE = 'landunit'
- AND is_deleted = 0 <if
- test="land.tenantId!=null and land.tenantId != ''">
- AND blade_dict_biz.tenant_id = #{land.tenantId}
- </if> ) c ON c.dict_key = l.land_unit
+ AND is_deleted = 0
+ <if test="land.tenantId!=null and land.tenantId != ''">
+ AND blade_dict_biz.tenant_id = #{land.tenantId}
+ </if>
+ ) c ON c.dict_key = l.land_unit
LEFT JOIN ( SELECT id, dept_name FROM blade_dept WHERE is_deleted = 0 ) v ON v.id = l.dept_id
where l.is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
@@ -48,6 +50,9 @@
<if test="land.deptId!=null and land.deptId != ''">
and l.dept_id=#{land.deptId}
</if>
+ <if test="land.farmId!=null and land.farmId != ''">
+ and l.farm_id=#{land.farmId}
+ </if>
<if test="land.type!=null and land.type != ''">
and l.type=#{land.type}
</if>
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 802bc44..8c70753 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -44,10 +44,11 @@
when sfp.plant = '0' then '有机'
when sfp.plant = 1 then '绿色'
when sfp.plant = 2 then '无公害'
- else '普通' end as lx
- from sys_recovery sr
+ else '普通' end as lx,
+ sl.farm_id farmId from sys_recovery sr
left join sys_strain ss on sr.strain_id = ss.id
left join sys_farm_plant sfp on sfp.id = sr.farm_plant_id
+ left join sys_land sl on sl.id = sr.land_id
where sr.id = #{recoveryId}
</select>
</mapper>
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 3777b81..5514f12 100644
--- a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
+++ b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
@@ -30,4 +30,9 @@
* url
*/
private String url;
+
+ /**
+ * 农场id
+ */
+ private String farmId;
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 402b73f..638d846 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -339,7 +339,7 @@
* @return
*/
@GetMapping("/getUserList")
- public R getUserList(User user){
+ public R getUserList(UserVO user){
return R.data(userService.getUserList(user));
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 3935273..752f5f4 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -20,8 +20,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.lang.entity.Land;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.vo.UserVO;
import java.util.List;
@@ -61,4 +63,10 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ /**
+ * 查询用户信息
+ * @param user
+ * @return
+ */
+ List<User> getUserList(@Param("user") UserVO user);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index fd25827..56a8d42 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -73,4 +73,12 @@
SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
</select>
+ <!--查询用户信息-->
+ <select id="getUserList" resultType="org.springblade.modules.system.entity.User">
+ SELECT * FROM blade_user where 1=1
+ <if test="user.farmId!=null and user.farmId!=''">
+ and find_in_set(farm_id,#{user.farmId})
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 364bf2c..9906a92 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -212,5 +212,5 @@
* @param user
* @return
*/
- List<User> getUserList(User user);
+ List<User> getUserList(UserVO user);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 42e567f..f19ac19 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
@@ -41,6 +42,8 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.lang.entity.Land;
+import org.springblade.modules.lang.service.ILandService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -74,6 +77,8 @@
private final IUserOauthService userOauthService;
private final IRoleService roleService;
private final BladeTenantProperties tenantProperties;
+
+ private final ILandService landService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -433,7 +438,8 @@
* @return
*/
@Override
- public List<User> getUserList(User user) {
- return list(new QueryWrapper<>(user));
+ public List<User> getUserList(UserVO user) {
+ //查询用户信息并返回
+ return baseMapper.getUserList(user);
}
}
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index 3552e8e..0af0efd 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -81,4 +81,9 @@
* 拓展信息
*/
private String userExt;
+
+ /**
+ * 地块id
+ */
+ private String landId;
}
diff --git a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
index ea69662..b1ada12 100644
--- a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
@@ -145,13 +145,11 @@
LandVO landInfo = (LandVO)landService.getLandInfo(land);
//4. 查询农事记录信息(种植开始起)
List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
- //5. 查询企业信息
- Farm farm = new Farm();
- farm.setDeptId(traceability1.getDeptId());
- Farm farmVO = farmService.getOne(new QueryWrapper<>(farm));
+ //5. 查询农场信息
+ Farm farm = farmService.getById(recoveryVO.getFarmId());
//6. 数据封装
dto.setRecoveryVO(recoveryVO);
- dto.setFarm(farmVO);
+ dto.setFarm(farm);
dto.setRecordVOList(farmingRecordVOList);
dto.setPaperVOList(farmPaperList);
dto.setLandVO(landInfo);
@@ -159,7 +157,7 @@
if (null!=recoveryVO){
count = count + 20;
}
- if (null!=farmVO){
+ if (null!=farm){
count = count + 20;
}
if (null==landInfo){
--
Gitblit v1.9.3