diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java index 5306c68..5356ccd 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/controller/LwKhclController.java @@ -4,6 +4,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; @@ -19,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.demo.zjSqxx.entity.ZjSqxx; +import org.jeecg.modules.demo.zjSqxx.service.IZjSqxxService; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -36,10 +39,7 @@ import java.io.FileOutputStream; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: lw_khcl @@ -56,6 +56,8 @@ public class LwKhclController extends JeecgController { private ILwKhclService lwKhclService; @Resource private JeecgBaseConfig jeecgBaseConfig; + @Autowired + private IZjSqxxService zjSqxxService; /** * 分页列表查询 * @@ -72,30 +74,44 @@ public class LwKhclController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } + if(StringUtils.equals("1",sfjx)){ + return Result.error("您未在授权期限内,不能进行查询!"); + } String bynf = req.getParameter("bynf"); String ssyxmc = req.getParameter("ssyxmc"); String ssxnzymc = req.getParameter("ssxnzymc"); Page page = new Page(pageNo, pageSize); - IPage pageList = lwKhclService.getPage(page, bynf, ssyxmc, ssxnzymc); + IPage pageList = lwKhclService.getPage(page, bynf, ssyxmc, ssxnzymc, inBynf, inSsyxmc, inBylwLb); return Result.OK(pageList); } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "lw_khcl-通过id查询") - @ApiOperation(value="lw_khcl-通过id查询", notes="lw_khcl-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - LwKhcl lwKhcl = lwKhclService.getById(id); - if(lwKhcl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(lwKhcl); - } /** * 导出excel @@ -105,12 +121,41 @@ public class LwKhclController extends JeecgController { @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, LwKhcl lwKhcl) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + if(StringUtils.equals("1",sfjx)){ + return mv; + } String bynf = request.getParameter("bynf"); String ssyxmc = request.getParameter("ssyxmc"); String ssxnzymc = request.getParameter("ssxnzymc"); - List exportList = lwKhclService.getList(bynf, ssyxmc, ssxnzymc); - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List exportList = lwKhclService.getList(bynf, ssyxmc, ssxnzymc, inBynf, inSsyxmc, inBylwLb); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "论文考核材料列表"); mv.addObject(NormalExcelConstants.CLASS, LwKhcl.class); @@ -139,6 +184,33 @@ public class LwKhclController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } String bynf = req.getParameter("bynf"); String ssyxmc = req.getParameter("ssyxmc"); String ssxnzymc = req.getParameter("ssxnzymc"); @@ -146,7 +218,7 @@ public class LwKhclController extends JeecgController { String zdjsxm = req.getParameter("zdjsxm"); String bylwTm = req.getParameter("bylwTm"); Page page = new Page(pageNo, pageSize); - IPage pageList = lwKhclService.getCjPage(page, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm); + IPage pageList = lwKhclService.getCjPage(page, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm, inBynf, inSsyxmc, inBylwLb); return Result.OK(pageList); } @@ -158,15 +230,44 @@ public class LwKhclController extends JeecgController { @RequestMapping(value = "/cjExportXls") public ModelAndView cjExportXls(HttpServletRequest request, LwKhclCj lwKhclCj) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + if(StringUtils.equals("1",sfjx)){ + return mv; + } String bynf = request.getParameter("bynf"); String ssyxmc = request.getParameter("ssyxmc"); String ssxnzymc = request.getParameter("ssxnzymc"); String xsxm = request.getParameter("xsxm"); String zdjsxm = request.getParameter("zdjsxm"); String bylwTm = request.getParameter("bylwTm"); - List exportList = lwKhclService.getCjList(bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm); - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List exportList = lwKhclService.getCjList(bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm, inBynf, inSsyxmc, inBylwLb); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "论文考核材料成绩"); mv.addObject(NormalExcelConstants.CLASS, LwKhclCj.class); @@ -195,6 +296,33 @@ public class LwKhclController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } String xsxh = req.getParameter("xsxh"); String xsxm = req.getParameter("xsxm"); String ssxnzymc = req.getParameter("ssxnzymc"); @@ -202,7 +330,7 @@ public class LwKhclController extends JeecgController { String zqjc = req.getParameter("zqjc"); String lwzg = req.getParameter("lwzg"); Page page = new Page(pageNo, pageSize); - IPage pageList = lwKhclService.getXqPage(page, xsxh,xsxm,ssxnzymc,ktbg,zqjc,lwzg); + IPage pageList = lwKhclService.getXqPage(page, xsxh,xsxm,ssxnzymc,ktbg,zqjc,lwzg, inBynf, inSsyxmc, inBylwLb); return Result.OK(pageList); } @@ -214,15 +342,44 @@ public class LwKhclController extends JeecgController { @RequestMapping(value = "/xqExportXls") public ModelAndView xqExportXls(HttpServletRequest request, LwKhclXq lwKhclXq) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","2"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String inBynf = ""; + String inSsyxmc = ""; + String inBylwLb = ""; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + inBynf = zjSqxx.getXnxq(); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + inSsyxmc = zjSqxx.getKkdw(); + } + if(StringUtils.isNotBlank(zjSqxx.getKclb())){ + inBylwLb = zjSqxx.getKclb(); + } + } + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + if(StringUtils.equals("1",sfjx)){ + return mv; + } String xsxh = request.getParameter("xsxh"); String xsxm = request.getParameter("xsxm"); String ssxnzymc = request.getParameter("ssxnzymc"); String ktbg = request.getParameter("ktbg"); String zqjc = request.getParameter("zqjc"); String lwzg = request.getParameter("lwzg"); - List exportList = lwKhclService.getXqList(xsxh,xsxm,ssxnzymc,ktbg,zqjc,lwzg); - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List exportList = lwKhclService.getXqList(xsxh,xsxm,ssxnzymc,ktbg,zqjc,lwzg, inBynf, inSsyxmc, inBylwLb); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "论文考核材料成绩"); mv.addObject(NormalExcelConstants.CLASS, LwKhclXq.class); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/LwKhclMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/LwKhclMapper.java index dccec35..b40f0bb 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/LwKhclMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/LwKhclMapper.java @@ -17,10 +17,34 @@ import org.jeecg.modules.demo.lwKhcl.entity.LwKhclXq; * @Version: V1.0 */ public interface LwKhclMapper extends BaseMapper { - List getPage(Page page, @Param("bynf")String bynf, @Param("ssyxmc")String ssyxmc, @Param("ssxnzymc")String ssxnzymc); + List getPage(Page page, + @Param("bynf")String bynf, + @Param("ssyxmc")String ssyxmc, + @Param("ssxnzymc")String ssxnzymc, + @Param("inBynf")String inBynf, + @Param("inSsyxmc")String inSsyxmc, + @Param("inBylwLb")String inBylwLb); - List getCjPage(Page page, @Param("bynf")String bynf, @Param("ssyxmc")String ssyxmc, @Param("ssxnzymc")String ssxnzymc, @Param("xsxm")String xsxm, @Param("zdjsxm")String zdjsxm, @Param("bylwTm")String bylwTm); + List getCjPage(Page page, + @Param("bynf")String bynf, + @Param("ssyxmc")String ssyxmc, + @Param("ssxnzymc")String ssxnzymc, + @Param("xsxm")String xsxm, + @Param("zdjsxm")String zdjsxm, + @Param("bylwTm")String bylwTm, + @Param("inBynf")String inBynf, + @Param("inSsyxmc")String inSsyxmc, + @Param("inBylwLb")String inBylwLb); - List getXqPage(Page page, @Param("xsxh")String xsxh, @Param("xsxm")String xsxm, @Param("ssxnzymc")String ssxnzymc, @Param("ktbg")String ktbg, @Param("zqjc")String zqjc, @Param("lwzg")String lwzg); + List getXqPage(Page page, + @Param("xsxh")String xsxh, + @Param("xsxm")String xsxm, + @Param("ssxnzymc")String ssxnzymc, + @Param("ktbg")String ktbg, + @Param("zqjc")String zqjc, + @Param("lwzg")String lwzg, + @Param("inBynf")String inBynf, + @Param("inSsyxmc")String inSsyxmc, + @Param("inBylwLb")String inBylwLb); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml index 88ff667..587f871 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml @@ -17,6 +17,24 @@ and ssxnzymc like #{bindssxnzymc} + + and bynf in + + #{item} + + + + and ssyxmc in + + #{item} + + + + and bylw_lb in + + #{item} + + group by bynf,ssyxmc,ssxnzymc order by bynf DESC @@ -39,6 +57,24 @@ and bylwTm like #{bindbylwTm} + + and bynf in + + #{item} + + + + and ssyxmc in + + #{item} + + + + and bylw_lb in + + #{item} + + order by xsxh @@ -72,6 +108,24 @@ and lwzg is null + + and bynf in + + #{item} + + + + and ssyxmc in + + #{item} + + + + and bylw_lb in + + #{item} + + order by xsxh diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/ILwKhclService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/ILwKhclService.java index 1cbef06..81812b4 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/ILwKhclService.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/ILwKhclService.java @@ -16,12 +16,12 @@ import java.util.Map; * @Version: V1.0 */ public interface ILwKhclService extends IService { - Page getPage(Page page, String bynf, String ssyxmc, String ssxnzymc); - List getList(String bynf, String ssyxmc, String ssxnzymc); + Page getPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String inBynf, String inSsyxmc, String inBylwLb); + List getList(String bynf, String ssyxmc, String ssxnzymc, String inBynf, String inSsyxmc, String inBylwLb); - Page getCjPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm); - List getCjList(String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm); + Page getCjPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm, String inBynf, String inSsyxmc, String inBylwLb); + List getCjList(String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm, String inBynf, String inSsyxmc, String inBylwLb); - Page getXqPage(Page page, String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg); - List getXqList(String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg); + Page getXqPage(Page page, String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg, String inBynf, String inSsyxmc, String inBylwLb); + List getXqList(String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg, String inBynf, String inSsyxmc, String inBylwLb); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/impl/LwKhclServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/impl/LwKhclServiceImpl.java index acc42f7..3f48079 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/impl/LwKhclServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/service/impl/LwKhclServiceImpl.java @@ -23,33 +23,33 @@ import java.util.Map; public class LwKhclServiceImpl extends ServiceImpl implements ILwKhclService { @Override - public Page getPage(Page page, String bynf, String ssyxmc, String ssxnzymc){ - return page.setRecords(baseMapper.getPage(page, bynf, ssyxmc, ssxnzymc)); + public Page getPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String inBynf, String inSsyxmc, String inBylwLb){ + return page.setRecords(baseMapper.getPage(page, bynf, ssyxmc, ssxnzymc, inBynf, inSsyxmc, inBylwLb)); } @Override - public List getList(String bynf, String ssyxmc, String ssxnzymc){ - return baseMapper.getPage(null, bynf, ssyxmc, ssxnzymc); + public List getList(String bynf, String ssyxmc, String ssxnzymc, String inBynf, String inSsyxmc, String inBylwLb){ + return baseMapper.getPage(null, bynf, ssyxmc, ssxnzymc, inBynf, inSsyxmc, inBylwLb); } @Override - public Page getCjPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm){ - return page.setRecords(baseMapper.getCjPage(page, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm)); + public Page getCjPage(Page page, String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm, String inBynf, String inSsyxmc, String inBylwLb){ + return page.setRecords(baseMapper.getCjPage(page, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm, inBynf, inSsyxmc, inBylwLb)); } @Override - public List getCjList(String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm){ - return baseMapper.getCjPage(null, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm); + public List getCjList(String bynf, String ssyxmc, String ssxnzymc, String xsxm, String zdjsxm, String bylwTm, String inBynf, String inSsyxmc, String inBylwLb){ + return baseMapper.getCjPage(null, bynf, ssyxmc, ssxnzymc, xsxm, zdjsxm, bylwTm, inBynf, inSsyxmc, inBylwLb); } @Override - public Page getXqPage(Page page, String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg){ - return page.setRecords(baseMapper.getXqPage(page, xsxh ,xsxm, ssxnzymc, ktbg, zqjc, lwzg)); + public Page getXqPage(Page page, String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg, String inBynf, String inSsyxmc, String inBylwLb){ + return page.setRecords(baseMapper.getXqPage(page, xsxh ,xsxm, ssxnzymc, ktbg, zqjc, lwzg, inBynf, inSsyxmc, inBylwLb)); } @Override - public List getXqList(String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg){ - return baseMapper.getXqPage(null, xsxh ,xsxm, ssxnzymc, ktbg, zqjc, lwzg); + public List getXqList(String xsxh, String xsxm, String ssxnzymc, String ktbg, String zqjc, String lwzg, String inBynf, String inSsyxmc, String inBylwLb){ + return baseMapper.getXqPage(null, xsxh ,xsxm, ssxnzymc, ktbg, zqjc, lwzg, inBynf, inSsyxmc, inBylwLb); } }