From 20226d81076969575330af4087d61a37211a074f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 04 Jul 2022 20:25:41 +0800
Subject: [PATCH] 溯源码接口完善
---
src/main/java/org/springblade/modules/traceability/dto/TraceabilityDetailDTO.java | 5 +++++
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 2 +-
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 29 ++++++++++++++++++++++++++++-
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 3 ++-
4 files changed, 36 insertions(+), 3 deletions(-)
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 44ec99f..119cae5 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -145,6 +145,6 @@
left join blade_user bu on bu.id = sfr.operator
where land_id = #{recovery.landId}
and strain_id = #{recovery.strainId}
- order by sfr.time desc,sfr.create_time desc
+ order by sfr.time asc,sfr.create_time asc
</select>
</mapper>
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 b2320ad..b87642e 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -75,7 +75,8 @@
land_area,
ST_ASTEXT(land_range) as landRange,
type,
- land_unit
+ land_unit,
+ url
from sys_land
where 1 = 1
and is_deleted = 0
diff --git a/src/main/java/org/springblade/modules/traceability/dto/TraceabilityDetailDTO.java b/src/main/java/org/springblade/modules/traceability/dto/TraceabilityDetailDTO.java
index 7cb34fc..1cbd964 100644
--- a/src/main/java/org/springblade/modules/traceability/dto/TraceabilityDetailDTO.java
+++ b/src/main/java/org/springblade/modules/traceability/dto/TraceabilityDetailDTO.java
@@ -39,4 +39,9 @@
* 企业信息
*/
private Farm farm;
+
+ /**
+ * 百分比
+ */
+ private Integer num;
}
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 8a5da5e..77db969 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
@@ -14,6 +14,9 @@
import org.springblade.modules.farm.vo.FarmPaperVO;
import org.springblade.modules.farm.vo.FarmVO;
import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.lang.entity.Land;
+import org.springblade.modules.lang.service.ILandService;
+import org.springblade.modules.lang.vo.LandVO;
import org.springblade.modules.recovery.service.RecoveryService;
import org.springblade.modules.recovery.vo.RecoveryVO;
import org.springblade.modules.traceability.dto.TraceabilityDTO;
@@ -51,6 +54,9 @@
@Autowired
private FarmPaperService farmPaperService;
+
+ @Autowired
+ private ILandService landService;
/**
* 自定义分页
@@ -109,6 +115,7 @@
@Override
public TraceabilityDetailDTO getTraceabilityDetailInfo(Traceability traceability) {
TraceabilityDetailDTO dto = new TraceabilityDetailDTO();
+ int count = 0;
//根据溯源码编号查询溯源信息
Traceability traceability1 = baseMapper.selectOne(new QueryWrapper<>(traceability));
//1. 查询农产品采收记录信息
@@ -116,7 +123,9 @@
//2. 查询相关检测信息
List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(traceability1.getDeptId());
//3. 查询产地（地块）信息
-
+ LandVO land = new LandVO();
+ land.setId(Long.parseLong(recoveryVO.getLandId()));
+ LandVO landInfo = (LandVO)landService.getLandInfo(land);
//4. 查询农事记录信息(种植开始起)
List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
//5. 查询企业信息
@@ -128,6 +137,24 @@
dto.setFarm(farmVO);
dto.setRecordVOList(farmingRecordVOList);
dto.setPaperVOList(farmPaperList);
+ dto.setLandVO(landInfo);
+ //计算百分比
+ if (null!=recoveryVO){
+ count = count + 20;
+ }
+ if (null!=farmVO){
+ count = count + 20;
+ }
+ if (null==landInfo){
+ count = count + 20;
+ }
+ if (farmingRecordVOList.size()>0){
+ count = count + 20;
+ }
+ if (farmPaperList.size()>0){
+ count = count + 20;
+ }
+ dto.setNum(count);
//返回数据
return dto;
}
--
Gitblit v1.9.3