diff --git a/src/main/java/com/sztzjy/money_management/controller/CaseController.java b/src/main/java/com/sztzjy/money_management/controller/CaseController.java index 40b264b..da7a083 100644 --- a/src/main/java/com/sztzjy/money_management/controller/CaseController.java +++ b/src/main/java/com/sztzjy/money_management/controller/CaseController.java @@ -176,11 +176,12 @@ public class CaseController { @AnonymousAccess private ResultEntity> getCaseInfoList(@RequestParam Integer index, @RequestParam Integer size, - @RequestParam(required = false) String schoolId, + @RequestParam(required = false) String model, + @RequestParam(required = false) String schoolId, @RequestParam(required = false) String keyWord, @RequestParam(required = false) String type) { PageHelper.startPage(index, size); - List caseInfoList = caseInfoMapper.getCaseInfoList(schoolId, keyWord, type); + List caseInfoList = caseInfoMapper.getCaseInfoList(model, schoolId, keyWord, type); PageInfo pageInfo = new PageInfo(caseInfoList); return new ResultEntity>(pageInfo); } diff --git a/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java b/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java index eefa2e8..4bfd057 100644 --- a/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java +++ b/src/main/java/com/sztzjy/money_management/mapper/CaseInfoMapper.java @@ -2,12 +2,11 @@ package com.sztzjy.money_management.mapper; import com.sztzjy.money_management.entity.CaseInfo; import com.sztzjy.money_management.entity.CaseInfoExample; - -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface CaseInfoMapper { long countByExample(CaseInfoExample example); @@ -38,7 +37,8 @@ public interface CaseInfoMapper { int updateByPrimaryKey(CaseInfo record); - List getCaseInfoList(@Param("schoolId") String schoolId, + List getCaseInfoList(@Param("model") String model, + @Param("schoolId") String schoolId, @Param("keyWord") String keyWord, @Param("type") String type); } \ No newline at end of file diff --git a/src/main/resources/mapper/CaseInfoMapper.xml b/src/main/resources/mapper/CaseInfoMapper.xml index 0ab821c..52f1922 100644 --- a/src/main/resources/mapper/CaseInfoMapper.xml +++ b/src/main/resources/mapper/CaseInfoMapper.xml @@ -354,6 +354,9 @@ AND source IN ('999999999', #{schoolId}) + + AND model =#{model} + AND (customer_name LIKE CONCAT('%', #{keyWord}, '%') OR id_card LIKE CONCAT('%', #{keyWord}, '%'))