From 1d98074869643dcf23b40d99e0f24b6048fc6ff0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 29 Jun 2022 08:27:12 +0800
Subject: [PATCH] 地块管理
---
src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java | 6 ++
src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java | 1
pom.xml | 8 ++++
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 1
src/main/java/org/springblade/modules/task/vo/TaskVO.java | 2 +
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java | 1
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 4 ++
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 33 ++++++++++++++++
src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml | 6 +-
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 5 ++
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java | 1
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 11 ++---
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 16 ++++++++
14 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index ea1ec44..c76c78f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,14 @@
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib -->
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
</dependencies>
<build>
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 4c5452a..5c8c0e8 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -54,6 +54,7 @@
secureRegistry.excludePathPatterns("/druid/**");
secureRegistry.excludePathPatterns("/farmPlant/**");
secureRegistry.excludePathPatterns("/land/land/**");
+ secureRegistry.excludePathPatterns("/qrCode/**");
secureRegistry.excludePathPatterns("/farmPlant/**");
secureRegistry.excludePathPatterns("/task/task/**");
secureRegistry.excludePathPatterns("/recovery/**");
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index d226dd9..8e5ed4c 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -5,11 +5,11 @@
<!--自定义查询农场检测报告/证书分页数据-->
<select id="selectFarmPaperPage" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
select * from sys_farm_paper where 1=1
- <if test="farmPaper.type!=null">
+ <if test="farmPaper.type!=null and farmPaper.type!=''">
and type = #{farmPaper.type}
</if>
- <if test="farmPaper.farmId!=null">
- and farm_id = #{farmPaper.farmId}
+ <if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
+ and dept_id = #{farmPaper.deptId}
</if>
<if test="farmPaper.name!=null and farmPaper.name!=''">
and name like concat('%',#{farmPaper.name},'%')
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
index 2909d8c..115b4d5 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
@@ -40,6 +40,7 @@
* @return
*/
List<FarmingRecordVO> selectFarmingRecordPage(@Param("page") IPage page,@Param("farmingRecord") FarmingRecordVO farm);
+ List<FarmingRecordVO> selectFarmingRecordPages(@Param("farmingRecord") FarmingRecordVO farm);
/**
* 查询统计本年农事记录操作总数
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 b756b23..a4c69a5 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -28,6 +28,39 @@
<if test="farmingRecord.tenantId!=null and farmingRecord.tenantId!=''">
and sfr.tenant_id = #{farmingRecord.tenantId}
</if>
+ <if test="farmingRecord.strainId!=null and farmingRecord.strainId!=''">
+ and sfr.strain_id = #{farmingRecord.strainId}
+ </if>
+ </select>
+
+ <select id="selectFarmingRecordPages" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
+ select sfr.*,sl.land_name landName from sys_farming_record sfr
+ left join sys_land sl on sl.id = sfr.land_id
+ where 1=1
+ <if test="farmingRecord.landId!=null and farmingRecord.landId!=''">
+ and sfr.land_id = #{farmingRecord.landId}
+ </if>
+ <if test="farmingRecord.type!=null and farmingRecord.type!=''">
+ and sfr.type = #{farmingRecord.type}
+ </if>
+ <if test="farmingRecord.stockId!=null and farmingRecord.stockId!=''">
+ and sfr.stock_id = #{farmingRecord.stockId}
+ </if>
+ <if test="farmingRecord.jobWay!=null and farmingRecord.jobWay!=''">
+ and sfr.job_way = #{farmingRecord.jobWay}
+ </if>
+ <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>
+ <if test="farmingRecord.strainId!=null and farmingRecord.strainId!=''">
+ and sfr.strain_id = #{farmingRecord.strainId}
+ </if>
</select>
<!--查询统计本年农事记录操作总数-->
diff --git a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
index 7250bff..cc260e7 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.vo.FarmingRecordVO;
+
+import java.util.List;
/**
* 农事记录服务类
@@ -21,7 +24,7 @@
* @return
*/
IPage<FarmingRecordVO> selectFarmingRecordPage(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
-
+ List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm);
/**
* 查询统计本年农事记录操作总数
* @return
@@ -33,4 +36,5 @@
* @return
*/
Object getFarmingStatis();
+
}
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 20eb127..7e6f953 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
@@ -46,6 +46,22 @@
return page.setRecords(recordVOS);
}
+ @Override
+ public List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm) {
+ List<FarmingRecordVO> farmingRecordVOS = baseMapper.selectFarmingRecordPages(farm);
+ farmingRecordVOS.forEach(recordVO->{
+ //查询字典对应的名称
+ DictBiz dictBiz = new DictBiz();
+ dictBiz.setTenantId(recordVO.getTenantId());
+ dictBiz.setCode("farmingType");
+ dictBiz.setDictKey(recordVO.getType());
+ DictBiz one = dictBizService.getOne(new QueryWrapper<>(dictBiz));
+ //设置名称
+ recordVO.setTypeName(one.getDictValue());
+ });
+ return farmingRecordVOS;
+ }
+
/**
* 查询统计本年农事记录操作总数
diff --git a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
index 4d20f68..38bf81d 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -102,6 +102,7 @@
//采收
record.setType("12");
record.setLandId(recovery.getLandId());
+ record.setStrainId(recovery.getStrainId());
record.setOperator(recovery.getOperator());
Strain strain = strainService.getById(recovery.getStrainId());
record.setContent("品种: " + strain.getStrainName() + ", 重量：" + recovery.getWeight());
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 5c39eb5..6a415ad 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -32,15 +32,12 @@
LEFT JOIN sys_land l ON t.land_id = l.id
LEFT JOIN sys_stockfactory f ON f.id=t.stock_id
LEFT JOIN blade_user u ON u.id=t.task_user
- where t.is_deleted = 0
- <if test="task.status!=null and task.status!=''">
- and t.status=#{task.status}
- </if>
+ where t.is_deleted = 0 and t.status=#{task.status}
<if test="task.taskUser!=null and task.taskUser!=''">
- and t.create_user=#{task.taskUser}
+ and t.task_user=#{task.taskUser}
</if>
- <if test="task.createUser!=null and task.createUser!=''">
- and t.create_user=#{task.createUser}
+ <if test="task.User!=null and task.User!=''">
+ and t.create_user=#{task.User}
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index 3cbabbd..8ea9bc9 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -33,4 +33,6 @@
private String landname;
private String argname;
private String reaname;
+ private String User;
+ private int sta;
}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
index 1b8126c..4516f2e 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
@@ -23,4 +23,5 @@
* @return
*/
List<TraceabilityVO> selectTraceabilityPage(@Param("page") IPage page, @Param("traceability") TraceabilityVO traceability);
+ String selectRevorid(String code);
}
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 e81fbd6..cb95225 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -17,4 +17,8 @@
and st.tenant_id = #{traceability.tenantId}
</if>
</select>
+
+ <select id="selectRevorid" resultType="java.lang.String">
+ select recovery_id from sys_traceability where code=#{code}
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java b/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
index 9eca07b..ce42dff 100644
--- a/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
+++ b/src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
@@ -21,4 +21,5 @@
* @return
*/
IPage<TraceabilityVO> selectTraceabilityPage(IPage<TraceabilityVO> page, TraceabilityVO traceability);
+ String selectRevorid(String code);
}
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 1cef9ad..d6a445c 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
@@ -28,4 +28,9 @@
public IPage<TraceabilityVO> selectTraceabilityPage(IPage<TraceabilityVO> page, TraceabilityVO traceability) {
return page.setRecords(baseMapper.selectTraceabilityPage(page, traceability));
}
+
+ @Override
+ public String selectRevorid(String code) {
+ return baseMapper.selectRevorid(code);
+ }
}
--
Gitblit v1.9.3