修改代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml

@@ -59,7 +59,7 @@
         left join privilege_company pc on sta.regional_companies_code = pc.ORG_CODE
     <where>
         <if test="dto.snCode != null and dto.snCode != ''">
-            hjc.sn_code = #{dto.snCode}
+            hjc.sn_code like #{dto.snCode}
         </if>
         <if test="dto.type != null and dto.type !=''">
             hjc.type = #{dto.type}
@@ -80,7 +80,7 @@
         left join privilege_company pc on sta.regional_companies_code = pc.ORG_CODE
         <where>
             <if test="dto.snCode != null and dto.snCode != ''">
-                hjc.sn_code = #{dto.snCode}
+                hjc.sn_code like #{dto.snCode}
             </if>
             <if test="dto.type != null and dto.type !=''">
                 hjc.type = #{dto.type}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpCollectorController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpInverterServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -185,6 +186,11 @@ public class JpCollectorController extends BaseController {
 			Page<JpCollectorDto> page = new Page<JpCollectorDto>();
 			page.setCurrent(current);
 			page.setSize(size);
+
+			if (StringUtils.isNotEmpty(jpCollectorDto.getSnCode())){
+				jpCollectorDto.setSnCode("%"+jpCollectorDto.getSnCode()+"%");
+			}
+
 			page.setTotal(jpCollectorServiceImpl.selectPageDataTota(jpCollectorDto));
 			page.setRecords(jpCollectorServiceImpl.selectPageData(jpCollectorDto,(current-1)*size,size));
 			return ResponseHelper.buildResponse(page);