src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -75,6 +75,16 @@ } /** * 自定义查询,不分页 * @param traceability * @return */ @GetMapping("/getTraceabilityList") public R getTraceabilityList(TraceabilityVO traceability) { return R.data(traceabilityService.getTraceabilityList(traceability)); } /** * 新增 */ @PostMapping("/save") src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.java
@@ -33,4 +33,11 @@ * @return */ TraceabilityDTO getSimpleInfo(@Param("traceability") Traceability traceability); /** * 自定义查询,不分页 * @param traceability * @return */ List<TraceabilityVO> getTraceabilityList(@Param("traceability") TraceabilityVO traceability); } src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -2,13 +2,29 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.springblade.modules.traceability.mapper.TraceabilityMapper"> <!--自定义查询农场养殖记录分页数据--> <!--自定义查询溯源码分页数据--> <select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO"> select st.* from sys_traceability st left join sys_recovery sr on st.recovery_id = sr.id where 1=1 <if test="traceability.code!=null and traceability.code!=''"> and st.code = #{traceability.code} and st.code like concat('%',#{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> <!--自定义查询溯源码数据,不分页--> <select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO"> select st.* from sys_traceability st left join sys_recovery sr on st.recovery_id = sr.id where 1=1 <if test="traceability.code!=null and traceability.code!=''"> and st.code like concat('%',#{traceability.code},'%') </if> <if test="traceability.deptId!=null and traceability.deptId!=''"> and st.dept_id = #{traceability.deptId} src/main/java/org/springblade/modules/traceability/service/TraceabilityService.java
@@ -8,6 +8,8 @@ import org.springblade.modules.traceability.entity.Traceability; import org.springblade.modules.traceability.vo.TraceabilityVO; import java.util.List; /** * 溯源码表服务类 * @since 2022-05-19 @@ -38,4 +40,11 @@ * @return */ TraceabilityDetailDTO getTraceabilityDetailInfo(Traceability traceability); /** * 自定义查询,不分页 * @param traceability * @return */ List<TraceabilityVO> getTraceabilityList(TraceabilityVO traceability); } src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
@@ -158,4 +158,14 @@ //返回数据 return dto; } /** * 自定义查询,不分页 * @param traceability * @return */ @Override public List<TraceabilityVO> getTraceabilityList(TraceabilityVO traceability) { return baseMapper.getTraceabilityList(traceability); } } src/main/resources/application-test.yml
@@ -38,3 +38,6 @@ remote-mode: true upload-domain: http://localhost:8999 remote-path: /usr/share/nginx/html zhny: codeUrl: http://61.131.136.25:2080/securityInfo.html