diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java index 6049958..03c31cd 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -33,10 +33,8 @@ public class MZCXController extends BaseController { */ @ApiOperation("获取申请单信息") @GetMapping("/querySQD") - public TableDataInfo querySQD(String brdh,String stime,String etime,String klx){ - startPage(); - List mzcxSqdDTOList = mzcxService.querySQD(brdh,stime,etime,klx); - return getDataTable( mzcxSqdDTOList); + public Result querySQD(String brdh,String stime,String etime,String klx,String zt){ + return mzcxService.querySQD(brdh,stime,etime,klx,zt); } /** diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java b/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java index c0e3821..d328e54 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/MZCXService.java @@ -1,9 +1,10 @@ package com.czlis.mzcx.service; +import com.czlis.common.core.domain.Result; import com.czlis.mzcx.pojo.MzcxSqdDTO; import java.util.List; public interface MZCXService { - List querySQD(String brdh, String stime, String etime, String klx); + Result querySQD(String brdh, String stime, String etime, String klx, String zt); } diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java index 7b8471b..d0f37ea 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java @@ -1,5 +1,6 @@ package com.czlis.mzcx.service.impl; +import com.czlis.common.core.domain.Result; import com.czlis.mzcx.mapper.MZCXMapper; import com.czlis.mzcx.pojo.MzcxSqdDTO; import com.czlis.mzcx.service.MZCXService; @@ -17,15 +18,15 @@ public class MZCXServiceImpl implements MZCXService { MZCXMapper mzcxMapper; @Override - public List querySQD(String brdh, String stime, String etime, String klx) { + public Result querySQD(String brdh, String stime, String etime, String klx,String zt) { Map map = new HashMap<>(); map.put("brdh", brdh); map.put("st", stime); map.put("et", etime); map.put("klx", klx); - map.put("zt","1"); + map.put("zt",zt); map.put("as_yljg","1"); - return mzcxMapper.querySQD(map); + return new Result("0","修改条码成功!",mzcxMapper.querySQD(map)); }