From 522c6a7448126165542f00eb299f9ad7ad8ead9f Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 12 Feb 2025 16:43:27 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfFxwzController.java | 21 +++++++++++++++++++ .../kms/yg/df/mapper/BsSgcDfDaglMapper.java | 1 + .../kms/yg/df/service/BsSgcDfAqrwService.java | 2 ++ .../kms/yg/df/service/BsSgcDfDaglService.java | 3 ++- .../sz/controller/BsSgcSzFxwzController.java | 2 +- .../mapper/yg/df/BsSgcDfBzhjsMapper.xml | 3 ++- .../mapper/yg/df/BsSgcDfDaglMapper.xml | 4 ++++ 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java index a1c9ba0f..305da561 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java @@ -9,14 +9,18 @@ import com.kms.yg.df.service.BsSgcDfFxwzService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.ConditionView; +import com.shuili.common.core.domain.MongoOperType; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** @@ -46,6 +50,23 @@ public class BsSgcDfFxwzController extends BaseController @ApiOperation("水闸防汛物资列表") public IPage list(@RequestBody SearchParam sp) { + List conditionViews = new ArrayList<>(); + ConditionView conditionView = new ConditionView(); + ConditionView cv = new ConditionView(); + BsSgcDfFxwz data = sp.getData(); + if(data!=null&&StringUtils.isNotEmpty(data.getPersonName())){ + cv.setName("person_name"); + cv.setValue(data.getPersonName()); + cv.setType(MongoOperType.LIKE); + } + if(data!=null&&StringUtils.isNotEmpty(data.getMaterialName())){ + conditionView.setName("material_name"); + conditionView.setValue(data.getMaterialName()); + conditionView.setType(MongoOperType.LIKE); + } + conditionViews.add(conditionView); + conditionViews.add(cv); + sp.setConditionViews(conditionViews); return bsSgcSzFxwzService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java index c45b7983..8285a234 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java @@ -20,6 +20,7 @@ public interface BsSgcDfDaglMapper extends BaseMapper { List getList(@Param("id") String id, @Param("dikeType") String dikeType, @Param("dikeCode") String dikeCode, + @Param("dikeName") String dikeName, @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index abe9cc43..67a00fe8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -20,6 +20,8 @@ import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index af50450d..f1cb8a6f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -28,12 +28,13 @@ public class BsSgcDfDaglService extends BaseService sp) { BsSgcDfDagl data = sp.getData(); - List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), + List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),data.getDikeName(), sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit()); Page page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java index 8f5c6795..ac25c0e6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java @@ -58,7 +58,7 @@ public class BsSgcSzFxwzController extends BaseController for (BsSgcSzFxwz record : records) { String wagaCode = record.getWagaCode(); BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) - .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode),false); record.setWagaName(one.getWagaName()); diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml index 8989a0e4..dd6f02c6 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -27,11 +27,12 @@ + 1 = 1 and sj.dike_type = #{dikeType} - and sj.dike_CODE LIKE concat('%',#{dikeCode},'%') + and sj.dike_code LIKE concat('%',#{dikeCode},'%') diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml index 6135ed3f..d79b72fa 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml @@ -39,6 +39,10 @@ and sj.adcd like concat(#{adcd},'%') + + and sj.dike_name like concat(#{dikeName},'%') + + and sd.id=#{id}