修改

src/main/java/com/ruoyi/project/zjsgfa/controller/SjDjjcController.java

@@ -885,7 +885,7 @@ public class SjDjjcController extends BaseController
             }
             }
             if(sjSggyZjyFdsjList.size()>0){
             if(sjSggyZjyFdsjList.size()>0){
                 sjSggyZjyFdsjMapper.deleteSjSggyZjyFdsjByJh(jh);
                 sjSggyZjyFdsjMapper.deleteSjSggyZjyFdsjByJh(jh);
-                sjSggyZjyFdsjMapper.insertSjSggyZjyFdsjBatch(jh);
+                sjSggyZjyFdsjMapper.insertSjSggyZjyFdsjBatch(sjSggyZjyFdsjList);
             }
             }
             //钻井液  分段钻井液设计 end ---------------------------------------------------
             //钻井液  分段钻井液设计 end ---------------------------------------------------
             //钻井液  加量 ---------------------------------------------------
             //钻井液  加量 ---------------------------------------------------

src/main/java/com/ruoyi/project/zjsgfa/controller/SjFdsgcsZjyFdxnbController.java

+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.SjFdsgcsZjyFdxnb;
+import com.ruoyi.project.zjsgfa.service.ISjFdsgcsZjyFdxnbService;
+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-20
+ */
+@RestController
+@RequestMapping("/system/sjFdsgcsZjyFdxnb")
+public class SjFdsgcsZjyFdxnbController extends BaseController
+{
+    @Autowired
+    private ISjFdsgcsZjyFdxnbService sjFdsgcsZjyFdxnbService;
+
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        startPage();
+        List<SjFdsgcsZjyFdxnb> list = sjFdsgcsZjyFdxnbService.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设计信息-分段施工措施-分段钻井液性能设计列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:export')")
+    @Log(title = "设计信息-分段施工措施-分段钻井液性能设计", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        List<SjFdsgcsZjyFdxnb> list = sjFdsgcsZjyFdxnbService.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb);
+        ExcelUtil<SjFdsgcsZjyFdxnb> util = new ExcelUtil<SjFdsgcsZjyFdxnb>(SjFdsgcsZjyFdxnb.class);
+        util.exportExcel(response, list, "设计信息-分段施工措施-分段钻井液性能设计数据");
+    }
+
+    /**
+     * 获取设计信息-分段施工措施-分段钻井液性能设计详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjFdsgcsZjyFdxnbService.selectSjFdsgcsZjyFdxnbById(id));
+    }
+
+    /**
+     * 新增设计信息-分段施工措施-分段钻井液性能设计
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:add')")
+    @Log(title = "设计信息-分段施工措施-分段钻井液性能设计", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        return toAjax(sjFdsgcsZjyFdxnbService.insertSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb));
+    }
+
+    /**
+     * 修改设计信息-分段施工措施-分段钻井液性能设计
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:edit')")
+    @Log(title = "设计信息-分段施工措施-分段钻井液性能设计", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        return toAjax(sjFdsgcsZjyFdxnbService.updateSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb));
+    }
+
+    /**
+     * 删除设计信息-分段施工措施-分段钻井液性能设计
+     */
+    @PreAuthorize("@ss.hasPermi('system:sjFdsgcsZjyFdxnb:remove')")
+    @Log(title = "设计信息-分段施工措施-分段钻井液性能设计", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjFdsgcsZjyFdxnbService.deleteSjFdsgcsZjyFdxnbByIds(ids));
+    }
+}

src/main/java/com/ruoyi/project/zjsgfa/domain/SjFdsgcsZjyFdxnb.java

