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> 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/**"); 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},'%') 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); /** * 查询统计本年农事记录操作总数 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> <!--查询统计本年农事记录操作总数--> 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(); } 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; } /** * 查询统计本年农事记录操作总数 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()); 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>
@@ -33,4 +33,6 @@ private String landname; private String argname; private String reaname; private String User; private int sta; } 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); } 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> 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); } 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); } }
