修改

src/main/java/com/ruoyi/project/zt/controller/DjdcController.java

@@ -2,12 +2,11 @@ package com.ruoyi.project.zt.controller;
 
 import cn.hutool.http.HttpRequest;
 import com.google.gson.*;
-import com.ruoyi.framework.util.JsonToMarkdown;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.zt.domian.CommonParam;
-import com.ruoyi.project.zt.domian.DjDcInfo;
-import com.ruoyi.project.zt.domian.Djjc;
-import com.ruoyi.project.zt.domian.Ljinfo;
+import com.ruoyi.project.zt.domain.CommonParam;
+import com.ruoyi.project.zt.domain.DjDcInfo;
+import com.ruoyi.project.zt.domain.Djjc;
+import com.ruoyi.project.zt.domain.Ljinfo;
 import com.ruoyi.project.zt.service.DjdcService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -53,7 +52,7 @@ public class DjdcController {
         Map<String,Object> map =new HashMap<>();
         switch (path) {
             case "getDjjcList":
-                //获取邻井基础信息
+                //获取钻头关键数据
                 map.put("jh","井号");
                 map.put("kc","开次");
                 map.put("jd","井段");
@@ -135,6 +134,40 @@ public class DjdcController {
                 map.put("zjjjss","直接损失");
                 map.put("js","井深");
                 return AjaxResult.success( djdcService.getJsqaList(param),map);
+            case "getDjZtfxList":
+                //获取钻头分析
+                map.put("kc","开次");
+                map.put("ztxh","钻头型号");
+                map.put("cc","外径");
+                map.put("ztsl","钻头数量（钻头使用频次）");
+                map.put("ytzl","一趟钻率");
+                map.put("etzl","二趟钻率");
+                map.put("stzl","三趟钻率");
+                map.put("sitzl","四趟钻率");
+                map.put("wtzl","五趟钻率");
+                map.put("jcZw","进尺中位数");
+                map.put("jcMax","进尺最大值");
+                map.put("jxzsZw","机械钻速中位数");
+                map.put("jxzsMax","机械钻速最大值");
+                map.put("qsjsZw","起出井深中位数");
+                return AjaxResult.success( djdcService.getDjZtfxList(param),map);
+            case "calZtzhdf":
+                //计算钻头综合得分
+//                map.put("kc","开次");
+//                map.put("ztxh","钻头型号");
+//                map.put("cc","外径");
+//                map.put("ztsl","钻头数量（钻头使用频次）");
+//                map.put("ytzl","一趟钻率");
+//                map.put("etzl","二趟钻率");
+//                map.put("stzl","三趟钻率");
+//                map.put("sitzl","四趟钻率");
+//                map.put("wtzl","五趟钻率");
+//                map.put("jcZw","进尺中位数");
+//                map.put("jcMax","进尺最大值");
+//                map.put("jxzsZw","机械钻速中位数");
+//                map.put("jxzsMax","机械钻速最大值");
+//                map.put("qsjsZw","起出井深中位数");
+                return AjaxResult.success( djdcService.calZtzhdf(param));
             default:
                 return AjaxResult.success();
         }

src/main/java/com/ruoyi/project/zt/controller/LjSzfxjgController.java

+package com.ruoyi.project.zt.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.zt.domain.LjSzfxjg;
+import com.ruoyi.project.zt.service.ILjSzfxjgService;
+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-06-29
+ */
+@RestController
+@RequestMapping("/system/ljSzfxjg")
+public class LjSzfxjgController extends BaseController
+{
+    @Autowired
+    private ILjSzfxjgService ljSzfxjgService;
+
+    /**
+     * 查询邻井-实钻分析结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LjSzfxjg ljSzfxjg)
+    {
+        startPage();
+        List<LjSzfxjg> list = ljSzfxjgService.selectLjSzfxjgList(ljSzfxjg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出邻井-实钻分析结果列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:export')")
+    @Log(title = "邻井-实钻分析结果", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LjSzfxjg ljSzfxjg)
+    {
+        List<LjSzfxjg> list = ljSzfxjgService.selectLjSzfxjgList(ljSzfxjg);
+        ExcelUtil<LjSzfxjg> util = new ExcelUtil<LjSzfxjg>(LjSzfxjg.class);
+        util.exportExcel(response, list, "邻井-实钻分析结果数据");
+    }
+
+    /**
+     * 获取邻井-实钻分析结果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ljSzfxjgService.selectLjSzfxjgById(id));
+    }
+
+    /**
+     * 新增邻井-实钻分析结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:add')")
+    @Log(title = "邻井-实钻分析结果", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LjSzfxjg ljSzfxjg)
+    {
+        return toAjax(ljSzfxjgService.insertLjSzfxjg(ljSzfxjg));
+    }
+
+    /**
+     * 修改邻井-实钻分析结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:edit')")
+    @Log(title = "邻井-实钻分析结果", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LjSzfxjg ljSzfxjg)
+    {
+        return toAjax(ljSzfxjgService.updateLjSzfxjg(ljSzfxjg));
+    }
+
+    /**
+     * 删除邻井-实钻分析结果
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljSzfxjg:remove')")
+    @Log(title = "邻井-实钻分析结果", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ljSzfxjgService.deleteLjSzfxjgByIds(ids));
+    }
+}

src/main/java/com/ruoyi/project/zt/controller/LjZtzhdfController.java

+package com.ruoyi.project.zt.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.zt.domain.LjZtzhdf;
+import com.ruoyi.project.zt.service.ILjZtzhdfService;
+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-06-29
+ */
+@RestController
+@RequestMapping("/system/ljZtzhdf")
+public class LjZtzhdfController extends BaseController
+{
+    @Autowired
+    private ILjZtzhdfService ljZtzhdfService;
+
+    /**
+     * 查询钻头综合得分列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LjZtzhdf ljZtzhdf)
+    {
+        startPage();
+        List<LjZtzhdf> list = ljZtzhdfService.selectLjZtzhdfList(ljZtzhdf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出钻头综合得分列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:export')")
+    @Log(title = "钻头综合得分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LjZtzhdf ljZtzhdf)
+    {
+        List<LjZtzhdf> list = ljZtzhdfService.selectLjZtzhdfList(ljZtzhdf);
+        ExcelUtil<LjZtzhdf> util = new ExcelUtil<LjZtzhdf>(LjZtzhdf.class);
+        util.exportExcel(response, list, "钻头综合得分数据");
+    }
+
+    /**
+     * 获取钻头综合得分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ljZtzhdfService.selectLjZtzhdfById(id));
+    }
+
+    /**
+     * 新增钻头综合得分
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:add')")
+    @Log(title = "钻头综合得分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LjZtzhdf ljZtzhdf)
+    {
+        return toAjax(ljZtzhdfService.insertLjZtzhdf(ljZtzhdf));
+    }
+
+    /**
+     * 修改钻头综合得分
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:edit')")
+    @Log(title = "钻头综合得分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LjZtzhdf ljZtzhdf)
+    {
+        return toAjax(ljZtzhdfService.updateLjZtzhdf(ljZtzhdf));
+    }
+
+    /**
+     * 删除钻头综合得分
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtzhdf:remove')")
+    @Log(title = "钻头综合得分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ljZtzhdfService.deleteLjZtzhdfByIds(ids));
+    }
+}

src/main/java/com/ruoyi/project/zt/domian/CommonParam.java → src/main/java/com/ruoyi/project/zt/domain/CommonParam.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
+import com.ruoyi.project.zt.domain.vo.SjInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -7,10 +8,18 @@ import java.util.List;
 @Data
 public class CommonParam {
 
+
+
     //接口路径
     private String path;
     //井号
     private String jh;
+    //区块名称
+    private String qk;
+
+    //设计井信息
+    private List<SjInfo> sj;
+
     //开始完井时间
     private String wjsjks;
     //结束完井时间
@@ -37,4 +46,7 @@ public class CommonParam {
     private String[] jhs;
 
 
+
+
+
 }

src/main/java/com/ruoyi/project/zt/domian/DjDcInfo.java → src/main/java/com/ruoyi/project/zt/domain/DjDcInfo.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/DjZjzhfx.java → src/main/java/com/ruoyi/project/zt/domain/DjZjzhfx.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/DjZqsjfx.java → src/main/java/com/ruoyi/project/zt/domain/DjZqsjfx.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domain/DjZtfx.java

+package com.ruoyi.project.zt.domain;
+
+import lombok.Data;
+
+@Data
+public class DjZtfx {
+
+
+
+    //开次
+    private String kc;
+    //钻头型号
+    private String ztxh;
+    //外径
+    private Double cc;
+    //钻头数量（钻头使用频次）
+    private Integer ztsl;
+    //一趟钻率
+    private Double ytzl;
+    private Double etzl;
+    private Double stzl;
+    private Double sitzl;
+    private Double wtzl;
+
+    //进尺中位数
+    private Double jcZw;
+    //进尺最大值
+    private Double jcMax;
+    //机械钻速中位数
+    private Double jxzsZw;
+    //机械钻速最大值
+    private Double jxzsMax;
+    //起出井深中位数
+    private Double qsjsZw;
+
+
+}

src/main/java/com/ruoyi/project/zt/domian/Djjc.java → src/main/java/com/ruoyi/project/zt/domain/Djjc.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 
@@ -22,6 +22,10 @@ public class Djjc {
     //井底纵坐标
     private Double jdzzb;
 
+
+    private Double ksjs;
+
+    private Double js;
     //开次
     private String kc;
 
@@ -40,6 +44,9 @@ public class Djjc {
     //钻头型号
     private String ztxh;
 
+    //钻头外径
+    private Double ztcc;
+
     //喷嘴
     private String pz;
 
@@ -50,7 +57,15 @@ public class Djjc {
     private String qzyy;
 
     //指标
-    private String zb;
+    private Double zb;
+
+    //钻井液密度
+    private Double zjymd;
+    //泵压
+    private Double lgby;
+    //排量
+    private Double pl;
+
 
 
 

src/main/java/com/ruoyi/project/zt/domian/Jsfa.java → src/main/java/com/ruoyi/project/zt/domain/Jsfa.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Jsha.java → src/main/java/com/ruoyi/project/zt/domain/Jsha.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Jsqa.java → src/main/java/com/ruoyi/project/zt/domain/Jsqa.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Jsta.java → src/main/java/com/ruoyi/project/zt/domain/Jsta.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Jswa.java → src/main/java/com/ruoyi/project/zt/domain/Jswa.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domain/LjSzfxjg.java

+package com.ruoyi.project.zt.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 邻井-实钻分析结果对象 lj_szfxjg
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+public class LjSzfxjg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 功能模块 */
+    @Excel(name = "功能模块")
+    private String gnmk;
+
+    /** 分析范围 */
+    @Excel(name = "分析范围")
+    private String fxfw;
+
+    /** 分析对象 */
+    @Excel(name = "分析对象")
+    private String fxdx;
+
+    /** 分析现象 */
+    @Excel(name = "分析现象")
+    private String fxxy;
+
+    /** 分析结论 */
+    @Excel(name = "分析结论")
+    private String fxjl;
+
+    /** 输出方向 */
+    @Excel(name = "输出方向")
+    private String scfx;
+
+    /** 优选依据 */
+    @Excel(name = "优选依据")
+    private String yxyj;
+
+    /** 最优建议 */
+    @Excel(name = "最优建议")
+    private String zyjy;
+
+    /** 其次建议 */
+    @Excel(name = "其次建议")
+    private String qcyj;
+
+    /** 推荐评分 */
+    @Excel(name = "推荐评分")
+    private Double tjpf;
+
+    /** 详细参数 */
+    @Excel(name = "详细参数")
+    private String xxcs;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setGnmk(String gnmk) 
+    {
+        this.gnmk = gnmk;
+    }
+
+    public String getGnmk() 
+    {
+        return gnmk;
+    }
+
+    public void setFxfw(String fxfw) 
+    {
+        this.fxfw = fxfw;
+    }
+
+    public String getFxfw() 
+    {
+        return fxfw;
+    }
+
+    public void setFxdx(String fxdx) 
+    {
+        this.fxdx = fxdx;
+    }
+
+    public String getFxdx() 
+    {
+        return fxdx;
+    }
+
+    public void setFxxy(String fxxy) 
+    {
+        this.fxxy = fxxy;
+    }
+
+    public String getFxxy() 
+    {
+        return fxxy;
+    }
+
+    public void setFxjl(String fxjl) 
+    {
+        this.fxjl = fxjl;
+    }
+
+    public String getFxjl() 
+    {
+        return fxjl;
+    }
+
+    public void setScfx(String scfx) 
+    {
+        this.scfx = scfx;
+    }
+
+    public String getScfx() 
+    {
+        return scfx;
+    }
+
+    public void setYxyj(String yxyj) 
+    {
+        this.yxyj = yxyj;
+    }
+
+    public String getYxyj() 
+    {
+        return yxyj;
+    }
+
+    public void setZyjy(String zyjy) 
+    {
+        this.zyjy = zyjy;
+    }
+
+    public String getZyjy() 
+    {
+        return zyjy;
+    }
+
+    public void setQcyj(String qcyj) 
+    {
+        this.qcyj = qcyj;
+    }
+
+    public String getQcyj() 
+    {
+        return qcyj;
+    }
+
+    public void setTjpf(Double tjpf)
+    {
+        this.tjpf = tjpf;
+    }
+
+    public Double getTjpf()
+    {
+        return tjpf;
+    }
+
+    public void setXxcs(String xxcs) 
+    {
+        this.xxcs = xxcs;
+    }
+
+    public String getXxcs() 
+    {
+        return xxcs;
+    }
+
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("gnmk", getGnmk())
+            .append("fxfw", getFxfw())
+            .append("fxdx", getFxdx())
+            .append("fxxy", getFxxy())
+            .append("fxjl", getFxjl())
+            .append("scfx", getScfx())
+            .append("yxyj", getYxyj())
+            .append("zyjy", getZyjy())
+            .append("qcyj", getQcyj())
+            .append("tjpf", getTjpf())
+            .append("xxcs", getXxcs())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/project/zt/domain/LjZtzhdf.java

+package com.ruoyi.project.zt.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 钻头综合得分对象 lj_ztzhdf
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+public class LjZtzhdf extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 开次 */
+    @Excel(name = "开次")
+    private String kc;
+
+    /** 钻头型号 */
+    @Excel(name = "钻头型号")
+    private String ztxh;
+
+    /** 钻头尺寸 */
+    @Excel(name = "钻头尺寸")
+    private Double cc;
+
+
+    /** 进尺得分 */
+    @Excel(name = "进尺得分")
+    private Double jcdf;
+
+    /** 机速得分 */
+    @Excel(name = "机速得分")
+    private Double jsdf;
+
+    /** 指标得分 */
+    @Excel(name = "指标得分")
+    private Double zbdf;
+
+    /** 数量得分 */
+    @Excel(name = "数量得分")
+    private Double sldf;
+
+    /** 综合得分 */
+    @Excel(name = "综合得分")
+    private Double zhdf;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setKc(String kc) 
+    {
+        this.kc = kc;
+    }
+
+    public String getKc() 
+    {
+        return kc;
+    }
+
+    public void setZtxh(String ztxh) 
+    {
+        this.ztxh = ztxh;
+    }
+
+    public String getZtxh() 
+    {
+        return ztxh;
+    }
+
+    public void setCc(Double cc) 
+    {
+        this.cc = cc;
+    }
+
+    public Double getCc() 
+    {
+        return cc;
+    }
+
+    public void setJcdf(Double jcdf) 
+    {
+        this.jcdf = jcdf;
+    }
+
+    public Double getJcdf() 
+    {
+        return jcdf;
+    }
+
+    public void setJsdf(Double jsdf) 
+    {
+        this.jsdf = jsdf;
+    }
+
+    public Double getJsdf() 
+    {
+        return jsdf;
+    }
+
+    public void setZbdf(Double zbdf) 
+    {
+        this.zbdf = zbdf;
+    }
+
+    public Double getZbdf() 
+    {
+        return zbdf;
+    }
+
+    public void setSldf(Double sldf) 
+    {
+        this.sldf = sldf;
+    }
+
+    public Double getSldf() 
+    {
+        return sldf;
+    }
+
+    public void setZhdf(Double zhdf) 
+    {
+        this.zhdf = zhdf;
+    }
+
+    public Double getZhdf() 
+    {
+        return zhdf;
+    }
+
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("kc", getKc())
+            .append("ztxh", getZtxh())
+            .append("cc", getCc())
+            .append("jcdf", getJcdf())
+            .append("jsdf", getJsdf())
+            .append("zbdf", getZbdf())
+            .append("sldf", getSldf())
+            .append("zhdf", getZhdf())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

src/main/java/com/ruoyi/project/zt/domian/Ljinfo.java → src/main/java/com/ruoyi/project/zt/domain/Ljinfo.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Ljjw.java → src/main/java/com/ruoyi/project/zt/domain/Ljjw.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domian/Qzyy.java → src/main/java/com/ruoyi/project/zt/domain/Qzyy.java

-package com.ruoyi.project.zt.domian;
+package com.ruoyi.project.zt.domain;
 
 import lombok.Data;
 

src/main/java/com/ruoyi/project/zt/domain/vo/SjInfo.java

+package com.ruoyi.project.zt.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class SjInfo {
+
+    //开次
+    private String kc;
+    //钻头尺寸
+    private Double ztcc;
+
+    //功能模块
+    private String gnmk;
+
+    //一趟钻率
+    private Double ytzl ;
+
+    private String ztxh;
+
+
+    //进尺
+    private Double jc;
+
+    //机速
+    private Double js;
+    //指标
+    private Double zb;
+    //数量
+    private Integer sl;
+
+    private Double jcScore;
+    private Double jsScore;
+    private Double slScore;
+    private Double zbScore;
+    private Double totalScore;
+
+}

src/main/java/com/ruoyi/project/zt/mapper/DjdcInfoMapper.java

 package com.ruoyi.project.zt.mapper;
 
-import com.ruoyi.project.zt.domian.*;
+import com.ruoyi.project.zt.domain.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -31,4 +31,7 @@ public interface DjdcInfoMapper {
     List<Ljjw> getLjjwList(CommonParam param);
 
 
+    List<DjZtfx> getDjZtfxList(CommonParam param);
+
+
 }

src/main/java/com/ruoyi/project/zt/mapper/JsqaMapper.java

 package com.ruoyi.project.zt.mapper;
 
-import com.ruoyi.project.zt.domian.CommonParam;
-import com.ruoyi.project.zt.domian.Jsqa;
+import com.ruoyi.project.zt.domain.CommonParam;
+import com.ruoyi.project.zt.domain.Jsqa;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/ruoyi/project/zt/mapper/JstaMapper.java

 package com.ruoyi.project.zt.mapper;
 
-import com.ruoyi.project.zt.domian.Jsta;
+import com.ruoyi.project.zt.domain.Jsta;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/ruoyi/project/zt/mapper/JswaMapper.java

 package com.ruoyi.project.zt.mapper;
 
-import com.ruoyi.project.zt.domian.Jswa;
+import com.ruoyi.project.zt.domain.Jswa;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -11,4 +11,7 @@ public interface JswaMapper {
 
     List<Jswa> getList(Jswa jswa);
 
+    Jswa selectMd(Jswa jswapa);
+
+
 }

src/main/java/com/ruoyi/project/zt/mapper/LjSzfxjgMapper.java

+package com.ruoyi.project.zt.mapper;
+
+import java.util.List;
+import com.ruoyi.project.zt.domain.LjSzfxjg;
+
+/**
+ * 邻井-实钻分析结果Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+public interface LjSzfxjgMapper 
+{
+    /**
+     * 查询邻井-实钻分析结果
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 邻井-实钻分析结果
+     */
+    public LjSzfxjg selectLjSzfxjgById(Long id);
+
+    /**
+     * 查询邻井-实钻分析结果列表
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 邻井-实钻分析结果集合
+     */
+    public List<LjSzfxjg> selectLjSzfxjgList(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 新增邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    public int insertLjSzfxjg(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 修改邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    public int updateLjSzfxjg(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 删除邻井-实钻分析结果
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 结果
+     */
+    public int deleteLjSzfxjgById(Long id);
+
+    /**
+     * 批量删除邻井-实钻分析结果
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLjSzfxjgByIds(Long[] ids);
+
+    int batchLjSzfxjg(List<LjSzfxjg> ljSzfxjgList);
+
+}

src/main/java/com/ruoyi/project/zt/mapper/LjZtzhdfMapper.java

+package com.ruoyi.project.zt.mapper;
+
+import java.util.List;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
+import com.ruoyi.project.zt.domain.LjZtzhdf;
+
+/**
+ * 钻头综合得分Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+@DataSource(value = DataSourceType.MASTER)
+public interface LjZtzhdfMapper 
+{
+    /**
+     * 查询钻头综合得分
+     * 
+     * @param id 钻头综合得分主键
+     * @return 钻头综合得分
+     */
+    public LjZtzhdf selectLjZtzhdfById(Long id);
+
+    /**
+     * 查询钻头综合得分列表
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 钻头综合得分集合
+     */
+    public List<LjZtzhdf> selectLjZtzhdfList(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 新增钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    public int insertLjZtzhdf(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 修改钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    public int updateLjZtzhdf(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 删除钻头综合得分
+     * 
+     * @param id 钻头综合得分主键
+     * @return 结果
+     */
+    public int deleteLjZtzhdfById(Long id);
+
+    /**
+     * 批量删除钻头综合得分
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLjZtzhdfByIds(Long[] ids);
+
+    int batchLjZtzhdf(List<LjZtzhdf> list);
+
+}

src/main/java/com/ruoyi/project/zt/service/DjdcService.java

 package com.ruoyi.project.zt.service;
 
 
-import com.ruoyi.project.zt.domian.*;
+import com.ruoyi.project.zt.domain.*;
+import com.ruoyi.project.zt.domain.vo.SjInfo;
 
-import java.text.ParseException;
 import java.util.List;
 
 public interface DjdcService {
@@ -28,4 +28,7 @@ public interface DjdcService {
 
     List<Jsqa> getJsqaList(CommonParam param);
 
+    List<DjZtfx> getDjZtfxList(CommonParam param);
+
+    List<LjZtzhdf> calZtzhdf(CommonParam param);
 }

src/main/java/com/ruoyi/project/zt/service/ILjSzfxjgService.java

+package com.ruoyi.project.zt.service;
+
+import java.util.List;
+import com.ruoyi.project.zt.domain.LjSzfxjg;
+
+/**
+ * 邻井-实钻分析结果Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+public interface ILjSzfxjgService 
+{
+    /**
+     * 查询邻井-实钻分析结果
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 邻井-实钻分析结果
+     */
+    public LjSzfxjg selectLjSzfxjgById(Long id);
+
+    /**
+     * 查询邻井-实钻分析结果列表
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 邻井-实钻分析结果集合
+     */
+    public List<LjSzfxjg> selectLjSzfxjgList(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 新增邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    public int insertLjSzfxjg(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 修改邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    public int updateLjSzfxjg(LjSzfxjg ljSzfxjg);
+
+    /**
+     * 批量删除邻井-实钻分析结果
+     * 
+     * @param ids 需要删除的邻井-实钻分析结果主键集合
+     * @return 结果
+     */
+    public int deleteLjSzfxjgByIds(Long[] ids);
+
+    /**
+     * 删除邻井-实钻分析结果信息
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 结果
+     */
+    public int deleteLjSzfxjgById(Long id);
+}

src/main/java/com/ruoyi/project/zt/service/ILjZtzhdfService.java

+package com.ruoyi.project.zt.service;
+
+import java.util.List;
+import com.ruoyi.project.zt.domain.LjZtzhdf;
+
+/**
+ * 钻头综合得分Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+public interface ILjZtzhdfService 
+{
+    /**
+     * 查询钻头综合得分
+     * 
+     * @param id 钻头综合得分主键
+     * @return 钻头综合得分
+     */
+    public LjZtzhdf selectLjZtzhdfById(Long id);
+
+    /**
+     * 查询钻头综合得分列表
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 钻头综合得分集合
+     */
+    public List<LjZtzhdf> selectLjZtzhdfList(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 新增钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    public int insertLjZtzhdf(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 修改钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    public int updateLjZtzhdf(LjZtzhdf ljZtzhdf);
+
+    /**
+     * 批量删除钻头综合得分
+     * 
+     * @param ids 需要删除的钻头综合得分主键集合
+     * @return 结果
+     */
+    public int deleteLjZtzhdfByIds(Long[] ids);
+
+    /**
+     * 删除钻头综合得分信息
+     * 
+     * @param id 钻头综合得分主键
+     * @return 结果
+     */
+    public int deleteLjZtzhdfById(Long id);
+}

src/main/java/com/ruoyi/project/zt/service/impl/LjSzfxjgServiceImpl.java

+package com.ruoyi.project.zt.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.zt.mapper.LjSzfxjgMapper;
+import com.ruoyi.project.zt.domain.LjSzfxjg;
+import com.ruoyi.project.zt.service.ILjSzfxjgService;
+
+/**
+ * 邻井-实钻分析结果Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+@Service
+public class LjSzfxjgServiceImpl implements ILjSzfxjgService 
+{
+    @Autowired
+    private LjSzfxjgMapper ljSzfxjgMapper;
+
+    /**
+     * 查询邻井-实钻分析结果
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 邻井-实钻分析结果
+     */
+    @Override
+    public LjSzfxjg selectLjSzfxjgById(Long id)
+    {
+        return ljSzfxjgMapper.selectLjSzfxjgById(id);
+    }
+
+    /**
+     * 查询邻井-实钻分析结果列表
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 邻井-实钻分析结果
+     */
+    @Override
+    public List<LjSzfxjg> selectLjSzfxjgList(LjSzfxjg ljSzfxjg)
+    {
+        return ljSzfxjgMapper.selectLjSzfxjgList(ljSzfxjg);
+    }
+
+    /**
+     * 新增邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    @Override
+    public int insertLjSzfxjg(LjSzfxjg ljSzfxjg)
+    {
+        return ljSzfxjgMapper.insertLjSzfxjg(ljSzfxjg);
+    }
+
+    /**
+     * 修改邻井-实钻分析结果
+     * 
+     * @param ljSzfxjg 邻井-实钻分析结果
+     * @return 结果
+     */
+    @Override
+    public int updateLjSzfxjg(LjSzfxjg ljSzfxjg)
+    {
+        ljSzfxjg.setUpdateTime(DateUtils.getNowDate());
+        return ljSzfxjgMapper.updateLjSzfxjg(ljSzfxjg);
+    }
+
+    /**
+     * 批量删除邻井-实钻分析结果
+     * 
+     * @param ids 需要删除的邻井-实钻分析结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjSzfxjgByIds(Long[] ids)
+    {
+        return ljSzfxjgMapper.deleteLjSzfxjgByIds(ids);
+    }
+
+    /**
+     * 删除邻井-实钻分析结果信息
+     * 
+     * @param id 邻井-实钻分析结果主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjSzfxjgById(Long id)
+    {
+        return ljSzfxjgMapper.deleteLjSzfxjgById(id);
+    }
+}

src/main/java/com/ruoyi/project/zt/service/impl/LjZtzhdfServiceImpl.java

+package com.ruoyi.project.zt.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.zt.mapper.LjZtzhdfMapper;
+import com.ruoyi.project.zt.domain.LjZtzhdf;
+import com.ruoyi.project.zt.service.ILjZtzhdfService;
+
+/**
+ * 钻头综合得分Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-06-29
+ */
+@Service
+public class LjZtzhdfServiceImpl implements ILjZtzhdfService 
+{
+    @Autowired
+    private LjZtzhdfMapper ljZtzhdfMapper;
+
+    /**
+     * 查询钻头综合得分
+     * 
+     * @param id 钻头综合得分主键
+     * @return 钻头综合得分
+     */
+    @Override
+    public LjZtzhdf selectLjZtzhdfById(Long id)
+    {
+        return ljZtzhdfMapper.selectLjZtzhdfById(id);
+    }
+
+    /**
+     * 查询钻头综合得分列表
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 钻头综合得分
+     */
+    @Override
+    public List<LjZtzhdf> selectLjZtzhdfList(LjZtzhdf ljZtzhdf)
+    {
+        return ljZtzhdfMapper.selectLjZtzhdfList(ljZtzhdf);
+    }
+
+    /**
+     * 新增钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    @Override
+    public int insertLjZtzhdf(LjZtzhdf ljZtzhdf)
+    {
+        return ljZtzhdfMapper.insertLjZtzhdf(ljZtzhdf);
+    }
+
+    /**
+     * 修改钻头综合得分
+     * 
+     * @param ljZtzhdf 钻头综合得分
+     * @return 结果
+     */
+    @Override
+    public int updateLjZtzhdf(LjZtzhdf ljZtzhdf)
+    {
+        ljZtzhdf.setUpdateTime(DateUtils.getNowDate());
+        return ljZtzhdfMapper.updateLjZtzhdf(ljZtzhdf);
+    }
+
+    /**
+     * 批量删除钻头综合得分
+     * 
+     * @param ids 需要删除的钻头综合得分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZtzhdfByIds(Long[] ids)
+    {
+        return ljZtzhdfMapper.deleteLjZtzhdfByIds(ids);
+    }
+
+    /**
+     * 删除钻头综合得分信息
+     * 
+     * @param id 钻头综合得分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZtzhdfById(Long id)
+    {
+        return ljZtzhdfMapper.deleteLjZtzhdfById(id);
+    }
+}

src/main/resources/mybatis/mybatis-config.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 		<!-- 指定 MyBatis 所用日志的具体实现 -->
         <setting name="logImpl"                  value="SLF4J"  />
         <!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+		 <setting name="mapUnderscoreToCamelCase" value="true"/>
 	</settings>
 	
 </configuration>

src/main/resources/mybatis/zt/JsqaMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="getJsqaList" resultType="com.ruoyi.project.zt.domian.Jsqa">
+    <select id="getJsqaList" resultType="com.ruoyi.project.zt.domain.Jsqa">
         select *
         from JSQA a
         where  1=1

src/main/resources/mybatis/zt/JstaMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.project.zt.mapper.JstaMapper">
 
 
-    <select id="getList" resultType="com.ruoyi.project.zt.domian.Jsta">
+    <select id="getList" resultType="com.ruoyi.project.zt.domain.Jsta">
 
         select *
         from JSTA a

src/main/resources/mybatis/zt/JswaMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.zt.mapper.JswaMapper">
 
-	<select id="getList" resultType="com.ruoyi.project.zt.domian.Jswa">
+	<select id="getList" resultType="com.ruoyi.project.zt.domain.Jswa">
 		select jh, rq, nvl(js,0) js, nvl(rjc,0) rjc,nvl(sg,0) sg, nvl(xl,0)xl,nvl(zrtg,0) zrtg, nvl(zztg,0)zztg,nvl(fzqk,0) fzqk,brzygz  from JSWA where  1=1
 
 		<if test="jh!=null and jh!=''">
@@ -24,5 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		order by rq
 	</select>
+	<select id="selectMd" resultType="com.ruoyi.project.zt.domain.Jswa">
+		select * from (
+						  select * from JSwA where RJC>0 and jh=#{jh} and js=#{js} ) where ROWNUM=1
+	</select>
 
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/zt/LjSzfxjgMapper.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.zt.mapper.LjSzfxjgMapper">
+    
+    <resultMap type="LjSzfxjg" id="LjSzfxjgResult">
+        <result property="id"    column="id"    />
+        <result property="gnmk"    column="gnmk"    />
+        <result property="fxfw"    column="fxfw"    />
+        <result property="fxdx"    column="fxdx"    />
+        <result property="fxxy"    column="fxxy"    />
+        <result property="fxjl"    column="fxjl"    />
+        <result property="scfx"    column="scfx"    />
+        <result property="yxyj"    column="yxyj"    />
+        <result property="zyjy"    column="zyjy"    />
+        <result property="qcyj"    column="qcyj"    />
+        <result property="tjpf"    column="tjpf"    />
+        <result property="xxcs"    column="xxcs"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLjSzfxjgVo">
+        select id, gnmk, fxfw, fxdx, fxxy, fxjl, scfx, yxyj, zyjy, qcyj, tjpf, xxcs, created_by, created_time, update_by, update_time from lj_szfxjg
+    </sql>
+
+    <select id="selectLjSzfxjgList" parameterType="LjSzfxjg" resultMap="LjSzfxjgResult">
+        <include refid="selectLjSzfxjgVo"/>
+        <where>  
+            <if test="gnmk != null  and gnmk != ''"> and gnmk = #{gnmk}</if>
+            <if test="fxfw != null  and fxfw != ''"> and fxfw = #{fxfw}</if>
+            <if test="fxdx != null  and fxdx != ''"> and fxdx = #{fxdx}</if>
+            <if test="fxxy != null  and fxxy != ''"> and fxxy = #{fxxy}</if>
+            <if test="fxjl != null  and fxjl != ''"> and fxjl = #{fxjl}</if>
+            <if test="scfx != null  and scfx != ''"> and scfx = #{scfx}</if>
+            <if test="yxyj != null  and yxyj != ''"> and yxyj = #{yxyj}</if>
+            <if test="zyjy != null  and zyjy != ''"> and zyjy = #{zyjy}</if>
+            <if test="qcyj != null  and qcyj != ''"> and qcyj = #{qcyj}</if>
+            <if test="tjpf != null "> and tjpf = #{tjpf}</if>
+            <if test="xxcs != null  and xxcs != ''"> and xxcs = #{xxcs}</if>
+            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="createdTime != null "> and created_time = #{createdTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectLjSzfxjgById" parameterType="Long" resultMap="LjSzfxjgResult">
+        <include refid="selectLjSzfxjgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLjSzfxjg" parameterType="LjSzfxjg" useGeneratedKeys="true" keyProperty="id">
+        insert into lj_szfxjg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="gnmk != null">gnmk,</if>
+            <if test="fxfw != null">fxfw,</if>
+            <if test="fxdx != null">fxdx,</if>
+            <if test="fxxy != null">fxxy,</if>
+            <if test="fxjl != null">fxjl,</if>
+            <if test="scfx != null">scfx,</if>
+            <if test="yxyj != null">yxyj,</if>
+            <if test="zyjy != null">zyjy,</if>
+            <if test="qcyj != null">qcyj,</if>
+            <if test="tjpf != null">tjpf,</if>
+            <if test="xxcs != null">xxcs,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="gnmk != null">#{gnmk},</if>
+            <if test="fxfw != null">#{fxfw},</if>
+            <if test="fxdx != null">#{fxdx},</if>
+            <if test="fxxy != null">#{fxxy},</if>
+            <if test="fxjl != null">#{fxjl},</if>
+            <if test="scfx != null">#{scfx},</if>
+            <if test="yxyj != null">#{yxyj},</if>
+            <if test="zyjy != null">#{zyjy},</if>
+            <if test="qcyj != null">#{qcyj},</if>
+            <if test="tjpf != null">#{tjpf},</if>
+            <if test="xxcs != null">#{xxcs},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+
+    <insert id="batchLjSzfxjg">
+        insert into lj_szfxjg(  gnmk, fxfw, fxdx, fxxy, fxjl, scfx, yxyj, zyjy, qcyj, tjpf, xxcs, created_by, created_time, update_by, update_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (  #{item.gnmk}, #{item.fxfw}, #{item.fxdx}, #{item.fxxy}, #{item.fxjl}, #{item.scfx}, #{item.yxyj}, #{item.zyjy}, #{item.qcyj}, #{item.tjpf}, #{item.xxcs}, #{item.createdBy}, #{item.createdTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <update id="updateLjSzfxjg" parameterType="LjSzfxjg">
+        update lj_szfxjg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="gnmk != null">gnmk = #{gnmk},</if>
+            <if test="fxfw != null">fxfw = #{fxfw},</if>
+            <if test="fxdx != null">fxdx = #{fxdx},</if>
+            <if test="fxxy != null">fxxy = #{fxxy},</if>
+            <if test="fxjl != null">fxjl = #{fxjl},</if>
+            <if test="scfx != null">scfx = #{scfx},</if>
+            <if test="yxyj != null">yxyj = #{yxyj},</if>
+            <if test="zyjy != null">zyjy = #{zyjy},</if>
+            <if test="qcyj != null">qcyj = #{qcyj},</if>
+            <if test="tjpf != null">tjpf = #{tjpf},</if>
+            <if test="xxcs != null">xxcs = #{xxcs},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLjSzfxjgById" parameterType="Long">
+        delete from lj_szfxjg where id = #{id}
+    </delete>
+
+    <delete id="deleteLjSzfxjgByIds" parameterType="String">
+        delete from lj_szfxjg 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/zt/LjZtzhdfMapper.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.zt.mapper.LjZtzhdfMapper">
+    
+    <resultMap type="LjZtzhdf" id="LjZtzhdfResult">
+        <result property="id"    column="id"    />
+        <result property="kc"    column="kc"    />
+        <result property="ztxh"    column="ztxh"    />
+        <result property="cc"    column="cc"    />
+        <result property="jcdf"    column="jcdf"    />
+        <result property="jsdf"    column="jsdf"    />
+        <result property="zbdf"    column="zbdf"    />
+        <result property="sldf"    column="sldf"    />
+        <result property="zhdf"    column="zhdf"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectLjZtzhdfVo">
+        select id, kc, ztxh, cc, jcdf, jsdf, zbdf, sldf, zhdf, created_by, created_time, update_by, update_time from lj_ztzhdf
+    </sql>
+
+    <select id="selectLjZtzhdfList" parameterType="LjZtzhdf" resultMap="LjZtzhdfResult">
+        <include refid="selectLjZtzhdfVo"/>
+        <where>  
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="ztxh != null  and ztxh != ''"> and ztxh = #{ztxh}</if>
+            <if test="cc != null "> and cc = #{cc}</if>
+            <if test="jcdf != null "> and jcdf = #{jcdf}</if>
+            <if test="jsdf != null "> and jsdf = #{jsdf}</if>
+            <if test="zbdf != null "> and zbdf = #{zbdf}</if>
+            <if test="sldf != null "> and sldf = #{sldf}</if>
+            <if test="zhdf != null "> and zhdf = #{zhdf}</if>
+            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="createdTime != null "> and created_time = #{createdTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectLjZtzhdfById" parameterType="Long" resultMap="LjZtzhdfResult">
+        <include refid="selectLjZtzhdfVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLjZtzhdf" parameterType="LjZtzhdf" useGeneratedKeys="true" keyProperty="id">
+        insert into lj_ztzhdf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="kc != null">kc,</if>
+            <if test="ztxh != null">ztxh,</if>
+            <if test="cc != null">cc,</if>
+            <if test="jcdf != null">jcdf,</if>
+            <if test="jsdf != null">jsdf,</if>
+            <if test="zbdf != null">zbdf,</if>
+            <if test="sldf != null">sldf,</if>
+            <if test="zhdf != null">zhdf,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="kc != null">#{kc},</if>
+            <if test="ztxh != null">#{ztxh},</if>
+            <if test="cc != null">#{cc},</if>
+            <if test="jcdf != null">#{jcdf},</if>
+            <if test="jsdf != null">#{jsdf},</if>
+            <if test="zbdf != null">#{zbdf},</if>
+            <if test="sldf != null">#{sldf},</if>
+            <if test="zhdf != null">#{zhdf},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLjZtzhdf" parameterType="LjZtzhdf">
+        update lj_ztzhdf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="ztxh != null">ztxh = #{ztxh},</if>
+            <if test="cc != null">cc = #{cc},</if>
+            <if test="jcdf != null">jcdf = #{jcdf},</if>
+            <if test="jsdf != null">jsdf = #{jsdf},</if>
+            <if test="zbdf != null">zbdf = #{zbdf},</if>
+            <if test="sldf != null">sldf = #{sldf},</if>
+            <if test="zhdf != null">zhdf = #{zhdf},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLjZtzhdfById" parameterType="Long">
+        delete from lj_ztzhdf where id = #{id}
+    </delete>
+
+    <delete id="deleteLjZtzhdfByIds" parameterType="String">
+        delete from lj_ztzhdf where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+    <insert id="batchLjZtzhdf">
+        insert into lj_ztzhdf( kc, ztxh, cc, jcdf, jsdf, zbdf, sldf, zhdf) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (  #{item.kc}, #{item.ztxh}, #{item.cc}, #{item.jcdf}, #{item.jsdf}, #{item.zbdf}, #{item.sldf}, #{item.zhdf})
+        </foreach>
+    </insert>
+</mapper>
\ No newline at end of file