bug修改

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<BsSgcDfFxwz> sp)
     {
+        List<ConditionView> 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);
     }
 

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java

@@ -20,6 +20,7 @@ public interface BsSgcDfDaglMapper extends BaseMapper<BsSgcDfDagl> {
     List<BsSgcDfDagl> 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,

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;

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java

@@ -28,12 +28,13 @@ public class BsSgcDfDaglService extends BaseService<BsSgcDfDaglMapper, BsSgcDfDa
     @Autowired
     private SysXzqhService sysXzqhService;
 
+    @Override
     public IPage selectPage(SearchParam<BsSgcDfDagl> sp) {
 
         BsSgcDfDagl data = sp.getData();
 
 
-        List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
+        List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),data.getDikeName(),
                 sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit());
 
         Page<BsSgcDfDagl> page = new Page<>();

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());
 

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml

@@ -27,11 +27,12 @@
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <where>
+            1 = 1
             <if test="dikeType!=null and dikeType!=''">
                 and sj.dike_type = #{dikeType}
             </if>
             <if test="dikeCode!=null and dikeCode!=''">
-                and sj.dike_CODE LIKE concat('%',#{dikeCode},'%')
+                and sj.dike_code LIKE concat('%',#{dikeCode},'%')
             </if>
 
             <if test="adcd!=null and adcd !=''">

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml

@@ -39,6 +39,10 @@
             <if test="adcd!=null and adcd !=''">
                 and sj.adcd like concat(#{adcd},'%')
             </if>
+            <if test="dikeName!=null and dikeName !=''">
+                and sj.dike_name like concat(#{dikeName},'%')
+            </if>
+
             <if test="id!=null and id!=''">
                 and sd.id=#{id}
             </if>