Commit 639d93f1 by jiang'yun

修改

parent 39afd744
...@@ -91,6 +91,12 @@ public class SjFdsgcsZjyFdxnbController extends BaseController ...@@ -91,6 +91,12 @@ public class SjFdsgcsZjyFdxnbController extends BaseController
return toAjax(sjFdsgcsZjyFdxnbService.updateSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb)); return toAjax(sjFdsgcsZjyFdxnbService.updateSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb));
} }
@PostMapping("/pledit")
public AjaxResult pledit(@RequestBody SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
{
return toAjax(sjFdsgcsZjyFdxnbService.pledit(sjFdsgcsZjyFdxnb.getList()));
}
/** /**
* 删除设计信息-分段施工措施-分段钻井液性能设计 * 删除设计信息-分段施工措施-分段钻井液性能设计
*/ */
...@@ -101,4 +107,5 @@ public class SjFdsgcsZjyFdxnbController extends BaseController ...@@ -101,4 +107,5 @@ public class SjFdsgcsZjyFdxnbController extends BaseController
{ {
return toAjax(sjFdsgcsZjyFdxnbService.deleteSjFdsgcsZjyFdxnbByIds(ids)); return toAjax(sjFdsgcsZjyFdxnbService.deleteSjFdsgcsZjyFdxnbByIds(ids));
} }
} }
package com.ruoyi.project.zjsgfa.domain; package com.ruoyi.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.framework.web.domain.BaseEntity;
import java.util.List;
/** /**
* 设计信息-分段施工措施-分段钻井液性能设计对象 sj_fdsgcs_zjy_fdxnb * 设计信息-分段施工措施-分段钻井液性能设计对象 sj_fdsgcs_zjy_fdxnb
* *
* @author ruoyi * @author ruoyi
* @date 2025-08-20 * @date 2025-08-20
*/ */
@Data
public class SjFdsgcsZjyFdxnb extends BaseEntity public class SjFdsgcsZjyFdxnb extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -74,6 +78,8 @@ public class SjFdsgcsZjyFdxnb extends BaseEntity ...@@ -74,6 +78,8 @@ public class SjFdsgcsZjyFdxnb extends BaseEntity
@Excel(name = "塑性黏度") @Excel(name = "塑性黏度")
private String sxnd; private String sxnd;
private List<SjFdsgcsZjyFdxnb> list;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
...@@ -63,4 +63,8 @@ public interface SjFdsgcsZjyFdxnbMapper ...@@ -63,4 +63,8 @@ public interface SjFdsgcsZjyFdxnbMapper
int insertSjFdsgcsZjyFdxnbBatch(List<SjFdsgcsZjyFdxnb> sjFdsgcsZjyFdxnbList); int insertSjFdsgcsZjyFdxnbBatch(List<SjFdsgcsZjyFdxnb> sjFdsgcsZjyFdxnbList);
int deleteSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb fdsgcsZjyFdxnb);
int updateSjFdsgcsZjyFdxnbByJd(SjFdsgcsZjyFdxnb fdsgcsZjyFdxnb);
} }
...@@ -63,4 +63,8 @@ public interface SjSggyZjyFdxnbMapper ...@@ -63,4 +63,8 @@ public interface SjSggyZjyFdxnbMapper
int insertSjSggyZjyFdxnbBatch(List<SjSggyZjyFdxnb> sjSggyZjyFdxnbList); int insertSjSggyZjyFdxnbBatch(List<SjSggyZjyFdxnb> sjSggyZjyFdxnbList);
int deleteSjSggyZjyFdxnb(SjSggyZjyFdxnb sjSggyZjyFdxnb);
int updateSjSggyZjyFdxnbBY(SjSggyZjyFdxnb sjSggyZjyFdxnb);
} }
...@@ -60,4 +60,7 @@ public interface ISjFdsgcsZjyFdxnbService ...@@ -60,4 +60,7 @@ public interface ISjFdsgcsZjyFdxnbService
* @return 结果 * @return 结果
*/ */
public int deleteSjFdsgcsZjyFdxnbById(Long id); public int deleteSjFdsgcsZjyFdxnbById(Long id);
int pledit(List<SjFdsgcsZjyFdxnb> list);
} }
...@@ -4,7 +4,10 @@ import java.lang.reflect.Field; ...@@ -4,7 +4,10 @@ import java.lang.reflect.Field;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.project.zjsgfa.domain.SjSggyZjyFdxnb; import com.ruoyi.project.zjsgfa.domain.SjSggyZjyFdxnb;
import com.ruoyi.project.zjsgfa.mapper.SjSggyZjyFdxnbMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.mapper.SjFdsgcsZjyFdxnbMapper; import com.ruoyi.project.zjsgfa.mapper.SjFdsgcsZjyFdxnbMapper;
...@@ -22,6 +25,8 @@ public class SjFdsgcsZjyFdxnbServiceImpl implements ISjFdsgcsZjyFdxnbService ...@@ -22,6 +25,8 @@ public class SjFdsgcsZjyFdxnbServiceImpl implements ISjFdsgcsZjyFdxnbService
{ {
@Autowired @Autowired
private SjFdsgcsZjyFdxnbMapper sjFdsgcsZjyFdxnbMapper; private SjFdsgcsZjyFdxnbMapper sjFdsgcsZjyFdxnbMapper;
@Autowired
private SjSggyZjyFdxnbMapper sjSggyZjyFdxnbMapper;
/** /**
* 查询设计信息-分段施工措施-分段钻井液性能设计 * 查询设计信息-分段施工措施-分段钻井液性能设计
...@@ -155,4 +160,18 @@ public class SjFdsgcsZjyFdxnbServiceImpl implements ISjFdsgcsZjyFdxnbService ...@@ -155,4 +160,18 @@ public class SjFdsgcsZjyFdxnbServiceImpl implements ISjFdsgcsZjyFdxnbService
{ {
return sjFdsgcsZjyFdxnbMapper.deleteSjFdsgcsZjyFdxnbById(id); return sjFdsgcsZjyFdxnbMapper.deleteSjFdsgcsZjyFdxnbById(id);
} }
@Override
public int pledit(List<SjFdsgcsZjyFdxnb> list) {
for(SjFdsgcsZjyFdxnb fdsgcsZjyFdxnb:list){
if(StringUtils.isNotEmpty(fdsgcsZjyFdxnb.getJd())){
sjFdsgcsZjyFdxnbMapper.updateSjFdsgcsZjyFdxnbByJd(fdsgcsZjyFdxnb);
SjSggyZjyFdxnb sjSggyZjyFdxnb = new SjSggyZjyFdxnb();
BeanUtils.copyProperties(fdsgcsZjyFdxnb,sjSggyZjyFdxnb);
// sjSggyZjyFdxnbMapper.deleteSjSggyZjyFdxnb(sjSggyZjyFdxnb);
sjSggyZjyFdxnbMapper.updateSjSggyZjyFdxnbBY(sjSggyZjyFdxnb);
}
}
return 1;
}
} }
...@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dql != null and dql != ''"> and dql = #{dql}</if> <if test="dql != null and dql != ''"> and dql = #{dql}</if>
<if test="sxnd != null and sxnd != ''"> and sxnd = #{sxnd}</if> <if test="sxnd != null and sxnd != ''"> and sxnd = #{sxnd}</if>
</where> </where>
order by kc,jd
</select> </select>
<select id="selectSjFdsgcsZjyFdxnbById" parameterType="Long" resultMap="SjFdsgcsZjyFdxnbResult"> <select id="selectSjFdsgcsZjyFdxnbById" parameterType="Long" resultMap="SjFdsgcsZjyFdxnbResult">
...@@ -130,6 +131,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -130,6 +131,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<update id="updateSjFdsgcsZjyFdxnbByJd">
update sj_fdsgcs_zjy_fdxnb
<trim prefix="SET" suffixOverrides=",">
<if test="md != null">md = #{md},</if>
<if test="msldnd != null">msldnd = #{msldnd},</if>
<if test="apilsl != null">apilsl = #{apilsl},</if>
<if test="apinb != null">apinb = #{apinb},</if>
<if test="jql != null">jql = #{jql},</if>
<if test="ph != null">ph = #{ph},</if>
<if test="hsl != null">hsl = #{hsl},</if>
<if test="zgh != null">zgh = #{zgh},</if>
<if test="mzxs != null">mzxs = #{mzxs},</if>
<if test="dql != null">dql = #{dql},</if>
<if test="sxnd != null">sxnd = #{sxnd},</if>
</trim>
where jh = #{jh} and kc = #{kc} and jd = #{jd}
</update>
<delete id="deleteSjFdsgcsZjyFdxnbById" parameterType="Long"> <delete id="deleteSjFdsgcsZjyFdxnbById" parameterType="Long">
delete from sj_fdsgcs_zjy_fdxnb where id = #{id} delete from sj_fdsgcs_zjy_fdxnb where id = #{id}
...@@ -144,4 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -144,4 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteSjFdsgcsZjyFdxnbByJh"> <delete id="deleteSjFdsgcsZjyFdxnbByJh">
delete from sj_fdsgcs_zjy_fdxnb where jh = #{jh} delete from sj_fdsgcs_zjy_fdxnb where jh = #{jh}
</delete> </delete>
<delete id="deleteSjFdsgcsZjyFdxnb">
delete from sj_fdsgcs_zjy_fdxnb where jh = #{jh} and kc = #{kc} and jd = #{jd}
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -50,6 +50,7 @@ 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>
</where> </where>
order by jd
</select> </select>
<select id="selectSjSggyZjyFdxnbById" parameterType="Long" resultMap="SjSggyZjyFdxnbResult"> <select id="selectSjSggyZjyFdxnbById" parameterType="Long" resultMap="SjSggyZjyFdxnbResult">
...@@ -149,6 +150,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -149,6 +150,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<update id="updateSjSggyZjyFdxnbBY">
update sj_sggy_zjy_fdxnb
<trim prefix="SET" suffixOverrides=",">
<if test="md != null">md = #{md},</if>
<if test="msldnd != null">msldnd = #{msldnd},</if>
<if test="apilsl != null">apilsl = #{apilsl},</if>
<if test="apinb != null">apinb = #{apinb},</if>
<if test="jql != null">jql = #{jql},</if>
<if test="ph != null">ph = #{ph},</if>
<if test="hsl != null">hsl = #{hsl},</if>
<if test="zgh != null">zgh = #{zgh},</if>
<if test="mzxs != null">mzxs = #{mzxs},</if>
<if test="dql != null">dql = #{dql},</if>
<if test="sxnd != null">sxnd = #{sxnd},</if>
<if test="bz != null">bz = #{bz},</if>
</trim>
where jh = #{jh} and jd = #{jd}
</update>
<delete id="deleteSjSggyZjyFdxnbById" parameterType="Long"> <delete id="deleteSjSggyZjyFdxnbById" parameterType="Long">
delete from sj_sggy_zjy_fdxnb where id = #{id} delete from sj_sggy_zjy_fdxnb where id = #{id}
...@@ -163,4 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -163,4 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteSjSggyZjyFdxnbByJh"> <delete id="deleteSjSggyZjyFdxnbByJh">
delete from sj_sggy_zjy_fdxnb where jh = #{jh} delete from sj_sggy_zjy_fdxnb where jh = #{jh}
</delete> </delete>
<delete id="deleteSjSggyZjyFdxnb">
delete from sj_sggy_zjy_fdxnb where jh = #{jh} and jd = #{jd}
</delete>
</mapper> </mapper>
\ No newline at end of file
...@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -50,6 +50,7 @@ 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>
</where> </where>
order by jd
</select> </select>
<select id="selectSjZjyFdxnbById" parameterType="Long" resultMap="SjZjyFdxnbResult"> <select id="selectSjZjyFdxnbById" parameterType="Long" resultMap="SjZjyFdxnbResult">
......
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