Skip to content

D
dizhen
Commit 8ecb442a by wangqi
Options

状态更新

parent 31576700
Showing with 168 additions and 29 deletions
src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxController.java
......@@ -37,7 +37,6 @@ public class YsqqXmxxController extends BaseController
/**
* 查询验收前期-项目信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:list')")
@GetMapping("/list")
public TableDataInfo list(YsqqXmxx ysqqXmxx)
{
......@@ -49,7 +48,6 @@ public class YsqqXmxxController extends BaseController
/**
* 导出验收前期-项目信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:export')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxx ysqqXmxx)
......@@ -62,7 +60,6 @@ public class YsqqXmxxController extends BaseController
/**
* 获取验收前期-项目信息详细信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +69,6 @@ public class YsqqXmxxController extends BaseController
/**
* 新增验收前期-项目信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:add')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody YsqqXmxx ysqqXmxx)
......@@ -83,7 +79,6 @@ public class YsqqXmxxController extends BaseController
/**
* 修改验收前期-项目信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:edit')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody YsqqXmxx ysqqXmxx)
......@@ -94,11 +89,95 @@ public class YsqqXmxxController extends BaseController
/**
* 删除验收前期-项目信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:remove')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ysqqXmxxService.deleteYsqqXmxxByIds(ids));
}
@PostMapping(value = "/toWtj/{id}")
public AjaxResult wtj(@PathVariable("id") Long id)
{
YsqqXmxx ysqqXmxx = new YsqqXmxx();
ysqqXmxx.setXmzt("未提交");
ysqqXmxx.setId(id);
return toAjax(ysqqXmxxService.updateYsqqXmxx(ysqqXmxx));
}
@PostMapping(value = "/toDys/{id}")
public AjaxResult dys(@PathVariable("id") Long id)
{
YsqqXmxx ysqqXmxx = new YsqqXmxx();
ysqqXmxx.setXmzt("待验收");
ysqqXmxx.setId(id);
return toAjax(ysqqXmxxService.updateYsqqXmxx(ysqqXmxx));
}
@PostMapping(value = "/toYys/{id}")
public AjaxResult yys(@PathVariable("id") Long id)
{
YsqqXmxx ysqqXmxx = new YsqqXmxx();
ysqqXmxx.setXmzt("已验收");
ysqqXmxx.setId(id);
return toAjax(ysqqXmxxService.updateYsqqXmxx(ysqqXmxx));
}
@PostMapping(value = "/toYgd/{id}")
public AjaxResult ygd(@PathVariable("id") Long id)
{
YsqqXmxx ysqqXmxx = new YsqqXmxx();
ysqqXmxx.setXmzt("已归档");
ysqqXmxx.setId(id);
return toAjax(ysqqXmxxService.updateYsqqXmxx(ysqqXmxx));
}
/**
* 查询待验收列表
*/
@GetMapping("/dysList")
public TableDataInfo dysList(YsqqXmxx ysqqXmxx)
{
startPage();
ysqqXmxx.setXmzt("待验收");
List<YsqqXmxx> list = ysqqXmxxService.selectYsqqXmxxList(ysqqXmxx);
return getDataTable(list);
}
/**
* 已完成验收列表
*/
@GetMapping("/yysList")
public TableDataInfo yysList(YsqqXmxx ysqqXmxx)
{
startPage();
ysqqXmxx.setExt2("已验收(待归档)、已归档");
List<YsqqXmxx> list = ysqqXmxxService.selectYsqqXmxxList(ysqqXmxx);
return getDataTable(list);
}
/**
* 待归档
*/
@GetMapping("/dgdList")
public TableDataInfo dgdList(YsqqXmxx ysqqXmxx)
{
startPage();
ysqqXmxx.setExt3("待验收、已验收(待归档)");
List<YsqqXmxx> list = ysqqXmxxService.selectYsqqXmxxList(ysqqXmxx);
return getDataTable(list);
}
/**
* 已归档
*/
@GetMapping("/ygdList")
public TableDataInfo ygdList(YsqqXmxx ysqqXmxx)
{
startPage();
ysqqXmxx.setXmzt("已归档");
List<YsqqXmxx> list = ysqqXmxxService.selectYsqqXmxxList(ysqqXmxx);
return getDataTable(list);
}
}
src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxJxxController.java
......@@ -37,7 +37,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 查询验收前期-项目信息-井信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:list')")
@GetMapping("/list")
public TableDataInfo list(YsqqXmxxJxx ysqqXmxxJxx)
{
......@@ -49,7 +48,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 导出验收前期-项目信息-井信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:export')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxxJxx ysqqXmxxJxx)
......@@ -62,7 +60,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 获取验收前期-项目信息-井信息详细信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +69,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 新增验收前期-项目信息-井信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:add')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody YsqqXmxxJxx ysqqXmxxJxx)
......@@ -83,7 +79,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 修改验收前期-项目信息-井信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:edit')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody YsqqXmxxJxx ysqqXmxxJxx)
......@@ -94,7 +89,6 @@ public class YsqqXmxxJxxController extends BaseController
/**
* 删除验收前期-项目信息-井信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:remove')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
......
src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxSegyController.java
......@@ -37,7 +37,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 查询segy信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:list')")
@GetMapping("/list")
public TableDataInfo list(YsqqXmxxSegy ysqqXmxxSegy)
{
......@@ -49,7 +48,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 导出segy信息列表
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:export')")
@Log(title = "segy信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxxSegy ysqqXmxxSegy)
......@@ -62,7 +60,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 获取segy信息详细信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +69,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 新增segy信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:add')")
@Log(title = "segy信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody YsqqXmxxSegy ysqqXmxxSegy)
......@@ -83,7 +79,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 修改segy信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:edit')")
@Log(title = "segy信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody YsqqXmxxSegy ysqqXmxxSegy)
......@@ -94,7 +89,6 @@ public class YsqqXmxxSegyController extends BaseController
/**
* 删除segy信息
*/
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:remove')")
@Log(title = "segy信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
......
src/main/java/com/ruoyi/project/ys/domain/YsqqXmxx.java
......@@ -12,7 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* 验收前期-项目信息对象 ysqq_xmxx
*
* @author ruoyi
* @date 2025-09-17
* @date 2025-09-18
*/
public class YsqqXmxx extends BaseEntity
{
......@@ -82,6 +82,11 @@ public class YsqqXmxx extends BaseEntity
@Excel(name = "项目状态")
private String xmzt;
/** 项目日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "项目日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date xmrq;
public void setId(Long id)
{
this.id = id;
......@@ -242,6 +247,16 @@ public class YsqqXmxx extends BaseEntity
return xmzt;
}
public void setXmrq(Date xmrq)
{
this.xmrq = xmrq;
}
public Date getXmrq()
{
return xmrq;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......@@ -263,6 +278,7 @@ public class YsqqXmxx extends BaseEntity
.append("ext2", getExt2())
.append("ext3", getExt3())
.append("xmzt", getXmzt())
.append("xmrq", getXmrq())
.toString();
}
}
src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegy.java
......@@ -11,7 +11,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* segy信息对象 ysqq_xmxx_segy
*
* @author ruoyi
* @date 2025-09-17
* @date 2025-09-18
*/
public class YsqqXmxxSegy extends BaseEntity
{
......@@ -61,6 +61,14 @@ public class YsqqXmxxSegy extends BaseEntity
@Excel(name = "备用3")
private String ext3;
/** 旧版segy名称 */
@Excel(name = "旧版segy名称")
private String jbsegyName;
/** 新版segy名称 */
@Excel(name = "新版segy名称")
private String xbsegyName;
public void setId(Long id)
{
this.id = id;
......@@ -171,6 +179,26 @@ public class YsqqXmxxSegy extends BaseEntity
return ext3;
}
public void setJbsegyName(String jbsegyName)
{
this.jbsegyName = jbsegyName;
}
public String getJbsegyName()
{
return jbsegyName;
}
public void setXbsegyName(String xbsegyName)
{
this.xbsegyName = xbsegyName;
}
public String getXbsegyName()
{
return xbsegyName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......@@ -187,6 +215,8 @@ public class YsqqXmxxSegy extends BaseEntity
.append("ext1", getExt1())
.append("ext2", getExt2())
.append("ext3", getExt3())
.append("jbsegyName", getJbsegyName())
.append("xbsegyName", getXbsegyName())
.toString();
}
}
src/main/java/com/ruoyi/project/ys/service/impl/HyjyxxServiceImpl.java
......@@ -21,6 +21,8 @@ import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
/**
* 会议信息Service业务层处理
*
......@@ -66,6 +68,8 @@ public class HyjyxxServiceImpl implements IHyjyxxService
@Override
public int insertHyjyxx(Hyjyxx hyjyxx)
{
hyjyxx.setCreateBy(getUserId()+"");
hyjyxx.setCreatedTime(DateUtils.getNowDate());
return hyjyxxMapper.insertHyjyxx(hyjyxx);
}
......@@ -78,6 +82,7 @@ public class HyjyxxServiceImpl implements IHyjyxxService
@Override
public int updateHyjyxx(Hyjyxx hyjyxx)
{
hyjyxx.setUpdateBy(getUserId()+"");
hyjyxx.setUpdateTime(DateUtils.getNowDate());
return hyjyxxMapper.updateHyjyxx(hyjyxx);
}
......
src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java
......@@ -8,6 +8,8 @@ import com.ruoyi.project.ys.mapper.YsqqXmxxMapper;
import com.ruoyi.project.ys.domain.YsqqXmxx;
import com.ruoyi.project.ys.service.IYsqqXmxxService;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
/**
* 验收前期-项目信息Service业务层处理
*
......@@ -53,6 +55,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
@Override
public int insertYsqqXmxx(YsqqXmxx ysqqXmxx)
{
ysqqXmxx.setCreateBy(getUserId()+"");
ysqqXmxx.setCreatedTime(DateUtils.getNowDate());
return ysqqXmxxMapper.insertYsqqXmxx(ysqqXmxx);
}
......@@ -65,6 +69,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
@Override
public int updateYsqqXmxx(YsqqXmxx ysqqXmxx)
{
ysqqXmxx.setUpdateBy(getUserId()+"");
ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
return ysqqXmxxMapper.updateYsqqXmxx(ysqqXmxx);
}
......
src/main/resources/mybatis/ysqqXmxx/YsqqXmxxMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxMapper">
<resultMap type="YsqqXmxx" id="YsqqXmxxResult">
......@@ -23,17 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ext2" column="ext2" />
<result property="ext3" column="ext3" />
<result property="xmzt" column="xmzt" />
<result property="xmrq" column="xmrq" />
</resultMap>
<sql id="selectYsqqXmxxVo">
select id, xmmc, qk, xmjj, jhdw, jfdw, xmin, xmax, ymin, ymax, created_by, created_time, update_by, update_time, ext1, ext2, ext3, xmzt from ysqq_xmxx
select id, xmmc, qk, xmjj, jhdw, jfdw, xmin, xmax, ymin, ymax, created_by, created_time, update_by, update_time, ext1, ext2, ext3, xmzt, xmrq from ysqq_xmxx
</sql>
<select id="selectYsqqXmxxList" parameterType="YsqqXmxx" resultMap="YsqqXmxxResult">
<include refid="selectYsqqXmxxVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="xmmc != null and xmmc != ''"> and xmmc = #{xmmc}</if>
<if test="xmmc != null and xmmc != ''"> and xmmc like concat('%', #{xmmc}, '%')</if>
<if test="qk != null and qk != ''"> and qk = #{qk}</if>
<if test="xmjj != null and xmjj != ''"> and xmjj = #{xmjj}</if>
<if test="jhdw != null and jhdw != ''"> and jhdw = #{jhdw}</if>
......@@ -45,9 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if>
<if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if>
<if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if>
<if test="ext3 != null and ext3 != ''"> and ext3 = #{ext3}</if>
<if test="ext2 != null and ext2 != ''"> and xmzt in ('已验收(待归档)','已归档')</if>
<if test="ext3 != null and ext3 != ''">and xmzt in ('已验收(待归档)','已归档')</if>
<if test="xmzt != null and xmzt != ''"> and xmzt = #{xmzt}</if>
<if test="xmrq != null "> and xmrq = #{xmrq}</if>
</where>
</select>
......@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">ext2,</if>
<if test="ext3 != null">ext3,</if>
<if test="xmzt != null">xmzt,</if>
<if test="xmrq != null">xmrq,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xmmc != null">#{xmmc},</if>
......@@ -95,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">#{ext2},</if>
<if test="ext3 != null">#{ext3},</if>
<if test="xmzt != null">#{xmzt},</if>
<if test="xmrq != null">#{xmrq},</if>
</trim>
</insert>
......@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">ext2 = #{ext2},</if>
<if test="ext3 != null">ext3 = #{ext3},</if>
<if test="xmzt != null">xmzt = #{xmzt},</if>
<if test="xmrq != null">xmrq = #{xmrq},</if>
</trim>
where id = #{id}
</update>
......
src/main/resources/mybatis/ysqqXmxxSegy/YsqqXmxxSegyMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxSegyMapper">
<resultMap type="YsqqXmxxSegy" id="YsqqXmxxSegyResult">
......@@ -18,10 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ext1" column="ext1" />
<result property="ext2" column="ext2" />
<result property="ext3" column="ext3" />
<result property="jbsegyName" column="jbsegy_name" />
<result property="xbsegyName" column="xbsegy_name" />
</resultMap>
<sql id="selectYsqqXmxxSegyVo">
select id, zbid, jbsegy, xbsegy, x, y, created_by, created_time, update_by, update_time, ext1, ext2, ext3 from ysqq_xmxx_segy
select id, zbid, jbsegy, xbsegy, x, y, created_by, created_time, update_by, update_time, ext1, ext2, ext3, jbsegy_name, xbsegy_name from ysqq_xmxx_segy
</sql>
<select id="selectYsqqXmxxSegyList" parameterType="YsqqXmxxSegy" resultMap="YsqqXmxxSegyResult">
......@@ -38,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if>
<if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if>
<if test="ext3 != null and ext3 != ''"> and ext3 = #{ext3}</if>
<if test="jbsegyName != null and jbsegyName != ''"> and jbsegy_name like concat('%', #{jbsegyName}, '%')</if>
<if test="xbsegyName != null and xbsegyName != ''"> and xbsegy_name like concat('%', #{xbsegyName}, '%')</if>
</where>
</select>
......@@ -61,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">ext1,</if>
<if test="ext2 != null">ext2,</if>
<if test="ext3 != null">ext3,</if>
<if test="jbsegyName != null">jbsegy_name,</if>
<if test="xbsegyName != null">xbsegy_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
......@@ -75,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">#{ext1},</if>
<if test="ext2 != null">#{ext2},</if>
<if test="ext3 != null">#{ext3},</if>
<if test="jbsegyName != null">#{jbsegyName},</if>
<if test="xbsegyName != null">#{xbsegyName},</if>
</trim>
</insert>
......@@ -93,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">ext1 = #{ext1},</if>
<if test="ext2 != null">ext2 = #{ext2},</if>
<if test="ext3 != null">ext3 = #{ext3},</if>
<if test="jbsegyName != null">jbsegy_name = #{jbsegyName},</if>
<if test="xbsegyName != null">xbsegy_name = #{xbsegyName},</if>
</trim>
where id = #{id}
</update>
......
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