+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_zjy_fdxnb
+ * 
+ * @author ruoyi
+ * @date 2025-08-20
+ */
+public class SjFdsgcsZjyFdxnb 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 jd;
+
+    /** 密度(g/cm3) */
+    @Excel(name = "密度(g/cm3)")
+    private String md;
+
+    /** 马氏漏斗黏度(s) */
+    @Excel(name = "马氏漏斗黏度(s)")
+    private String msldnd;
+
+    /** API 滤失量(ml) */
+    @Excel(name = "API 滤失量(ml)")
+    private String apilsl;
+
+    /** API 泥饼(mm) */
+    @Excel(name = "API 泥饼(mm)")
+    private String apinb;
+
+    /** 静切力(Pa) */
+    @Excel(name = "静切力(Pa)")
+    private String jql;
+
+    /** pH值 */
+    @Excel(name = "pH值")
+    private String ph;
+
+    /** 含砂量(％) */
+    @Excel(name = "含砂量(％)")
+    private String hsl;
+
+    /** 总固含(％) */
+    @Excel(name = "总固含(％)")
+    private String zgh;
+
+    /** 摩阻系数 */
+    @Excel(name = "摩阻系数")
+    private String mzxs;
+
+    /** 动切力 */
+    @Excel(name = "动切力")
+    private String dql;
+
+    /** 塑性黏度 */
+    @Excel(name = "塑性黏度")
+    private String sxnd;
+
+    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 setJd(String jd) 
+    {
+        this.jd = jd;
+    }
+
+    public String getJd() 
+    {
+        return jd;
+    }
+
+    public void setMd(String md) 
+    {
+        this.md = md;
+    }
+
+    public String getMd() 
+    {
+        return md;
+    }
+
+    public void setMsldnd(String msldnd) 
+    {
+        this.msldnd = msldnd;
+    }
+
+    public String getMsldnd() 
+    {
+        return msldnd;
+    }
+
+    public void setApilsl(String apilsl) 
+    {
+        this.apilsl = apilsl;
+    }
+
+    public String getApilsl() 
+    {
+        return apilsl;
+    }
+
+    public void setApinb(String apinb) 
+    {
+        this.apinb = apinb;
+    }
+
+    public String getApinb() 
+    {
+        return apinb;
+    }
+
+    public void setJql(String jql) 
+    {
+        this.jql = jql;
+    }
+
+    public String getJql() 
+    {
+        return jql;
+    }
+
+    public void setPh(String ph) 
+    {
+        this.ph = ph;
+    }
+
+    public String getPh() 
+    {
+        return ph;
+    }
+
+    public void setHsl(String hsl) 
+    {
+        this.hsl = hsl;
+    }
+
+    public String getHsl() 
+    {
+        return hsl;
+    }
+
+    public void setZgh(String zgh) 
+    {
+        this.zgh = zgh;
+    }
+
+    public String getZgh() 
+    {
+        return zgh;
+    }
+
+    public void setMzxs(String mzxs) 
+    {
+        this.mzxs = mzxs;
+    }
+
+    public String getMzxs() 
+    {
+        return mzxs;
+    }
+
+    public void setDql(String dql) 
+    {
+        this.dql = dql;
+    }
+
+    public String getDql() 
+    {
+        return dql;
+    }
+
+    public void setSxnd(String sxnd) 
+    {
+        this.sxnd = sxnd;
+    }
+
+    public String getSxnd() 
+    {
+        return sxnd;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("jh", getJh())
+            .append("kc", getKc())
+            .append("jd", getJd())
+            .append("md", getMd())
+            .append("msldnd", getMsldnd())
+            .append("apilsl", getApilsl())
+            .append("apinb", getApinb())
+            .append("jql", getJql())
+            .append("ph", getPh())
+            .append("hsl", getHsl())
+            .append("zgh", getZgh())
+            .append("mzxs", getMzxs())
+            .append("dql", getDql())
+            .append("sxnd", getSxnd())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/project/zjsgfa/domain/SjSggyGjsbxnyq.java

 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;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
  * @author ruoyi
  * @author ruoyi
  * @date 2025-08-18
  * @date 2025-08-18
  */
  */
+@Data
 public class SjSggyGjsbxnyq extends BaseEntity
 public class SjSggyGjsbxnyq extends BaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -22,6 +24,11 @@ public class SjSggyGjsbxnyq extends BaseEntity
     @Excel(name = "井号")
     @Excel(name = "井号")
     private String jh;
     private String jh;
 
 
+    /**
+     * 设计优化
+     */
+    private String sjyh;
+
     /** 钻机型号 */
     /** 钻机型号 */
     @Excel(name = "钻机型号")
     @Excel(name = "钻机型号")
     private String zjxh;
     private String zjxh;

src/main/java/com/ruoyi/project/zjsgfa/mapper/SjFdsgcsZjyFdxnbMapper.java

+package com.ruoyi.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.ruoyi.project.zjsgfa.domain.SjFdsgcsZjyFdxnb;
+
+/**
+ * 设计信息-分段施工措施-分段钻井液性能设计Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-08-20
+ */
+public interface SjFdsgcsZjyFdxnbMapper 
+{
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 设计信息-分段施工措施-分段钻井液性能设计
+     */
+    public SjFdsgcsZjyFdxnb selectSjFdsgcsZjyFdxnbById(Long id);
+
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计列表
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 设计信息-分段施工措施-分段钻井液性能设计集合
+     */
+    public List<SjFdsgcsZjyFdxnb> selectSjFdsgcsZjyFdxnbList(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 新增设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    public int insertSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 修改设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    public int updateSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 删除设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjyFdxnbById(Long id);
+
+    /**
+     * 批量删除设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjyFdxnbByIds(Long[] ids);
+}

src/main/java/com/ruoyi/project/zjsgfa/mapper/SjSggyZjyFdsjMapper.java

@@ -62,6 +62,6 @@ public interface SjSggyZjyFdsjMapper
     int deleteSjSggyZjyFdsjByJh(String jh);
     int deleteSjSggyZjyFdsjByJh(String jh);
 
 
 
 
-    int insertSjSggyZjyFdsjBatch(String jh);
+    int insertSjSggyZjyFdsjBatch(List<SjSggyZjyFdsj> sjSggyZjyFdsjList);
 
 
 }
 }

src/main/java/com/ruoyi/project/zjsgfa/service/ISjFdsgcsZjyFdxnbService.java

+package com.ruoyi.project.zjsgfa.service;
+
+import java.util.List;
+import com.ruoyi.project.zjsgfa.domain.SjFdsgcsZjyFdxnb;
+
+/**
+ * 设计信息-分段施工措施-分段钻井液性能设计Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-08-20
+ */
+public interface ISjFdsgcsZjyFdxnbService 
+{
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 设计信息-分段施工措施-分段钻井液性能设计
+     */
+    public SjFdsgcsZjyFdxnb selectSjFdsgcsZjyFdxnbById(Long id);
+
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计列表
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 设计信息-分段施工措施-分段钻井液性能设计集合
+     */
+    public List<SjFdsgcsZjyFdxnb> selectSjFdsgcsZjyFdxnbList(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 新增设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    public int insertSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 修改设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    public int updateSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb);
+
+    /**
+     * 批量删除设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param ids 需要删除的设计信息-分段施工措施-分段钻井液性能设计主键集合
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjyFdxnbByIds(Long[] ids);
+
+    /**
+     * 删除设计信息-分段施工措施-分段钻井液性能设计信息
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 结果
+     */
+    public int deleteSjFdsgcsZjyFdxnbById(Long id);
+}

src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjFdsgcsZjyFdxnbServiceImpl.java

+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.SjFdsgcsZjyFdxnbMapper;
+import com.ruoyi.project.zjsgfa.domain.SjFdsgcsZjyFdxnb;
+import com.ruoyi.project.zjsgfa.service.ISjFdsgcsZjyFdxnbService;
+
+/**
+ * 设计信息-分段施工措施-分段钻井液性能设计Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-08-20
+ */
+@Service
+public class SjFdsgcsZjyFdxnbServiceImpl implements ISjFdsgcsZjyFdxnbService 
+{
+    @Autowired
+    private SjFdsgcsZjyFdxnbMapper sjFdsgcsZjyFdxnbMapper;
+
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 设计信息-分段施工措施-分段钻井液性能设计
+     */
+    @Override
+    public SjFdsgcsZjyFdxnb selectSjFdsgcsZjyFdxnbById(Long id)
+    {
+        return sjFdsgcsZjyFdxnbMapper.selectSjFdsgcsZjyFdxnbById(id);
+    }
+
+    /**
+     * 查询设计信息-分段施工措施-分段钻井液性能设计列表
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 设计信息-分段施工措施-分段钻井液性能设计
+     */
+    @Override
+    public List<SjFdsgcsZjyFdxnb> selectSjFdsgcsZjyFdxnbList(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        return sjFdsgcsZjyFdxnbMapper.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb);
+    }
+
+    /**
+     * 新增设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    @Override
+    public int insertSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        return sjFdsgcsZjyFdxnbMapper.insertSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb);
+    }
+
+    /**
+     * 修改设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param sjFdsgcsZjyFdxnb 设计信息-分段施工措施-分段钻井液性能设计
+     * @return 结果
+     */
+    @Override
+    public int updateSjFdsgcsZjyFdxnb(SjFdsgcsZjyFdxnb sjFdsgcsZjyFdxnb)
+    {
+        return sjFdsgcsZjyFdxnbMapper.updateSjFdsgcsZjyFdxnb(sjFdsgcsZjyFdxnb);
+    }
+
+    /**
+     * 批量删除设计信息-分段施工措施-分段钻井液性能设计
+     * 
+     * @param ids 需要删除的设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjFdsgcsZjyFdxnbByIds(Long[] ids)
+    {
+        return sjFdsgcsZjyFdxnbMapper.deleteSjFdsgcsZjyFdxnbByIds(ids);
+    }
+
+    /**
+     * 删除设计信息-分段施工措施-分段钻井液性能设计信息
+     * 
+     * @param id 设计信息-分段施工措施-分段钻井液性能设计主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjFdsgcsZjyFdxnbById(Long id)
+    {
+        return sjFdsgcsZjyFdxnbMapper.deleteSjFdsgcsZjyFdxnbById(id);
+    }
+}

src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjSggyGjsbxnyqServiceImpl.java

 package com.ruoyi.project.zjsgfa.service.impl;
 package com.ruoyi.project.zjsgfa.service.impl;
 
 
 import java.util.List;
 import java.util.List;
+
+import cn.hutool.core.codec.Base64;
+import com.ruoyi.common.utils.StringUtils;
 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.SjSggyGjsbxnyqMapper;
 import com.ruoyi.project.zjsgfa.mapper.SjSggyGjsbxnyqMapper;
@@ -52,6 +55,11 @@ public class SjSggyGjsbxnyqServiceImpl implements ISjSggyGjsbxnyqService
     @Override
     @Override
     public int insertSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
     public int insertSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
     {
     {
+        if(StringUtils.isNotEmpty(sjSggyGjsbxnyq.getSjyh())){
+            String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()));
+            sjSggyGjsbxnyq.setSjyh(s);
+
+        }
         return sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq(sjSggyGjsbxnyq);
         return sjSggyGjsbxnyqMapper.insertSjSggyGjsbxnyq(sjSggyGjsbxnyq);
     }
     }
 
 
@@ -64,6 +72,10 @@ public class SjSggyGjsbxnyqServiceImpl implements ISjSggyGjsbxnyqService
     @Override
     @Override
     public int updateSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
     public int updateSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
     {
     {
+        if(StringUtils.isNotEmpty(sjSggyGjsbxnyq.getSjyh())){
+            String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()));
+            sjSggyGjsbxnyq.setSjyh(s);
+        }
         return sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyq(sjSggyGjsbxnyq);
         return sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyq(sjSggyGjsbxnyq);
     }
     }
 
 

src/main/resources/mybatis/zjsgfa/SjFdsgcsZjyFdxnbMapper.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">
+<mapper namespace="com.ruoyi.project.zjsgfa.mapper.SjFdsgcsZjyFdxnbMapper">
+    
+    <resultMap type="SjFdsgcsZjyFdxnb" id="SjFdsgcsZjyFdxnbResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="kc"    column="kc"    />
+        <result property="jd"    column="jd"    />
+        <result property="md"    column="md"    />
+        <result property="msldnd"    column="msldnd"    />
+        <result property="apilsl"    column="apilsl"    />
+        <result property="apinb"    column="apinb"    />
+        <result property="jql"    column="jql"    />
+        <result property="ph"    column="ph"    />
+        <result property="hsl"    column="hsl"    />
+        <result property="zgh"    column="zgh"    />
+        <result property="mzxs"    column="mzxs"    />
+        <result property="dql"    column="dql"    />
+        <result property="sxnd"    column="sxnd"    />
+    </resultMap>
+
+    <sql id="selectSjFdsgcsZjyFdxnbVo">
+        select id, jh, kc, jd, md, msldnd, apilsl, apinb, jql, ph, hsl, zgh, mzxs, dql, sxnd from sj_fdsgcs_zjy_fdxnb
+    </sql>
+
+    <select id="selectSjFdsgcsZjyFdxnbList" parameterType="SjFdsgcsZjyFdxnb" resultMap="SjFdsgcsZjyFdxnbResult">
+        <include refid="selectSjFdsgcsZjyFdxnbVo"/>
+        <where>  
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="jd != null  and jd != ''"> and jd = #{jd}</if>
+            <if test="md != null  and md != ''"> and md = #{md}</if>
+            <if test="msldnd != null  and msldnd != ''"> and msldnd = #{msldnd}</if>
+            <if test="apilsl != null  and apilsl != ''"> and apilsl = #{apilsl}</if>
+            <if test="apinb != null  and apinb != ''"> and apinb = #{apinb}</if>
+            <if test="jql != null  and jql != ''"> and jql = #{jql}</if>
+            <if test="ph != null  and ph != ''"> and ph = #{ph}</if>
+            <if test="hsl != null  and hsl != ''"> and hsl = #{hsl}</if>
+            <if test="zgh != null  and zgh != ''"> and zgh = #{zgh}</if>
+            <if test="mzxs != null  and mzxs != ''"> and mzxs = #{mzxs}</if>
+            <if test="dql != null  and dql != ''"> and dql = #{dql}</if>
+            <if test="sxnd != null  and sxnd != ''"> and sxnd = #{sxnd}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjFdsgcsZjyFdxnbById" parameterType="Long" resultMap="SjFdsgcsZjyFdxnbResult">
+        <include refid="selectSjFdsgcsZjyFdxnbVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSjFdsgcsZjyFdxnb" parameterType="SjFdsgcsZjyFdxnb" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_fdsgcs_zjy_fdxnb
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="kc != null">kc,</if>
+            <if test="jd != null">jd,</if>
+            <if test="md != null">md,</if>
+            <if test="msldnd != null">msldnd,</if>
+            <if test="apilsl != null">apilsl,</if>
+            <if test="apinb != null">apinb,</if>
+            <if test="jql != null">jql,</if>
+            <if test="ph != null">ph,</if>
+            <if test="hsl != null">hsl,</if>
+            <if test="zgh != null">zgh,</if>
+            <if test="mzxs != null">mzxs,</if>
+            <if test="dql != null">dql,</if>
+            <if test="sxnd != null">sxnd,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jh != null">#{jh},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="jd != null">#{jd},</if>
+            <if test="md != null">#{md},</if>
+            <if test="msldnd != null">#{msldnd},</if>
+            <if test="apilsl != null">#{apilsl},</if>
+            <if test="apinb != null">#{apinb},</if>
+            <if test="jql != null">#{jql},</if>
+            <if test="ph != null">#{ph},</if>
+            <if test="hsl != null">#{hsl},</if>
+            <if test="zgh != null">#{zgh},</if>
+            <if test="mzxs != null">#{mzxs},</if>
+            <if test="dql != null">#{dql},</if>
+            <if test="sxnd != null">#{sxnd},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSjFdsgcsZjyFdxnb" parameterType="SjFdsgcsZjyFdxnb">
+        update sj_fdsgcs_zjy_fdxnb
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="jd != null">jd = #{jd},</if>
+            <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 id = #{id}
+    </update>
+
+    <delete id="deleteSjFdsgcsZjyFdxnbById" parameterType="Long">
+        delete from sj_fdsgcs_zjy_fdxnb where id = #{id}
+    </delete>
+
+    <delete id="deleteSjFdsgcsZjyFdxnbByIds" parameterType="String">
+        delete from sj_fdsgcs_zjy_fdxnb where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/zjsgfa/SjSggyGjsbxnyqMapper.xml

@@ -35,10 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xhgZrl"    column="xhg_zrl"    />
         <result property="xhgZrl"    column="xhg_zrl"    />
         <result property="cbgSl"    column="cbg_sl"    />
         <result property="cbgSl"    column="cbg_sl"    />
         <result property="cbgZrl"    column="cbg_zrl"    />
         <result property="cbgZrl"    column="cbg_zrl"    />
+        <result property="sjyh"    column="sjyh"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjSggyGjsbxnyqVo">
     <sql id="selectSjSggyGjsbxnyqVo">
-        select id, jh, zjxh, wddy, dkwdscgl, zjnl_zjlx, zjnl_zdcsll, zjnl_zgcsby, xzxt_ddzp, xzxt_dq, xhxt_b1lx, xhxt_b1xh, xhxt_b1zdgl, xhxt_b2lx, xhxt_b2xh, xhxt_b2zdgl, xhxt_b3lx, xhxt_b3xh, xhxt_b3zdgl, gksb_zdslx, gksb_lxj1lx, gksb_lxj1zdjgl, gksb_lxj2lx, gksb_lxj2zdjgl, gksb_lxj3lx, gksb_lxj3zdjgl, xhg_sl, xhg_zrl, cbg_sl, cbg_zrl from sj_sggy_gjsbxnyq
+        select id, jh,sjyh, zjxh, wddy, dkwdscgl, zjnl_zjlx, zjnl_zdcsll, zjnl_zgcsby, xzxt_ddzp, xzxt_dq, xhxt_b1lx, xhxt_b1xh, xhxt_b1zdgl, xhxt_b2lx, xhxt_b2xh, xhxt_b2zdgl, xhxt_b3lx, xhxt_b3xh, xhxt_b3zdgl, gksb_zdslx, gksb_lxj1lx, gksb_lxj1zdjgl, gksb_lxj2lx, gksb_lxj2zdjgl, gksb_lxj3lx, gksb_lxj3zdjgl, xhg_sl, xhg_zrl, cbg_sl, cbg_zrl from sj_sggy_gjsbxnyq
     </sql>
     </sql>
 
 
     <select id="selectSjSggyGjsbxnyqList" parameterType="SjSggyGjsbxnyq" resultMap="SjSggyGjsbxnyqResult">
     <select id="selectSjSggyGjsbxnyqList" parameterType="SjSggyGjsbxnyq" resultMap="SjSggyGjsbxnyqResult">
@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xhgZrl != null">xhg_zrl,</if>
             <if test="xhgZrl != null">xhg_zrl,</if>
             <if test="cbgSl != null">cbg_sl,</if>
             <if test="cbgSl != null">cbg_sl,</if>
             <if test="cbgZrl != null">cbg_zrl,</if>
             <if test="cbgZrl != null">cbg_zrl,</if>
+            <if test="sjyh != null">sjyh,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xhgZrl != null">#{xhgZrl},</if>
             <if test="xhgZrl != null">#{xhgZrl},</if>
             <if test="cbgSl != null">#{cbgSl},</if>
             <if test="cbgSl != null">#{cbgSl},</if>
             <if test="cbgZrl != null">#{cbgZrl},</if>
             <if test="cbgZrl != null">#{cbgZrl},</if>
+            <if test="sjyh != null">#{sjyh},</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -179,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xhgZrl != null">xhg_zrl = #{xhgZrl},</if>
             <if test="xhgZrl != null">xhg_zrl = #{xhgZrl},</if>
             <if test="cbgSl != null">cbg_sl = #{cbgSl},</if>
             <if test="cbgSl != null">cbg_sl = #{cbgSl},</if>
             <if test="cbgZrl != null">cbg_zrl = #{cbgZrl},</if>
             <if test="cbgZrl != null">cbg_zrl = #{cbgZrl},</if>
+            <if test="sjyh != null">sjyh = #{sjyh},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>