md
This commit is contained in:
parent
37657db1af
commit
f97a84d9d3
@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
||||
import com.xdadan.erp.emis.domain.EmisGoods;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
@ -51,7 +54,7 @@ public class EmisTmsCarController extends BaseController
|
||||
/**
|
||||
* 查询卡车信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisTmsCar:list')")
|
||||
// @PreAuthorize("@ss.hasPermi('emis:emisTmsCar:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(EmisTmsCar emisTmsCar)
|
||||
{
|
||||
@ -60,6 +63,18 @@ public class EmisTmsCarController extends BaseController
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
@JacksonFilter(include= {
|
||||
"carNo"
|
||||
},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
|
||||
@RequestMapping("/listSimple")
|
||||
public TableDataInfo listSimple(EmisTmsCar emisTmsCar)
|
||||
{
|
||||
startPage();
|
||||
List<EmisTmsCar> list = emisTmsCarService.selectEmisTmsCarList(emisTmsCar);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 检查是否重复
|
||||
|
||||
@ -68,6 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
|
||||
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
|
||||
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
|
||||
|
||||
|
||||
<if test="searchValue != null and searchValue != ''">
|
||||
AND ( car_no like concat(#{searchValue}, '%') )
|
||||
</if>
|
||||
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user