Commit 8276f673 by jiang'yun

修改

parent a70101d9
...@@ -37,7 +37,7 @@ public class ClYxsjController extends BaseController ...@@ -37,7 +37,7 @@ public class ClYxsjController extends BaseController
/** /**
* 查询常量-岩性数据列表 * 查询常量-岩性数据列表
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:list')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(ClYxsj clYxsj) public TableDataInfo list(ClYxsj clYxsj)
{ {
...@@ -49,7 +49,7 @@ public class ClYxsjController extends BaseController ...@@ -49,7 +49,7 @@ public class ClYxsjController extends BaseController
/** /**
* 导出常量-岩性数据列表 * 导出常量-岩性数据列表
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:export')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:export')")
@Log(title = "常量-岩性数据", businessType = BusinessType.EXPORT) @Log(title = "常量-岩性数据", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ClYxsj clYxsj) public void export(HttpServletResponse response, ClYxsj clYxsj)
...@@ -62,7 +62,7 @@ public class ClYxsjController extends BaseController ...@@ -62,7 +62,7 @@ public class ClYxsjController extends BaseController
/** /**
* 获取常量-岩性数据详细信息 * 获取常量-岩性数据详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:query')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -72,7 +72,7 @@ public class ClYxsjController extends BaseController ...@@ -72,7 +72,7 @@ public class ClYxsjController extends BaseController
/** /**
* 新增常量-岩性数据 * 新增常量-岩性数据
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:add')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:add')")
@Log(title = "常量-岩性数据", businessType = BusinessType.INSERT) @Log(title = "常量-岩性数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ClYxsj clYxsj) public AjaxResult add(@RequestBody ClYxsj clYxsj)
...@@ -83,7 +83,7 @@ public class ClYxsjController extends BaseController ...@@ -83,7 +83,7 @@ public class ClYxsjController extends BaseController
/** /**
* 修改常量-岩性数据 * 修改常量-岩性数据
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:edit')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:edit')")
@Log(title = "常量-岩性数据", businessType = BusinessType.UPDATE) @Log(title = "常量-岩性数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ClYxsj clYxsj) public AjaxResult edit(@RequestBody ClYxsj clYxsj)
...@@ -94,7 +94,7 @@ public class ClYxsjController extends BaseController ...@@ -94,7 +94,7 @@ public class ClYxsjController extends BaseController
/** /**
* 删除常量-岩性数据 * 删除常量-岩性数据
*/ */
@PreAuthorize("@ss.hasPermi('system:clYxsj:remove')") //@PreAuthorize("@ss.hasPermi('system:clYxsj:remove')")
@Log(title = "常量-岩性数据", businessType = BusinessType.DELETE) @Log(title = "常量-岩性数据", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
......
...@@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectClYxsjList" parameterType="ClYxsj" resultMap="ClYxsjResult"> <select id="selectClYxsjList" parameterType="ClYxsj" resultMap="ClYxsjResult">
<include refid="selectClYxsjVo"/> <include refid="selectClYxsjVo"/>
<where> <where>
<if test="dzfc != null and dzfc != ''"> and dzfc = #{dzfc}</if> <if test="dzfc != null and dzfc != ''"> and dzfc like concat('%', #{dzfc}, '%') </if>
<if test="dcdh != null and dcdh != ''"> and dcdh = #{dcdh}</if> <if test="dcdh != null and dcdh != ''"> and dcdh = #{dcdh}</if>
<if test="jcm != null and jcm != ''"> and jcm = #{jcm}</if> <if test="jcm != null and jcm != ''"> and jcm = #{jcm}</if>
<if test="zyyx != null and zyyx != ''"> and zyyx = #{zyyx}</if> <if test="zyyx != null and zyyx != ''"> and zyyx like concat('%', #{zyyx}, '%') </if>
<if test="yxms != null and yxms != ''"> and yxms = #{yxms}</if> <if test="yxms != null and yxms != ''"> and yxms = #{yxms}</if>
<if test="tsyx != null and tsyx != ''"> and tsyx = #{tsyx}</if> <if test="tsyx != null and tsyx != ''"> and tsyx like concat('%', #{tsyx}, '%') </if>
<if test="zxhd != null and zxhd != ''"> and zxhd = #{zxhd}</if> <if test="zxhd != null and zxhd != ''"> and zxhd = #{zxhd}</if>
<if test="zdhd != null and zdhd != ''"> and zdhd = #{zdhd}</if> <if test="zdhd != null and zdhd != ''"> and zdhd = #{zdhd}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if> <if test="bz != null and bz != ''"> and bz = #{bz}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment