Skip to content

D
dizhen
Commit 8ecb442a by wangqi
Options

状态更新

parent 31576700
Showing with 269 additions and 130 deletions
src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxController.java
...@@ -37,7 +37,6 @@ public class YsqqXmxxController extends BaseController ...@@ -37,7 +37,6 @@ public class YsqqXmxxController extends BaseController
/** /**
* 查询验收前期-项目信息列表 * 查询验收前期-项目信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(YsqqXmxx ysqqXmxx) public TableDataInfo list(YsqqXmxx ysqqXmxx)
{ {
...@@ -49,7 +48,6 @@ public class YsqqXmxxController extends BaseController ...@@ -49,7 +48,6 @@ public class YsqqXmxxController extends BaseController
/** /**
* 导出验收前期-项目信息列表 * 导出验收前期-项目信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:export')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.EXPORT) @Log(title = "验收前期-项目信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxx ysqqXmxx) public void export(HttpServletResponse response, YsqqXmxx ysqqXmxx)
...@@ -62,7 +60,6 @@ public class YsqqXmxxController extends BaseController ...@@ -62,7 +60,6 @@ public class YsqqXmxxController extends BaseController
/** /**
* 获取验收前期-项目信息详细信息 * 获取验收前期-项目信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -72,7 +69,6 @@ public class YsqqXmxxController extends BaseController ...@@ -72,7 +69,6 @@ public class YsqqXmxxController extends BaseController
/** /**
* 新增验收前期-项目信息 * 新增验收前期-项目信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:add')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.INSERT) @Log(title = "验收前期-项目信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody YsqqXmxx ysqqXmxx) public AjaxResult add(@RequestBody YsqqXmxx ysqqXmxx)
...@@ -83,7 +79,6 @@ public class YsqqXmxxController extends BaseController ...@@ -83,7 +79,6 @@ public class YsqqXmxxController extends BaseController
/** /**
* 修改验收前期-项目信息 * 修改验收前期-项目信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx:edit')")
@Log(title = "验收前期-项目信息", businessType = BusinessType.UPDATE) @Log(title = "验收前期-项目信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody YsqqXmxx ysqqXmxx) public AjaxResult edit(@RequestBody YsqqXmxx ysqqXmxx)
...@@ -94,11 +89,95 @@ public class YsqqXmxxController extends BaseController ...@@ -94,11 +89,95 @@ public class YsqqXmxxController extends BaseController
/** /**
* 删除验收前期-项目信息 * 删除验收前期-项目信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxx:ysqqXmxx: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)
{ {
return toAjax(ysqqXmxxService.deleteYsqqXmxxByIds(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 ...@@ -37,7 +37,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 查询验收前期-项目信息-井信息列表 * 查询验收前期-项目信息-井信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(YsqqXmxxJxx ysqqXmxxJxx) public TableDataInfo list(YsqqXmxxJxx ysqqXmxxJxx)
{ {
...@@ -49,7 +48,6 @@ public class YsqqXmxxJxxController extends BaseController ...@@ -49,7 +48,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 导出验收前期-项目信息-井信息列表 * 导出验收前期-项目信息-井信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:export')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.EXPORT) @Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxxJxx ysqqXmxxJxx) public void export(HttpServletResponse response, YsqqXmxxJxx ysqqXmxxJxx)
...@@ -62,7 +60,6 @@ public class YsqqXmxxJxxController extends BaseController ...@@ -62,7 +60,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 获取验收前期-项目信息-井信息详细信息 * 获取验收前期-项目信息-井信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -72,7 +69,6 @@ public class YsqqXmxxJxxController extends BaseController ...@@ -72,7 +69,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 新增验收前期-项目信息-井信息 * 新增验收前期-项目信息-井信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:add')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.INSERT) @Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody YsqqXmxxJxx ysqqXmxxJxx) public AjaxResult add(@RequestBody YsqqXmxxJxx ysqqXmxxJxx)
...@@ -83,7 +79,6 @@ public class YsqqXmxxJxxController extends BaseController ...@@ -83,7 +79,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 修改验收前期-项目信息-井信息 * 修改验收前期-项目信息-井信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx:edit')")
@Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.UPDATE) @Log(title = "验收前期-项目信息-井信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody YsqqXmxxJxx ysqqXmxxJxx) public AjaxResult edit(@RequestBody YsqqXmxxJxx ysqqXmxxJxx)
...@@ -94,7 +89,6 @@ public class YsqqXmxxJxxController extends BaseController ...@@ -94,7 +89,6 @@ public class YsqqXmxxJxxController extends BaseController
/** /**
* 删除验收前期-项目信息-井信息 * 删除验收前期-项目信息-井信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxJxx:jxx: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)
......
src/main/java/com/ruoyi/project/ys/controller/YsqqXmxxSegyController.java
...@@ -37,7 +37,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -37,7 +37,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 查询segy信息列表 * 查询segy信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(YsqqXmxxSegy ysqqXmxxSegy) public TableDataInfo list(YsqqXmxxSegy ysqqXmxxSegy)
{ {
...@@ -49,7 +48,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -49,7 +48,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 导出segy信息列表 * 导出segy信息列表
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:export')")
@Log(title = "segy信息", businessType = BusinessType.EXPORT) @Log(title = "segy信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, YsqqXmxxSegy ysqqXmxxSegy) public void export(HttpServletResponse response, YsqqXmxxSegy ysqqXmxxSegy)
...@@ -62,7 +60,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -62,7 +60,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 获取segy信息详细信息 * 获取segy信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
...@@ -72,7 +69,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -72,7 +69,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 新增segy信息 * 新增segy信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:add')")
@Log(title = "segy信息", businessType = BusinessType.INSERT) @Log(title = "segy信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody YsqqXmxxSegy ysqqXmxxSegy) public AjaxResult add(@RequestBody YsqqXmxxSegy ysqqXmxxSegy)
...@@ -83,7 +79,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -83,7 +79,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 修改segy信息 * 修改segy信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:edit')")
@Log(title = "segy信息", businessType = BusinessType.UPDATE) @Log(title = "segy信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody YsqqXmxxSegy ysqqXmxxSegy) public AjaxResult edit(@RequestBody YsqqXmxxSegy ysqqXmxxSegy)
...@@ -94,7 +89,6 @@ public class YsqqXmxxSegyController extends BaseController ...@@ -94,7 +89,6 @@ public class YsqqXmxxSegyController extends BaseController
/** /**
* 删除segy信息 * 删除segy信息
*/ */
@PreAuthorize("@ss.hasPermi('ysqqXmxxSegy:segy:remove')")
@Log(title = "segy信息", businessType = BusinessType.DELETE) @Log(title = "segy信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
......
src/main/java/com/ruoyi/project/ys/domain/YsqqXmxx.java
...@@ -10,9 +10,9 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -10,9 +10,9 @@ import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* 验收前期-项目信息对象 ysqq_xmxx * 验收前期-项目信息对象 ysqq_xmxx
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-17 * @date 2025-09-18
*/ */
public class YsqqXmxx extends BaseEntity public class YsqqXmxx extends BaseEntity
{ {
...@@ -82,187 +82,203 @@ public class YsqqXmxx extends BaseEntity ...@@ -82,187 +82,203 @@ public class YsqqXmxx extends BaseEntity
@Excel(name = "项目状态") @Excel(name = "项目状态")
private String xmzt; private String xmzt;
public void setId(Long id) /** 项目日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "项目日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date xmrq;
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setXmmc(String xmmc) public void setXmmc(String xmmc)
{ {
this.xmmc = xmmc; this.xmmc = xmmc;
} }
public String getXmmc() public String getXmmc()
{ {
return xmmc; return xmmc;
} }
public void setQk(String qk) public void setQk(String qk)
{ {
this.qk = qk; this.qk = qk;
} }
public String getQk() public String getQk()
{ {
return qk; return qk;
} }
public void setXmjj(String xmjj) public void setXmjj(String xmjj)
{ {
this.xmjj = xmjj; this.xmjj = xmjj;
} }
public String getXmjj() public String getXmjj()
{ {
return xmjj; return xmjj;
} }
public void setJhdw(String jhdw) public void setJhdw(String jhdw)
{ {
this.jhdw = jhdw; this.jhdw = jhdw;
} }
public String getJhdw() public String getJhdw()
{ {
return jhdw; return jhdw;
} }
public void setJfdw(String jfdw) public void setJfdw(String jfdw)
{ {
this.jfdw = jfdw; this.jfdw = jfdw;
} }
public String getJfdw() public String getJfdw()
{ {
return jfdw; return jfdw;
} }
public void setXmin(BigDecimal xmin) public void setXmin(BigDecimal xmin)
{ {
this.xmin = xmin; this.xmin = xmin;
} }
public BigDecimal getXmin() public BigDecimal getXmin()
{ {
return xmin; return xmin;
} }
public void setXmax(BigDecimal xmax) public void setXmax(BigDecimal xmax)
{ {
this.xmax = xmax; this.xmax = xmax;
} }
public BigDecimal getXmax() public BigDecimal getXmax()
{ {
return xmax; return xmax;
} }
public void setYmin(BigDecimal ymin) public void setYmin(BigDecimal ymin)
{ {
this.ymin = ymin; this.ymin = ymin;
} }
public BigDecimal getYmin() public BigDecimal getYmin()
{ {
return ymin; return ymin;
} }
public void setYmax(BigDecimal ymax) public void setYmax(BigDecimal ymax)
{ {
this.ymax = ymax; this.ymax = ymax;
} }
public BigDecimal getYmax() public BigDecimal getYmax()
{ {
return ymax; return ymax;
} }
public void setCreatedBy(String createdBy) public void setCreatedBy(String createdBy)
{ {
this.createdBy = createdBy; this.createdBy = createdBy;
} }
public String getCreatedBy() public String getCreatedBy()
{ {
return createdBy; return createdBy;
} }
public void setCreatedTime(Date createdTime) public void setCreatedTime(Date createdTime)
{ {
this.createdTime = createdTime; this.createdTime = createdTime;
} }
public Date getCreatedTime() public Date getCreatedTime()
{ {
return createdTime; return createdTime;
} }
public void setExt1(String ext1) public void setExt1(String ext1)
{ {
this.ext1 = ext1; this.ext1 = ext1;
} }
public String getExt1() public String getExt1()
{ {
return ext1; return ext1;
} }
public void setExt2(String ext2) public void setExt2(String ext2)
{ {
this.ext2 = ext2; this.ext2 = ext2;
} }
public String getExt2() public String getExt2()
{ {
return ext2; return ext2;
} }
public void setExt3(String ext3) public void setExt3(String ext3)
{ {
this.ext3 = ext3; this.ext3 = ext3;
} }
public String getExt3() public String getExt3()
{ {
return ext3; return ext3;
} }
public void setXmzt(String xmzt) public void setXmzt(String xmzt)
{ {
this.xmzt = xmzt; this.xmzt = xmzt;
} }
public String getXmzt() public String getXmzt()
{ {
return xmzt; return xmzt;
} }
public void setXmrq(Date xmrq)
{
this.xmrq = xmrq;
}
public Date getXmrq()
{
return xmrq;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("xmmc", getXmmc()) .append("xmmc", getXmmc())
.append("qk", getQk()) .append("qk", getQk())
.append("xmjj", getXmjj()) .append("xmjj", getXmjj())
.append("jhdw", getJhdw()) .append("jhdw", getJhdw())
.append("jfdw", getJfdw()) .append("jfdw", getJfdw())
.append("xmin", getXmin()) .append("xmin", getXmin())
.append("xmax", getXmax()) .append("xmax", getXmax())
.append("ymin", getYmin()) .append("ymin", getYmin())
.append("ymax", getYmax()) .append("ymax", getYmax())
.append("createdBy", getCreatedBy()) .append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime()) .append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("ext1", getExt1()) .append("ext1", getExt1())
.append("ext2", getExt2()) .append("ext2", getExt2())
.append("ext3", getExt3()) .append("ext3", getExt3())
.append("xmzt", getXmzt()) .append("xmzt", getXmzt())
.toString(); .append("xmrq", getXmrq())
.toString();
} }
} }
src/main/java/com/ruoyi/project/ys/domain/YsqqXmxxSegy.java
...@@ -9,9 +9,9 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -9,9 +9,9 @@ import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* segy信息对象 ysqq_xmxx_segy * segy信息对象 ysqq_xmxx_segy
* *
* @author ruoyi * @author ruoyi
* @date 2025-09-17 * @date 2025-09-18
*/ */
public class YsqqXmxxSegy extends BaseEntity public class YsqqXmxxSegy extends BaseEntity
{ {
...@@ -61,132 +61,162 @@ public class YsqqXmxxSegy extends BaseEntity ...@@ -61,132 +61,162 @@ public class YsqqXmxxSegy extends BaseEntity
@Excel(name = "备用3") @Excel(name = "备用3")
private String ext3; private String ext3;
public void setId(Long id) /** 旧版segy名称 */
@Excel(name = "旧版segy名称")
private String jbsegyName;
/** 新版segy名称 */
@Excel(name = "新版segy名称")
private String xbsegyName;
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setZbid(Long zbid) public void setZbid(Long zbid)
{ {
this.zbid = zbid; this.zbid = zbid;
} }
public Long getZbid() public Long getZbid()
{ {
return zbid; return zbid;
} }
public void setJbsegy(String jbsegy) public void setJbsegy(String jbsegy)
{ {
this.jbsegy = jbsegy; this.jbsegy = jbsegy;
} }
public String getJbsegy() public String getJbsegy()
{ {
return jbsegy; return jbsegy;
} }
public void setXbsegy(String xbsegy) public void setXbsegy(String xbsegy)
{ {
this.xbsegy = xbsegy; this.xbsegy = xbsegy;
} }
public String getXbsegy() public String getXbsegy()
{ {
return xbsegy; return xbsegy;
} }
public void setX(String x) public void setX(String x)
{ {
this.x = x; this.x = x;
} }
public String getX() public String getX()
{ {
return x; return x;
} }
public void setY(String y) public void setY(String y)
{ {
this.y = y; this.y = y;
} }
public String getY() public String getY()
{ {
return y; return y;
} }
public void setCreatedBy(String createdBy) public void setCreatedBy(String createdBy)
{ {
this.createdBy = createdBy; this.createdBy = createdBy;
} }
public String getCreatedBy() public String getCreatedBy()
{ {
return createdBy; return createdBy;
} }
public void setCreatedTime(Date createdTime) public void setCreatedTime(Date createdTime)
{ {
this.createdTime = createdTime; this.createdTime = createdTime;
} }
public Date getCreatedTime() public Date getCreatedTime()
{ {
return createdTime; return createdTime;
} }
public void setExt1(String ext1) public void setExt1(String ext1)
{ {
this.ext1 = ext1; this.ext1 = ext1;
} }
public String getExt1() public String getExt1()
{ {
return ext1; return ext1;
} }
public void setExt2(String ext2) public void setExt2(String ext2)
{ {
this.ext2 = ext2; this.ext2 = ext2;
} }
public String getExt2() public String getExt2()
{ {
return ext2; return ext2;
} }
public void setExt3(String ext3) public void setExt3(String ext3)
{ {
this.ext3 = ext3; this.ext3 = ext3;
} }
public String getExt3() public String getExt3()
{ {
return ext3; 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 @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("zbid", getZbid()) .append("zbid", getZbid())
.append("jbsegy", getJbsegy()) .append("jbsegy", getJbsegy())
.append("xbsegy", getXbsegy()) .append("xbsegy", getXbsegy())
.append("x", getX()) .append("x", getX())
.append("y", getY()) .append("y", getY())
.append("createdBy", getCreatedBy()) .append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime()) .append("createdTime", getCreatedTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("ext1", getExt1()) .append("ext1", getExt1())
.append("ext2", getExt2()) .append("ext2", getExt2())
.append("ext3", getExt3()) .append("ext3", getExt3())
.toString(); .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; ...@@ -21,6 +21,8 @@ import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
/** /**
* 会议信息Service业务层处理 * 会议信息Service业务层处理
* *
...@@ -66,6 +68,8 @@ public class HyjyxxServiceImpl implements IHyjyxxService ...@@ -66,6 +68,8 @@ public class HyjyxxServiceImpl implements IHyjyxxService
@Override @Override
public int insertHyjyxx(Hyjyxx hyjyxx) public int insertHyjyxx(Hyjyxx hyjyxx)
{ {
hyjyxx.setCreateBy(getUserId()+"");
hyjyxx.setCreatedTime(DateUtils.getNowDate());
return hyjyxxMapper.insertHyjyxx(hyjyxx); return hyjyxxMapper.insertHyjyxx(hyjyxx);
} }
...@@ -78,6 +82,7 @@ public class HyjyxxServiceImpl implements IHyjyxxService ...@@ -78,6 +82,7 @@ public class HyjyxxServiceImpl implements IHyjyxxService
@Override @Override
public int updateHyjyxx(Hyjyxx hyjyxx) public int updateHyjyxx(Hyjyxx hyjyxx)
{ {
hyjyxx.setUpdateBy(getUserId()+"");
hyjyxx.setUpdateTime(DateUtils.getNowDate()); hyjyxx.setUpdateTime(DateUtils.getNowDate());
return hyjyxxMapper.updateHyjyxx(hyjyxx); 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; ...@@ -8,6 +8,8 @@ import com.ruoyi.project.ys.mapper.YsqqXmxxMapper;
import com.ruoyi.project.ys.domain.YsqqXmxx; import com.ruoyi.project.ys.domain.YsqqXmxx;
import com.ruoyi.project.ys.service.IYsqqXmxxService; import com.ruoyi.project.ys.service.IYsqqXmxxService;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
/** /**
* 验收前期-项目信息Service业务层处理 * 验收前期-项目信息Service业务层处理
* *
...@@ -53,6 +55,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService ...@@ -53,6 +55,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
@Override @Override
public int insertYsqqXmxx(YsqqXmxx ysqqXmxx) public int insertYsqqXmxx(YsqqXmxx ysqqXmxx)
{ {
ysqqXmxx.setCreateBy(getUserId()+"");
ysqqXmxx.setCreatedTime(DateUtils.getNowDate());
return ysqqXmxxMapper.insertYsqqXmxx(ysqqXmxx); return ysqqXmxxMapper.insertYsqqXmxx(ysqqXmxx);
} }
...@@ -65,6 +69,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService ...@@ -65,6 +69,8 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
@Override @Override
public int updateYsqqXmxx(YsqqXmxx ysqqXmxx) public int updateYsqqXmxx(YsqqXmxx ysqqXmxx)
{ {
ysqqXmxx.setUpdateBy(getUserId()+"");
ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
ysqqXmxx.setUpdateTime(DateUtils.getNowDate()); ysqqXmxx.setUpdateTime(DateUtils.getNowDate());
return ysqqXmxxMapper.updateYsqqXmxx(ysqqXmxx); return ysqqXmxxMapper.updateYsqqXmxx(ysqqXmxx);
} }
......
src/main/resources/mybatis/ysqqXmxx/YsqqXmxxMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxMapper"> <mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxMapper">
<resultMap type="YsqqXmxx" id="YsqqXmxxResult"> <resultMap type="YsqqXmxx" id="YsqqXmxxResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="xmmc" column="xmmc" /> <result property="xmmc" column="xmmc" />
...@@ -23,17 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -23,17 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ext2" column="ext2" /> <result property="ext2" column="ext2" />
<result property="ext3" column="ext3" /> <result property="ext3" column="ext3" />
<result property="xmzt" column="xmzt" /> <result property="xmzt" column="xmzt" />
<result property="xmrq" column="xmrq" />
</resultMap> </resultMap>
<sql id="selectYsqqXmxxVo"> <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> </sql>
<select id="selectYsqqXmxxList" parameterType="YsqqXmxx" resultMap="YsqqXmxxResult"> <select id="selectYsqqXmxxList" parameterType="YsqqXmxx" resultMap="YsqqXmxxResult">
<include refid="selectYsqqXmxxVo"/> <include refid="selectYsqqXmxxVo"/>
<where> <where>
<if test="id != null "> and id = #{id}</if> <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="qk != null and qk != ''"> and qk = #{qk}</if>
<if test="xmjj != null and xmjj != ''"> and xmjj = #{xmjj}</if> <if test="xmjj != null and xmjj != ''"> and xmjj = #{xmjj}</if>
<if test="jhdw != null and jhdw != ''"> and jhdw = #{jhdw}</if> <if test="jhdw != null and jhdw != ''"> and jhdw = #{jhdw}</if>
...@@ -45,12 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -45,12 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if> <if test="createdTime != null "> and created_time = #{createdTime}</if>
<if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if> <if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if>
<if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if> <if test="ext2 != null and ext2 != ''"> and xmzt in ('已验收(待归档)','已归档')</if>
<if test="ext3 != null and ext3 != ''"> and ext3 = #{ext3}</if> <if test="ext3 != null and ext3 != ''">and xmzt in ('已验收(待归档)','已归档')</if>
<if test="xmzt != null and xmzt != ''"> and xmzt = #{xmzt}</if> <if test="xmzt != null and xmzt != ''"> and xmzt = #{xmzt}</if>
<if test="xmrq != null "> and xmrq = #{xmrq}</if>
</where> </where>
</select> </select>
<select id="selectYsqqXmxxById" parameterType="Long" resultMap="YsqqXmxxResult"> <select id="selectYsqqXmxxById" parameterType="Long" resultMap="YsqqXmxxResult">
<include refid="selectYsqqXmxxVo"/> <include refid="selectYsqqXmxxVo"/>
where id = #{id} where id = #{id}
...@@ -76,7 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -76,7 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">ext2,</if> <if test="ext2 != null">ext2,</if>
<if test="ext3 != null">ext3,</if> <if test="ext3 != null">ext3,</if>
<if test="xmzt != null">xmzt,</if> <if test="xmzt != null">xmzt,</if>
</trim> <if test="xmrq != null">xmrq,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xmmc != null">#{xmmc},</if> <if test="xmmc != null">#{xmmc},</if>
<if test="qk != null">#{qk},</if> <if test="qk != null">#{qk},</if>
...@@ -95,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -95,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">#{ext2},</if> <if test="ext2 != null">#{ext2},</if>
<if test="ext3 != null">#{ext3},</if> <if test="ext3 != null">#{ext3},</if>
<if test="xmzt != null">#{xmzt},</if> <if test="xmzt != null">#{xmzt},</if>
</trim> <if test="xmrq != null">#{xmrq},</if>
</trim>
</insert> </insert>
<update id="updateYsqqXmxx" parameterType="YsqqXmxx"> <update id="updateYsqqXmxx" parameterType="YsqqXmxx">
...@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext2 != null">ext2 = #{ext2},</if> <if test="ext2 != null">ext2 = #{ext2},</if>
<if test="ext3 != null">ext3 = #{ext3},</if> <if test="ext3 != null">ext3 = #{ext3},</if>
<if test="xmzt != null">xmzt = #{xmzt},</if> <if test="xmzt != null">xmzt = #{xmzt},</if>
<if test="xmrq != null">xmrq = #{xmrq},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
...@@ -127,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -127,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteYsqqXmxxByIds" parameterType="String"> <delete id="deleteYsqqXmxxByIds" parameterType="String">
delete from ysqq_xmxx where id in delete from ysqq_xmxx where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
......
src/main/resources/mybatis/ysqqXmxxSegy/YsqqXmxxSegyMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxSegyMapper"> <mapper namespace="com.ruoyi.project.ys.mapper.YsqqXmxxSegyMapper">
<resultMap type="YsqqXmxxSegy" id="YsqqXmxxSegyResult"> <resultMap type="YsqqXmxxSegy" id="YsqqXmxxSegyResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="zbid" column="zbid" /> <result property="zbid" column="zbid" />
...@@ -18,15 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -18,15 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ext1" column="ext1" /> <result property="ext1" column="ext1" />
<result property="ext2" column="ext2" /> <result property="ext2" column="ext2" />
<result property="ext3" column="ext3" /> <result property="ext3" column="ext3" />
<result property="jbsegyName" column="jbsegy_name" />
<result property="xbsegyName" column="xbsegy_name" />
</resultMap> </resultMap>
<sql id="selectYsqqXmxxSegyVo"> <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> </sql>
<select id="selectYsqqXmxxSegyList" parameterType="YsqqXmxxSegy" resultMap="YsqqXmxxSegyResult"> <select id="selectYsqqXmxxSegyList" parameterType="YsqqXmxxSegy" resultMap="YsqqXmxxSegyResult">
<include refid="selectYsqqXmxxSegyVo"/> <include refid="selectYsqqXmxxSegyVo"/>
<where> <where>
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="zbid != null "> and zbid = #{zbid}</if> <if test="zbid != null "> and zbid = #{zbid}</if>
<if test="jbsegy != null and jbsegy != ''"> and jbsegy = #{jbsegy}</if> <if test="jbsegy != null and jbsegy != ''"> and jbsegy = #{jbsegy}</if>
...@@ -38,9 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,9 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if> <if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if>
<if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if> <if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if>
<if test="ext3 != null and ext3 != ''"> and ext3 = #{ext3}</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> </where>
</select> </select>
<select id="selectYsqqXmxxSegyById" parameterType="Long" resultMap="YsqqXmxxSegyResult"> <select id="selectYsqqXmxxSegyById" parameterType="Long" resultMap="YsqqXmxxSegyResult">
<include refid="selectYsqqXmxxSegyVo"/> <include refid="selectYsqqXmxxSegyVo"/>
where id = #{id} where id = #{id}
...@@ -61,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -61,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">ext1,</if> <if test="ext1 != null">ext1,</if>
<if test="ext2 != null">ext2,</if> <if test="ext2 != null">ext2,</if>
<if test="ext3 != null">ext3,</if> <if test="ext3 != null">ext3,</if>
</trim> <if test="jbsegyName != null">jbsegy_name,</if>
<if test="xbsegyName != null">xbsegy_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if> <if test="zbid != null">#{zbid},</if>
<if test="jbsegy != null">#{jbsegy},</if> <if test="jbsegy != null">#{jbsegy},</if>
...@@ -75,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -75,7 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">#{ext1},</if> <if test="ext1 != null">#{ext1},</if>
<if test="ext2 != null">#{ext2},</if> <if test="ext2 != null">#{ext2},</if>
<if test="ext3 != null">#{ext3},</if> <if test="ext3 != null">#{ext3},</if>
</trim> <if test="jbsegyName != null">#{jbsegyName},</if>
<if test="xbsegyName != null">#{xbsegyName},</if>
</trim>
</insert> </insert>
<update id="updateYsqqXmxxSegy" parameterType="YsqqXmxxSegy"> <update id="updateYsqqXmxxSegy" parameterType="YsqqXmxxSegy">
...@@ -93,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -93,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ext1 != null">ext1 = #{ext1},</if> <if test="ext1 != null">ext1 = #{ext1},</if>
<if test="ext2 != null">ext2 = #{ext2},</if> <if test="ext2 != null">ext2 = #{ext2},</if>
<if test="ext3 != null">ext3 = #{ext3},</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> </trim>
where id = #{id} where id = #{id}
</update> </update>
...@@ -102,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -102,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteYsqqXmxxSegyByIds" parameterType="String"> <delete id="deleteYsqqXmxxSegyByIds" parameterType="String">
delete from ysqq_xmxx_segy where id in delete from ysqq_xmxx_segy where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
......
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