Commit 31f91581 by jiang'yun

修改

parent fe69fcd0
package com.ruoyi.project.zjsgfa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.project.zjsgfa.domain.JcxxTsgj;
import com.ruoyi.project.zjsgfa.service.IJcxxTsgjService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 基础信息_特殊工具Controller
*
* @author ruoyi
* @date 2025-08-06
*/
@RestController
@RequestMapping("/system/jcxxTsgj")
public class JcxxTsgjController extends BaseController
{
@Autowired
private IJcxxTsgjService jcxxTsgjService;
/**
* 查询基础信息_特殊工具列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:list')")
@GetMapping("/list")
public TableDataInfo list(JcxxTsgj jcxxTsgj)
{
// startPage();
List<JcxxTsgj> list = jcxxTsgjService.selectJcxxTsgjList(jcxxTsgj);
return getDataTable(list);
}
/**
* 导出基础信息_特殊工具列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:export')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, JcxxTsgj jcxxTsgj)
{
List<JcxxTsgj> list = jcxxTsgjService.selectJcxxTsgjList(jcxxTsgj);
ExcelUtil<JcxxTsgj> util = new ExcelUtil<JcxxTsgj>(JcxxTsgj.class);
util.exportExcel(response, list, "基础信息_特殊工具数据");
}
/**
* 获取基础信息_特殊工具详细信息
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(jcxxTsgjService.selectJcxxTsgjById(id));
}
/**
* 新增基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:add')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody JcxxTsgj jcxxTsgj)
{
return toAjax(jcxxTsgjService.insertJcxxTsgj(jcxxTsgj));
}
/**
* 修改基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:edit')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody JcxxTsgj jcxxTsgj)
{
return toAjax(jcxxTsgjService.updateJcxxTsgj(jcxxTsgj));
}
/**
* 删除基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:remove')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(jcxxTsgjService.deleteJcxxTsgjByIds(ids));
}
}
......@@ -1406,6 +1406,7 @@ public class SjDjjcController extends BaseController
continue;
}
sjH2s.setJh(jh);
sjH2s.setLjjh(jh1);
String js=new DataFormatter().formatCellValue(row.getCell(1));
if(StringUtils.isNotEmpty(js)){
sjH2s.setJs(Double.parseDouble(js));
......
package com.ruoyi.project.zjsgfa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.project.zjsgfa.domain.SjFdsgcsTsgj;
import com.ruoyi.project.zjsgfa.service.ISjFdsgcsTsgjService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 设计-分段施工措施_特殊工具Controller
*
* @author ruoyi
* @date 2025-08-06
*/
@RestController
@RequestMapping("/system/sjFdsgcsTsgj")
public class SjFdsgcsTsgjController extends BaseController
{
@Autowired
private ISjFdsgcsTsgjService sjFdsgcsTsgjService;
/**
* 查询设计-分段施工措施_特殊工具列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:list')")
@GetMapping("/list")
public TableDataInfo list(SjFdsgcsTsgj sjFdsgcsTsgj)
{
startPage();
List<SjFdsgcsTsgj> list = sjFdsgcsTsgjService.selectSjFdsgcsTsgjList(sjFdsgcsTsgj);
return getDataTable(list);
}
/**
* 导出设计-分段施工措施_特殊工具列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:export')")
@Log(title = "设计-分段施工措施_特殊工具", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SjFdsgcsTsgj sjFdsgcsTsgj)
{
List<SjFdsgcsTsgj> list = sjFdsgcsTsgjService.selectSjFdsgcsTsgjList(sjFdsgcsTsgj);
ExcelUtil<SjFdsgcsTsgj> util = new ExcelUtil<SjFdsgcsTsgj>(SjFdsgcsTsgj.class);
util.exportExcel(response, list, "设计-分段施工措施_特殊工具数据");
}
/**
* 获取设计-分段施工措施_特殊工具详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(sjFdsgcsTsgjService.selectSjFdsgcsTsgjById(id));
}
/**
* 新增设计-分段施工措施_特殊工具
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:add')")
@Log(title = "设计-分段施工措施_特殊工具", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SjFdsgcsTsgj sjFdsgcsTsgj)
{
return toAjax(sjFdsgcsTsgjService.insertSjFdsgcsTsgj(sjFdsgcsTsgj));
}
/**
* 修改设计-分段施工措施_特殊工具
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:edit')")
@Log(title = "设计-分段施工措施_特殊工具", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SjFdsgcsTsgj sjFdsgcsTsgj)
{
return toAjax(sjFdsgcsTsgjService.updateSjFdsgcsTsgj(sjFdsgcsTsgj));
}
/**
* 删除设计-分段施工措施_特殊工具
*/
//@PreAuthorize("@ss.hasPermi('system:sjFdsgcsTsgj:remove')")
@Log(title = "设计-分段施工措施_特殊工具", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sjFdsgcsTsgjService.deleteSjFdsgcsTsgjByIds(ids));
}
}
......@@ -72,8 +72,8 @@ public class SjZsjqkController extends BaseController
/**
* 新增设计-注水井情况
*/
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
@Log(title = "设计-注水井情况", businessType = BusinessType.INSERT)
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
@PostMapping
public AjaxResult add(@RequestBody SjZsjqk sjZsjqk)
{
......@@ -101,4 +101,11 @@ public class SjZsjqkController extends BaseController
{
return toAjax(sjZsjqkService.deleteSjZsjqkBySjjhs(sjjhs));
}
@PostMapping("/addAll")
public AjaxResult addAll(List<SjZsjqk> sjZsjqkList)
{
return toAjax(sjZsjqkService.insertSjZsjqkBatch(sjZsjqkList));
}
}
package com.ruoyi.project.zjsgfa.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 基础信息_特殊工具对象 jcxx_tsgj
*
* @author ruoyi
* @date 2025-08-06
*/
public class JcxxTsgj extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 工具名称 */
@Excel(name = "工具名称")
private String gjmc;
/** 规格型号 */
@Excel(name = "规格型号")
private String ggxh;
/** 使用指南 */
@Excel(name = "使用指南")
private String syzn;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setGjmc(String gjmc)
{
this.gjmc = gjmc;
}
public String getGjmc()
{
return gjmc;
}
public void setGgxh(String ggxh)
{
this.ggxh = ggxh;
}
public String getGgxh()
{
return ggxh;
}
public void setSyzn(String syzn)
{
this.syzn = syzn;
}
public String getSyzn()
{
return syzn;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("gjmc", getGjmc())
.append("ggxh", getGgxh())
.append("syzn", getSyzn())
.toString();
}
}
package com.ruoyi.project.zjsgfa.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 设计-分段施工措施_特殊工具对象 sj_fdsgcs_tsgj
*
* @author ruoyi
* @date 2025-08-06
*/
public class SjFdsgcsTsgj extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 井号 */
@Excel(name = "井号")
private String jh;
/** 开次 */
@Excel(name = "开次")
private String kc;
/** 工具名称 */
@Excel(name = "工具名称")
private String gjmc;
/** 规格型号 */
@Excel(name = "规格型号")
private String ggxh;
/** 数量 */
@Excel(name = "数量")
private Double sl;
/** 性能指标 */
@Excel(name = "性能指标")
private String xnzb;
/** 预计安装位置 */
@Excel(name = "预计安装位置")
private String yjazwz;
/** 使用目的及预期效果目标 */
@Excel(name = "使用目的及预期效果目标")
private String yqxg;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
public void setKc(String kc)
{
this.kc = kc;
}
public String getKc()
{
return kc;
}
public void setGjmc(String gjmc)
{
this.gjmc = gjmc;
}
public String getGjmc()
{
return gjmc;
}
public void setGgxh(String ggxh)
{
this.ggxh = ggxh;
}
public String getGgxh()
{
return ggxh;
}
public void setSl(Double sl)
{
this.sl = sl;
}
public Double getSl()
{
return sl;
}
public void setXnzb(String xnzb)
{
this.xnzb = xnzb;
}
public String getXnzb()
{
return xnzb;
}
public void setYjazwz(String yjazwz)
{
this.yjazwz = yjazwz;
}
public String getYjazwz()
{
return yjazwz;
}
public void setYqxg(String yqxg)
{
this.yqxg = yqxg;
}
public String getYqxg()
{
return yqxg;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jh", getJh())
.append("kc", getKc())
.append("gjmc", getGjmc())
.append("ggxh", getGgxh())
.append("sl", getSl())
.append("xnzb", getXnzb())
.append("yjazwz", getYjazwz())
.append("yqxg", getYqxg())
.toString();
}
}
......@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
......@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2025-07-22
*/
@Data
public class SjH2s extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -24,6 +26,11 @@ public class SjH2s extends BaseEntity
@Excel(name = "井号")
private String jh;
/**
* 邻井井号
*/
private String ljjh;
/** 井深 */
@Excel(name = "井深")
private Double js;
......
......@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
......@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2025-07-24
*/
@Data
public class SjHse extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -24,6 +26,8 @@ public class SjHse extends BaseEntity
@Excel(name = "井号")
private String jh;
/** HSE管理要求 */
@Excel(name = "HSE管理要求")
private String hse;
......
package com.ruoyi.project.zjsgfa.mapper;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.JcxxTsgj;
/**
* 基础信息_特殊工具Mapper接口
*
* @author ruoyi
* @date 2025-08-06
*/
public interface JcxxTsgjMapper
{
/**
* 查询基础信息_特殊工具
*
* @param id 基础信息_特殊工具主键
* @return 基础信息_特殊工具
*/
public JcxxTsgj selectJcxxTsgjById(Long id);
/**
* 查询基础信息_特殊工具列表
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 基础信息_特殊工具集合
*/
public List<JcxxTsgj> selectJcxxTsgjList(JcxxTsgj jcxxTsgj);
/**
* 新增基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
public int insertJcxxTsgj(JcxxTsgj jcxxTsgj);
/**
* 修改基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
public int updateJcxxTsgj(JcxxTsgj jcxxTsgj);
/**
* 删除基础信息_特殊工具
*
* @param id 基础信息_特殊工具主键
* @return 结果
*/
public int deleteJcxxTsgjById(Long id);
/**
* 批量删除基础信息_特殊工具
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteJcxxTsgjByIds(Long[] ids);
}
package com.ruoyi.project.zjsgfa.mapper;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjFdsgcsTsgj;
/**
* 设计-分段施工措施_特殊工具Mapper接口
*
* @author ruoyi
* @date 2025-08-06
*/
public interface SjFdsgcsTsgjMapper
{
/**
* 查询设计-分段施工措施_特殊工具
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 设计-分段施工措施_特殊工具
*/
public SjFdsgcsTsgj selectSjFdsgcsTsgjById(Long id);
/**
* 查询设计-分段施工措施_特殊工具列表
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 设计-分段施工措施_特殊工具集合
*/
public List<SjFdsgcsTsgj> selectSjFdsgcsTsgjList(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 新增设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
public int insertSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 修改设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
public int updateSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 删除设计-分段施工措施_特殊工具
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 结果
*/
public int deleteSjFdsgcsTsgjById(Long id);
/**
* 批量删除设计-分段施工措施_特殊工具
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSjFdsgcsTsgjByIds(Long[] ids);
}
......@@ -58,4 +58,8 @@ public interface SjZsjqkMapper
* @return 结果
*/
public int deleteSjZsjqkBySjjhs(String[] sjjhs);
int insertSjZsjqkBatch(List<SjZsjqk> list);
}
package com.ruoyi.project.zjsgfa.service;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.JcxxTsgj;
/**
* 基础信息_特殊工具Service接口
*
* @author ruoyi
* @date 2025-08-06
*/
public interface IJcxxTsgjService
{
/**
* 查询基础信息_特殊工具
*
* @param id 基础信息_特殊工具主键
* @return 基础信息_特殊工具
*/
public JcxxTsgj selectJcxxTsgjById(Long id);
/**
* 查询基础信息_特殊工具列表
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 基础信息_特殊工具集合
*/
public List<JcxxTsgj> selectJcxxTsgjList(JcxxTsgj jcxxTsgj);
/**
* 新增基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
public int insertJcxxTsgj(JcxxTsgj jcxxTsgj);
/**
* 修改基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
public int updateJcxxTsgj(JcxxTsgj jcxxTsgj);
/**
* 批量删除基础信息_特殊工具
*
* @param ids 需要删除的基础信息_特殊工具主键集合
* @return 结果
*/
public int deleteJcxxTsgjByIds(Long[] ids);
/**
* 删除基础信息_特殊工具信息
*
* @param id 基础信息_特殊工具主键
* @return 结果
*/
public int deleteJcxxTsgjById(Long id);
}
package com.ruoyi.project.zjsgfa.service;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjFdsgcsTsgj;
/**
* 设计-分段施工措施_特殊工具Service接口
*
* @author ruoyi
* @date 2025-08-06
*/
public interface ISjFdsgcsTsgjService
{
/**
* 查询设计-分段施工措施_特殊工具
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 设计-分段施工措施_特殊工具
*/
public SjFdsgcsTsgj selectSjFdsgcsTsgjById(Long id);
/**
* 查询设计-分段施工措施_特殊工具列表
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 设计-分段施工措施_特殊工具集合
*/
public List<SjFdsgcsTsgj> selectSjFdsgcsTsgjList(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 新增设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
public int insertSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 修改设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
public int updateSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj);
/**
* 批量删除设计-分段施工措施_特殊工具
*
* @param ids 需要删除的设计-分段施工措施_特殊工具主键集合
* @return 结果
*/
public int deleteSjFdsgcsTsgjByIds(Long[] ids);
/**
* 删除设计-分段施工措施_特殊工具信息
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 结果
*/
public int deleteSjFdsgcsTsgjById(Long id);
}
......@@ -58,4 +58,7 @@ public interface ISjZsjqkService
* @return 结果
*/
public int deleteSjZsjqkBySjjh(String sjjh);
int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList);
}
package com.ruoyi.project.zjsgfa.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.mapper.JcxxTsgjMapper;
import com.ruoyi.project.zjsgfa.domain.JcxxTsgj;
import com.ruoyi.project.zjsgfa.service.IJcxxTsgjService;
/**
* 基础信息_特殊工具Service业务层处理
*
* @author ruoyi
* @date 2025-08-06
*/
@Service
public class JcxxTsgjServiceImpl implements IJcxxTsgjService
{
@Autowired
private JcxxTsgjMapper jcxxTsgjMapper;
/**
* 查询基础信息_特殊工具
*
* @param id 基础信息_特殊工具主键
* @return 基础信息_特殊工具
*/
@Override
public JcxxTsgj selectJcxxTsgjById(Long id)
{
return jcxxTsgjMapper.selectJcxxTsgjById(id);
}
/**
* 查询基础信息_特殊工具列表
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 基础信息_特殊工具
*/
@Override
public List<JcxxTsgj> selectJcxxTsgjList(JcxxTsgj jcxxTsgj)
{
return jcxxTsgjMapper.selectJcxxTsgjList(jcxxTsgj);
}
/**
* 新增基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
@Override
public int insertJcxxTsgj(JcxxTsgj jcxxTsgj)
{
return jcxxTsgjMapper.insertJcxxTsgj(jcxxTsgj);
}
/**
* 修改基础信息_特殊工具
*
* @param jcxxTsgj 基础信息_特殊工具
* @return 结果
*/
@Override
public int updateJcxxTsgj(JcxxTsgj jcxxTsgj)
{
return jcxxTsgjMapper.updateJcxxTsgj(jcxxTsgj);
}
/**
* 批量删除基础信息_特殊工具
*
* @param ids 需要删除的基础信息_特殊工具主键
* @return 结果
*/
@Override
public int deleteJcxxTsgjByIds(Long[] ids)
{
return jcxxTsgjMapper.deleteJcxxTsgjByIds(ids);
}
/**
* 删除基础信息_特殊工具信息
*
* @param id 基础信息_特殊工具主键
* @return 结果
*/
@Override
public int deleteJcxxTsgjById(Long id)
{
return jcxxTsgjMapper.deleteJcxxTsgjById(id);
}
}
package com.ruoyi.project.zjsgfa.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.mapper.SjFdsgcsTsgjMapper;
import com.ruoyi.project.zjsgfa.domain.SjFdsgcsTsgj;
import com.ruoyi.project.zjsgfa.service.ISjFdsgcsTsgjService;
/**
* 设计-分段施工措施_特殊工具Service业务层处理
*
* @author ruoyi
* @date 2025-08-06
*/
@Service
public class SjFdsgcsTsgjServiceImpl implements ISjFdsgcsTsgjService
{
@Autowired
private SjFdsgcsTsgjMapper sjFdsgcsTsgjMapper;
/**
* 查询设计-分段施工措施_特殊工具
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 设计-分段施工措施_特殊工具
*/
@Override
public SjFdsgcsTsgj selectSjFdsgcsTsgjById(Long id)
{
return sjFdsgcsTsgjMapper.selectSjFdsgcsTsgjById(id);
}
/**
* 查询设计-分段施工措施_特殊工具列表
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 设计-分段施工措施_特殊工具
*/
@Override
public List<SjFdsgcsTsgj> selectSjFdsgcsTsgjList(SjFdsgcsTsgj sjFdsgcsTsgj)
{
return sjFdsgcsTsgjMapper.selectSjFdsgcsTsgjList(sjFdsgcsTsgj);
}
/**
* 新增设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
@Override
public int insertSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj)
{
return sjFdsgcsTsgjMapper.insertSjFdsgcsTsgj(sjFdsgcsTsgj);
}
/**
* 修改设计-分段施工措施_特殊工具
*
* @param sjFdsgcsTsgj 设计-分段施工措施_特殊工具
* @return 结果
*/
@Override
public int updateSjFdsgcsTsgj(SjFdsgcsTsgj sjFdsgcsTsgj)
{
return sjFdsgcsTsgjMapper.updateSjFdsgcsTsgj(sjFdsgcsTsgj);
}
/**
* 批量删除设计-分段施工措施_特殊工具
*
* @param ids 需要删除的设计-分段施工措施_特殊工具主键
* @return 结果
*/
@Override
public int deleteSjFdsgcsTsgjByIds(Long[] ids)
{
return sjFdsgcsTsgjMapper.deleteSjFdsgcsTsgjByIds(ids);
}
/**
* 删除设计-分段施工措施_特殊工具信息
*
* @param id 设计-分段施工措施_特殊工具主键
* @return 结果
*/
@Override
public int deleteSjFdsgcsTsgjById(Long id)
{
return sjFdsgcsTsgjMapper.deleteSjFdsgcsTsgjById(id);
}
}
......@@ -90,4 +90,9 @@ public class SjZsjqkServiceImpl implements ISjZsjqkService
{
return sjZsjqkMapper.deleteSjZsjqkBySjjh(sjjh);
}
@Override
public int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList) {
return sjZsjqkMapper.insertSjZsjqkBatch(sjZsjqkList);
}
}
......@@ -1569,6 +1569,7 @@ public class DjdcServiceImpl implements DjdcService {
List<Tsyxclxx> tsyxclxxes = tsyxclxxMapper.selectTsyxclxxList(new Tsyxclxx());
List<Dzgzzb> dzgzzbs = dzgzzbMapper.selectDzgzzbList(new Dzgzzb());
List<String> jhList=new ArrayList<>();
jhList.addAll(sjDzfcs.stream().map(SjDzfc::getYjjh1).distinct().collect(Collectors.toList()));
......@@ -1642,7 +1643,7 @@ public class DjdcServiceImpl implements DjdcService {
}
}else {
List<Dzgzzb> dzgzzbs = dzgzzbMapper.selectDzgzzbList(new Dzgzzb());
//最后构造
for (SjDzfc item : sjDzfcs) {
String dcD = item.getDcD();
......@@ -1682,6 +1683,31 @@ public class DjdcServiceImpl implements DjdcService {
}
}
for(SjDcfxDzfc sjDcfxDzfc:list){
if(StringUtils.isNotEmpty(sjDcfxDzfc.getYxts())){
String dc = sjDcfxDzfc.getDzfc();
List<String> collect = dzgzzbs.stream().filter(dzgzzb -> dzgzzb.getDzfc().equals(dc)).map(dzgzzb -> StringUtils.isNotEmpty(dzgzzb.getZyyx()) ? dzgzzb.getZyyx().replaceAll("、", ",") : "").collect(Collectors.toList());
if(collect.size()>0){
sjDcfxDzfc.setYxts(String.join( ",",collect));
List<String> tsyx = tsyxclxxes.stream().filter(tsyxclxx -> tsyxclxx.getTsyx().contains(sjDcfxDzfc.getYxts())).map(Tsyxclxx::getWt).collect(Collectors.toList());
if(tsyx.size()>0){
sjDcfxDzfc.setGzts(String.join( ",",tsyx));
}
}
}
}
return list;
}
......
<?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">
<mapper namespace="com.ruoyi.project.zjsgfa.mapper.JcxxTsgjMapper">
<resultMap type="JcxxTsgj" id="JcxxTsgjResult">
<result property="id" column="id" />
<result property="gjmc" column="gjmc" />
<result property="ggxh" column="ggxh" />
<result property="syzn" column="syzn" />
</resultMap>
<sql id="selectJcxxTsgjVo">
select id, gjmc, ggxh, syzn from jcxx_tsgj
</sql>
<select id="selectJcxxTsgjList" parameterType="JcxxTsgj" resultMap="JcxxTsgjResult">
<include refid="selectJcxxTsgjVo"/>
<where>
<if test="gjmc != null and gjmc != ''"> and gjmc = #{gjmc}</if>
<if test="ggxh != null and ggxh != ''"> and ggxh = #{ggxh}</if>
<if test="syzn != null and syzn != ''"> and syzn = #{syzn}</if>
</where>
</select>
<select id="selectJcxxTsgjById" parameterType="Long" resultMap="JcxxTsgjResult">
<include refid="selectJcxxTsgjVo"/>
where id = #{id}
</select>
<insert id="insertJcxxTsgj" parameterType="JcxxTsgj" useGeneratedKeys="true" keyProperty="id">
insert into jcxx_tsgj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="gjmc != null">gjmc,</if>
<if test="ggxh != null">ggxh,</if>
<if test="syzn != null">syzn,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="gjmc != null">#{gjmc},</if>
<if test="ggxh != null">#{ggxh},</if>
<if test="syzn != null">#{syzn},</if>
</trim>
</insert>
<update id="updateJcxxTsgj" parameterType="JcxxTsgj">
update jcxx_tsgj
<trim prefix="SET" suffixOverrides=",">
<if test="gjmc != null">gjmc = #{gjmc},</if>
<if test="ggxh != null">ggxh = #{ggxh},</if>
<if test="syzn != null">syzn = #{syzn},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteJcxxTsgjById" parameterType="Long">
delete from jcxx_tsgj where id = #{id}
</delete>
<delete id="deleteJcxxTsgjByIds" parameterType="String">
delete from jcxx_tsgj where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
<?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">
<mapper namespace="com.ruoyi.project.zjsgfa.mapper.SjFdsgcsTsgjMapper">
<resultMap type="SjFdsgcsTsgj" id="SjFdsgcsTsgjResult">
<result property="id" column="id" />
<result property="jh" column="jh" />
<result property="kc" column="kc" />
<result property="gjmc" column="gjmc" />
<result property="ggxh" column="ggxh" />
<result property="sl" column="sl" />
<result property="xnzb" column="xnzb" />
<result property="yjazwz" column="yjazwz" />
<result property="yqxg" column="yqxg" />
</resultMap>
<sql id="selectSjFdsgcsTsgjVo">
select id, jh, kc, gjmc, ggxh, sl, xnzb, yjazwz, yqxg from sj_fdsgcs_tsgj
</sql>
<select id="selectSjFdsgcsTsgjList" parameterType="SjFdsgcsTsgj" resultMap="SjFdsgcsTsgjResult">
<include refid="selectSjFdsgcsTsgjVo"/>
<where>
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="kc != null and kc != ''"> and kc = #{kc}</if>
<if test="gjmc != null and gjmc != ''"> and gjmc = #{gjmc}</if>
<if test="ggxh != null and ggxh != ''"> and ggxh = #{ggxh}</if>
<if test="sl != null "> and sl = #{sl}</if>
<if test="xnzb != null and xnzb != ''"> and xnzb = #{xnzb}</if>
<if test="yjazwz != null and yjazwz != ''"> and yjazwz = #{yjazwz}</if>
<if test="yqxg != null and yqxg != ''"> and yqxg = #{yqxg}</if>
</where>
</select>
<select id="selectSjFdsgcsTsgjById" parameterType="Long" resultMap="SjFdsgcsTsgjResult">
<include refid="selectSjFdsgcsTsgjVo"/>
where id = #{id}
</select>
<insert id="insertSjFdsgcsTsgj" parameterType="SjFdsgcsTsgj" useGeneratedKeys="true" keyProperty="id">
insert into sj_fdsgcs_tsgj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jh != null">jh,</if>
<if test="kc != null">kc,</if>
<if test="gjmc != null">gjmc,</if>
<if test="ggxh != null">ggxh,</if>
<if test="sl != null">sl,</if>
<if test="xnzb != null">xnzb,</if>
<if test="yjazwz != null">yjazwz,</if>
<if test="yqxg != null">yqxg,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
<if test="kc != null">#{kc},</if>
<if test="gjmc != null">#{gjmc},</if>
<if test="ggxh != null">#{ggxh},</if>
<if test="sl != null">#{sl},</if>
<if test="xnzb != null">#{xnzb},</if>
<if test="yjazwz != null">#{yjazwz},</if>
<if test="yqxg != null">#{yqxg},</if>
</trim>
</insert>
<update id="updateSjFdsgcsTsgj" parameterType="SjFdsgcsTsgj">
update sj_fdsgcs_tsgj
<trim prefix="SET" suffixOverrides=",">
<if test="jh != null">jh = #{jh},</if>
<if test="kc != null">kc = #{kc},</if>
<if test="gjmc != null">gjmc = #{gjmc},</if>
<if test="ggxh != null">ggxh = #{ggxh},</if>
<if test="sl != null">sl = #{sl},</if>
<if test="xnzb != null">xnzb = #{xnzb},</if>
<if test="yjazwz != null">yjazwz = #{yjazwz},</if>
<if test="yqxg != null">yqxg = #{yqxg},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSjFdsgcsTsgjById" parameterType="Long">
delete from sj_fdsgcs_tsgj where id = #{id}
</delete>
<delete id="deleteSjFdsgcsTsgjByIds" parameterType="String">
delete from sj_fdsgcs_tsgj where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
......@@ -23,16 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createdTime" column="created_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="ljjh" column="ljjh" />
</resultMap>
<sql id="selectSjH2sVo">
select id, jh, js, gczt, cw, xsbd, xsgc, jcsj, jcfs, wyjkfw, wyjkjl, wybdfw, wybdjl, bz, created_by, created_time, update_by, update_time from sj_h2s
select id, jh, js, ljjh, gczt, cw, xsbd, xsgc, jcsj, jcfs, wyjkfw, wyjkjl, wybdfw, wybdjl, bz, created_by, created_time, update_by, update_time from sj_h2s
</sql>
<select id="selectSjH2sList" parameterType="SjH2s" resultMap="SjH2sResult">
<include refid="selectSjH2sVo"/>
<where>
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="ljjh != null and ljjh != ''"> and ljjh = #{ljjh}</if>
<if test="js != null "> and js = #{js}</if>
<if test="gczt != null and gczt != ''"> and gczt = #{gczt}</if>
<if test="cw != null and cw != ''"> and cw = #{cw}</if>
......@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">created_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="ljjh != null">ljjh,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
......@@ -94,11 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdTime != null">#{createdTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="ljjh != null">#{ljjh},</if>
</trim>
</insert>
<insert id="insertSjH2sBatch">
INSERT INTO sj_h2s
(jh, js, gczt, cw, xsbd, xsgc, jcsj, jcfs, wyjkfw, wyjkjl, wybdfw, wybdjl, bz)
(jh, js, gczt, cw,ljjh, xsbd, xsgc, jcsj, jcfs, wyjkfw, wyjkjl, wybdfw, wybdjl, bz)
VALUES
<foreach collection="list" item="item" separator=",">
(
......@@ -106,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.js},
#{item.gczt},
#{item.cw},
#{item.ljjh},
#{item.xsbd},
#{item.xsgc},
#{item.jcsj},
......@@ -124,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sj_h2s
<trim prefix="SET" suffixOverrides=",">
<if test="jh != null">jh = #{jh},</if>
<if test="ljjh != null">ljjh = #{ljjh},</if>
<if test="js != null">js = #{js},</if>
<if test="gczt != null">gczt = #{gczt},</if>
<if test="cw != null">cw = #{cw},</if>
......
......@@ -85,6 +85,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sftz != null">#{sftz},</if>
</trim>
</insert>
<insert id="insertSjZsjqkBatch">
INSERT INTO sj_zsjqk
(
sjjh, jh, jhbm, zqlxmc, cwmc, sdfw,
jkyl, dcyl, rzl, ljzrl, zrzt,
jkjl, jdjl, sftz
)
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.sjjh},
#{item.jh},
#{item.jhbm},
#{item.zqlxmc},
#{item.cwmc},
#{item.sdfw},
#{item.jkyl},
#{item.dcyl},
#{item.rzl},
#{item.ljzrl},
#{item.zrzt},
#{item.jkjl},
#{item.jdjl},
#{item.sftz}
)
</foreach>
</insert>
<update id="updateSjZsjqk" parameterType="SjZsjqk">
update sj_zsjqk
......
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