修改

src/main/java/com/ruoyi/framework/task/RyTask.java

 package com.ruoyi.framework.task;
 
+import com.ruoyi.project.zt.domain.CommonParam;
+import com.ruoyi.project.zt.service.DjdcService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.annotation.AccessType;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
 
@@ -11,6 +15,11 @@ import com.ruoyi.common.utils.StringUtils;
 @Component("ryTask")
 public class RyTask
 {
+
+
+    @Autowired
+    DjdcService djdcService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -25,4 +34,13 @@ public class RyTask
     {
         System.out.println("执行无参方法");
     }
+
+
+    public void dyAiModelJxZjzh(){
+        System.out.println("执行方法dyAiModelJxZjzh");
+        djdcService.dyAiModelJxZjzh(new CommonParam());
+    }
+
+
+
 }

src/main/java/com/ruoyi/project/zt/controller/LjZjzhfxController.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.LjZjzhfx;
+import com.ruoyi.project.zt.service.ILjZjzhfxService;
+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-07-02
+ */
+@RestController
+@RequestMapping("/system/ljZjzhfx")
+public class LjZjzhfxController extends BaseController
+{
+    @Autowired
+    private ILjZjzhfxService ljZjzhfxService;
+
+    /**
+     * 查询邻井-钻具组合分析列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LjZjzhfx ljZjzhfx)
+    {
+        startPage();
+        List<LjZjzhfx> list = ljZjzhfxService.selectLjZjzhfxList(ljZjzhfx);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出邻井-钻具组合分析列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:export')")
+    @Log(title = "邻井-钻具组合分析", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LjZjzhfx ljZjzhfx)
+    {
+        List<LjZjzhfx> list = ljZjzhfxService.selectLjZjzhfxList(ljZjzhfx);
+        ExcelUtil<LjZjzhfx> util = new ExcelUtil<LjZjzhfx>(LjZjzhfx.class);
+        util.exportExcel(response, list, "邻井-钻具组合分析数据");
+    }
+
+    /**
+     * 获取邻井-钻具组合分析详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ljZjzhfxService.selectLjZjzhfxById(id));
+    }
+
+    /**
+     * 新增邻井-钻具组合分析
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:add')")
+    @Log(title = "邻井-钻具组合分析", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LjZjzhfx ljZjzhfx)
+    {
+        return toAjax(ljZjzhfxService.insertLjZjzhfx(ljZjzhfx));
+    }
+
+    /**
+     * 修改邻井-钻具组合分析
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:edit')")
+    @Log(title = "邻井-钻具组合分析", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LjZjzhfx ljZjzhfx)
+    {
+        return toAjax(ljZjzhfxService.updateLjZjzhfx(ljZjzhfx));
+    }
+
+    /**
+     * 删除邻井-钻具组合分析
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZjzhfx:remove')")
+    @Log(title = "邻井-钻具组合分析", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ljZjzhfxService.deleteLjZjzhfxByIds(ids));
+    }
+}

src/main/java/com/ruoyi/project/zt/controller/LjZtdfzhController.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.LjZtdfzh;
+import com.ruoyi.project.zt.service.ILjZtdfzhService;
+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-30
+ */
+@RestController
+@RequestMapping("/system/ljZtdfzh")
+public class LjZtdfzhController extends BaseController
+{
+    @Autowired
+    private ILjZtdfzhService ljZtdfzhService;
+
+    /**
+     * 查询邻井-钻头得分综合列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LjZtdfzh ljZtdfzh)
+    {
+        startPage();
+        List<LjZtdfzh> list = ljZtdfzhService.selectLjZtdfzhList(ljZtdfzh);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出邻井-钻头得分综合列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:export')")
+    @Log(title = "邻井-钻头得分综合", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LjZtdfzh ljZtdfzh)
+    {
+        List<LjZtdfzh> list = ljZtdfzhService.selectLjZtdfzhList(ljZtdfzh);
+        ExcelUtil<LjZtdfzh> util = new ExcelUtil<LjZtdfzh>(LjZtdfzh.class);
+        util.exportExcel(response, list, "邻井-钻头得分综合数据");
+    }
+
+    /**
+     * 获取邻井-钻头得分综合详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ljZtdfzhService.selectLjZtdfzhById(id));
+    }
+
+    /**
+     * 新增邻井-钻头得分综合
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:add')")
+    @Log(title = "邻井-钻头得分综合", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LjZtdfzh ljZtdfzh)
+    {
+        return toAjax(ljZtdfzhService.insertLjZtdfzh(ljZtdfzh));
+    }
+
+    /**
+     * 修改邻井-钻头得分综合
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:edit')")
+    @Log(title = "邻井-钻头得分综合", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LjZtdfzh ljZtdfzh)
+    {
+        return toAjax(ljZtdfzhService.updateLjZtdfzh(ljZtdfzh));
+    }
+
+    /**
+     * 删除邻井-钻头得分综合
+     */
+    @PreAuthorize("@ss.hasPermi('system:ljZtdfzh:remove')")
+    @Log(title = "邻井-钻头得分综合", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ljZtdfzhService.deleteLjZtdfzhByIds(ids));
+    }
+}

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

@@ -10,6 +10,11 @@ public class DjZqsjfx {
 
     //井号
     private String jh;
+    //开钻时间
+    private String kssj;
+    //结束时间
+    private String jssj;
+    private String zwsj;
     /**
      * 井筒名
      */

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

@@ -23,6 +23,7 @@ public class Djjc {
     private Double jdzzb;
 
 
+    //开始井深
     private Double ksjs;
 
     private Double js;

src/main/java/com/ruoyi/project/zt/domain/LjZjzhfx.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_zjzhfx
+ * 
+ * @author ruoyi
+ * @date 2025-07-02
+ */
+public class LjZjzhfx 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 zjzhmx;
+
+    /** 特殊钻具 */
+    @Excel(name = "特殊钻具")
+    private String tsgj;
+
+    /** 钻具组合 */
+    @Excel(name = "钻具组合")
+    private String zjzh;
+
+    /** 创建人 */
+    @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 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 setZjzhmx(String zjzhmx) 
+    {
+        this.zjzhmx = zjzhmx;
+    }
+
+    public String getZjzhmx() 
+    {
+        return zjzhmx;
+    }
+
+    public void setTsgj(String tsgj) 
+    {
+        this.tsgj = tsgj;
+    }
+
+    public String getTsgj() 
+    {
+        return tsgj;
+    }
+
+    public void setZjzh(String zjzh) 
+    {
+        this.zjzh = zjzh;
+    }
+
+    public String getZjzh() 
+    {
+        return zjzh;
+    }
+
+    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("jh", getJh())
+            .append("kc", getKc())
+            .append("zjzhmx", getZjzhmx())
+            .append("tsgj", getTsgj())
+            .append("zjzh", getZjzh())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

+package com.ruoyi.project.zt.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;
+
+/**
+ * 邻井-钻头得分综合对象 lj_ztdfzh
+ * 
+ * @author ruoyi
+ * @date 2025-06-30
+ */
+public class LjZtdfzh 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 zhdf;
+
+    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 setZhdf(Double zhdf) 
+    {
+        this.zhdf = zhdf;
+    }
+
+    public Double getZhdf() 
+    {
+        return zhdf;
+    }
+
+    @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("zhdf", getZhdf())
+            .toString();
+    }
+}

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

+package com.ruoyi.project.zt.domain;
+
+import java.time.LocalTime;
+
+public class TimePointPair {
+    private LocalTime previousTime;
+    private LocalTime drillingTime;
+
+    public TimePointPair(LocalTime previousTime, LocalTime drillingTime) {
+        this.previousTime = previousTime;
+        this.drillingTime = drillingTime;
+    }
+
+    public LocalTime getPreviousTime() {
+        return previousTime;
+    }
+
+    public LocalTime getDrillingTime() {
+        return drillingTime;
+    }
+
+    // 判断两个时间点之间是否跨天
+    public boolean isCrossDay() {
+        return drillingTime.isBefore(previousTime);
+    }
+
+    @Override
+    public String toString() {
+        return previousTime + " - " + drillingTime;
+    }
+
+}

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

@@ -14,4 +14,7 @@ public interface JswaMapper {
     Jswa selectMd(Jswa jswapa);
 
 
+    Jswa selectZwsj(Jswa jswap);
+
+
 }

src/main/java/com/ruoyi/project/zt/mapper/LjSzfxjgMapper.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.CommonParam;
 import com.ruoyi.project.zt.domain.LjSzfxjg;
 
 /**
@@ -9,6 +13,7 @@ import com.ruoyi.project.zt.domain.LjSzfxjg;
  * @author ruoyi
  * @date 2025-06-29
  */
+@DataSource(value = DataSourceType.MASTER)
 public interface LjSzfxjgMapper 
 {
     /**
@@ -61,4 +66,6 @@ public interface LjSzfxjgMapper
 
     int batchLjSzfxjg(List<LjSzfxjg> ljSzfxjgList);
 
+    List<LjSzfxjg> getszfxjgList(CommonParam param);
+
 }

src/main/java/com/ruoyi/project/zt/mapper/LjZjzhfxMapper.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.LjZjzhfx;
+
+/**
+ * 邻井-钻具组合分析Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-02
+ */
+@DataSource(value = DataSourceType.SLAVE)
+public interface LjZjzhfxMapper 
+{
+    /**
+     * 查询邻井-钻具组合分析
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 邻井-钻具组合分析
+     */
+    public LjZjzhfx selectLjZjzhfxById(Long id);
+
+    /**
+     * 查询邻井-钻具组合分析列表
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 邻井-钻具组合分析集合
+     */
+    public List<LjZjzhfx> selectLjZjzhfxList(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 新增邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    public int insertLjZjzhfx(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 修改邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    public int updateLjZjzhfx(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 删除邻井-钻具组合分析
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 结果
+     */
+    public int deleteLjZjzhfxById(Long id);
+
+    /**
+     * 批量删除邻井-钻具组合分析
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLjZjzhfxByIds(Long[] ids);
+
+    int batchLjZjzhfx(List<LjZjzhfx> zjzhfxList);
+
+
+}

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

+package com.ruoyi.project.zt.mapper;
+
+import java.util.List;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
+import com.ruoyi.project.zt.domain.CommonParam;
+import com.ruoyi.project.zt.domain.LjZtdfzh;
+
+/**
+ * 邻井-钻头得分综合Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-30
+ */
+@DataSource(value = DataSourceType.MASTER)
+public interface LjZtdfzhMapper 
+{
+    /**
+     * 查询邻井-钻头得分综合
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 邻井-钻头得分综合
+     */
+    public LjZtdfzh selectLjZtdfzhById(Long id);
+
+    /**
+     * 查询邻井-钻头得分综合列表
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 邻井-钻头得分综合集合
+     */
+    public List<LjZtdfzh> selectLjZtdfzhList(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 新增邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    public int insertLjZtdfzh(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 修改邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    public int updateLjZtdfzh(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 删除邻井-钻头得分综合
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 结果
+     */
+    public int deleteLjZtdfzhById(Long id);
+
+    /**
+     * 批量删除邻井-钻头得分综合
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLjZtdfzhByIds(Long[] ids);
+
+    List<LjZtdfzh> getZtzhzzdfList(CommonParam param);
+
+}

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

@@ -4,6 +4,7 @@ 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.CommonParam;
 import com.ruoyi.project.zt.domain.LjZtzhdf;
 
 /**
@@ -65,4 +66,6 @@ public interface LjZtzhdfMapper
 
     int batchLjZtzhdf(List<LjZtzhdf> list);
 
+    List<LjZtzhdf> selectLjZtzhdfListByCom(CommonParam param);
+
 }

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

@@ -5,6 +5,7 @@ import com.ruoyi.project.zt.domain.*;
 import com.ruoyi.project.zt.domain.vo.SjInfo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface DjdcService {
     List<DjDcInfo> getList(DjDcInfo info);
@@ -30,5 +31,15 @@ public interface DjdcService {
 
     List<DjZtfx> getDjZtfxList(CommonParam param);
 
-    List<LjZtzhdf> calZtzhdf(CommonParam param);
+    Map<String,Object> calZtzhdf(CommonParam param);
+
+    List<LjZtzhdf> getzhzhdfList(CommonParam param);
+
+    List<LjSzfxjg> getszfxjgList(CommonParam param);
+
+    List<LjZtdfzh> getZtzhzzdfList(CommonParam param);
+
+
+    int dyAiModelJxZjzh(CommonParam param);
+
 }

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

+package com.ruoyi.project.zt.service;
+
+import java.util.List;
+import com.ruoyi.project.zt.domain.LjZjzhfx;
+
+/**
+ * 邻井-钻具组合分析Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-07-02
+ */
+public interface ILjZjzhfxService 
+{
+    /**
+     * 查询邻井-钻具组合分析
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 邻井-钻具组合分析
+     */
+    public LjZjzhfx selectLjZjzhfxById(Long id);
+
+    /**
+     * 查询邻井-钻具组合分析列表
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 邻井-钻具组合分析集合
+     */
+    public List<LjZjzhfx> selectLjZjzhfxList(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 新增邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    public int insertLjZjzhfx(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 修改邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    public int updateLjZjzhfx(LjZjzhfx ljZjzhfx);
+
+    /**
+     * 批量删除邻井-钻具组合分析
+     * 
+     * @param ids 需要删除的邻井-钻具组合分析主键集合
+     * @return 结果
+     */
+    public int deleteLjZjzhfxByIds(Long[] ids);
+
+    /**
+     * 删除邻井-钻具组合分析信息
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 结果
+     */
+    public int deleteLjZjzhfxById(Long id);
+}

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

+package com.ruoyi.project.zt.service;
+
+import java.util.List;
+import com.ruoyi.project.zt.domain.LjZtdfzh;
+
+/**
+ * 邻井-钻头得分综合Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-06-30
+ */
+public interface ILjZtdfzhService 
+{
+    /**
+     * 查询邻井-钻头得分综合
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 邻井-钻头得分综合
+     */
+    public LjZtdfzh selectLjZtdfzhById(Long id);
+
+    /**
+     * 查询邻井-钻头得分综合列表
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 邻井-钻头得分综合集合
+     */
+    public List<LjZtdfzh> selectLjZtdfzhList(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 新增邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    public int insertLjZtdfzh(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 修改邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    public int updateLjZtdfzh(LjZtdfzh ljZtdfzh);
+
+    /**
+     * 批量删除邻井-钻头得分综合
+     * 
+     * @param ids 需要删除的邻井-钻头得分综合主键集合
+     * @return 结果
+     */
+    public int deleteLjZtdfzhByIds(Long[] ids);
+
+    /**
+     * 删除邻井-钻头得分综合信息
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 结果
+     */
+    public int deleteLjZtdfzhById(Long id);
+}

src/main/java/com/ruoyi/project/zt/service/impl/LjZjzhfxServiceImpl.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.LjZjzhfxMapper;
+import com.ruoyi.project.zt.domain.LjZjzhfx;
+import com.ruoyi.project.zt.service.ILjZjzhfxService;
+
+/**
+ * 邻井-钻具组合分析Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-07-02
+ */
+@Service
+public class LjZjzhfxServiceImpl implements ILjZjzhfxService 
+{
+    @Autowired
+    private LjZjzhfxMapper ljZjzhfxMapper;
+
+    /**
+     * 查询邻井-钻具组合分析
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 邻井-钻具组合分析
+     */
+    @Override
+    public LjZjzhfx selectLjZjzhfxById(Long id)
+    {
+        return ljZjzhfxMapper.selectLjZjzhfxById(id);
+    }
+
+    /**
+     * 查询邻井-钻具组合分析列表
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 邻井-钻具组合分析
+     */
+    @Override
+    public List<LjZjzhfx> selectLjZjzhfxList(LjZjzhfx ljZjzhfx)
+    {
+        return ljZjzhfxMapper.selectLjZjzhfxList(ljZjzhfx);
+    }
+
+    /**
+     * 新增邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    @Override
+    public int insertLjZjzhfx(LjZjzhfx ljZjzhfx)
+    {
+        return ljZjzhfxMapper.insertLjZjzhfx(ljZjzhfx);
+    }
+
+    /**
+     * 修改邻井-钻具组合分析
+     * 
+     * @param ljZjzhfx 邻井-钻具组合分析
+     * @return 结果
+     */
+    @Override
+    public int updateLjZjzhfx(LjZjzhfx ljZjzhfx)
+    {
+        ljZjzhfx.setUpdateTime(DateUtils.getNowDate());
+        return ljZjzhfxMapper.updateLjZjzhfx(ljZjzhfx);
+    }
+
+    /**
+     * 批量删除邻井-钻具组合分析
+     * 
+     * @param ids 需要删除的邻井-钻具组合分析主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZjzhfxByIds(Long[] ids)
+    {
+        return ljZjzhfxMapper.deleteLjZjzhfxByIds(ids);
+    }
+
+    /**
+     * 删除邻井-钻具组合分析信息
+     * 
+     * @param id 邻井-钻具组合分析主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZjzhfxById(Long id)
+    {
+        return ljZjzhfxMapper.deleteLjZjzhfxById(id);
+    }
+}

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

+package com.ruoyi.project.zt.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.zt.mapper.LjZtdfzhMapper;
+import com.ruoyi.project.zt.domain.LjZtdfzh;
+import com.ruoyi.project.zt.service.ILjZtdfzhService;
+
+/**
+ * 邻井-钻头得分综合Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-06-30
+ */
+@Service
+public class LjZtdfzhServiceImpl implements ILjZtdfzhService 
+{
+    @Autowired
+    private LjZtdfzhMapper ljZtdfzhMapper;
+
+    /**
+     * 查询邻井-钻头得分综合
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 邻井-钻头得分综合
+     */
+    @Override
+    public LjZtdfzh selectLjZtdfzhById(Long id)
+    {
+        return ljZtdfzhMapper.selectLjZtdfzhById(id);
+    }
+
+    /**
+     * 查询邻井-钻头得分综合列表
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 邻井-钻头得分综合
+     */
+    @Override
+    public List<LjZtdfzh> selectLjZtdfzhList(LjZtdfzh ljZtdfzh)
+    {
+        return ljZtdfzhMapper.selectLjZtdfzhList(ljZtdfzh);
+    }
+
+    /**
+     * 新增邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    @Override
+    public int insertLjZtdfzh(LjZtdfzh ljZtdfzh)
+    {
+        return ljZtdfzhMapper.insertLjZtdfzh(ljZtdfzh);
+    }
+
+    /**
+     * 修改邻井-钻头得分综合
+     * 
+     * @param ljZtdfzh 邻井-钻头得分综合
+     * @return 结果
+     */
+    @Override
+    public int updateLjZtdfzh(LjZtdfzh ljZtdfzh)
+    {
+        return ljZtdfzhMapper.updateLjZtdfzh(ljZtdfzh);
+    }
+
+    /**
+     * 批量删除邻井-钻头得分综合
+     * 
+     * @param ids 需要删除的邻井-钻头得分综合主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZtdfzhByIds(Long[] ids)
+    {
+        return ljZtdfzhMapper.deleteLjZtdfzhByIds(ids);
+    }
+
+    /**
+     * 删除邻井-钻头得分综合信息
+     * 
+     * @param id 邻井-钻头得分综合主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLjZtdfzhById(Long id)
+    {
+        return ljZtdfzhMapper.deleteLjZtdfzhById(id);
+    }
+}

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

@@ -225,7 +225,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getZqshfxList" resultType="com.ruoyi.project.zt.domain.DjZqsjfx">
 
 
-		select a.jh,c.kc,ksjs,c.js
+		select a.jh,c.kc,ksjs,c.js,to_char((case when kc ='1' then b.KZRQ1 when kc ='2' then  b.KZRQ2 when kc ='3' then  b.KZRQ3  when kc ='4' then  b.KZRQ4 when kc ='5' then  b.KZRQ5 else  null end ),'YYYY-MM-DD')   || ' ' ||
+		TO_CHAR(TO_DATE((case when kc ='1' then b.KZSJ1 when kc ='2' then  b.KZSJ2 when kc ='3' then  b.KZSJ3  when kc ='4' then  b.KZSJ4 when kc ='5' then  b.KZSJ5 else  null end ), 'HH24MI'), 'HH24:MI') || ':00' AS  kssj
+		,to_char((case when kc ='1' then b.KZRQ2 when kc ='2' then  (case when KZRQ3 is null or KZRQ3 ='' then WJRQ  else KZRQ3 end )  when kc ='3' then  (case when KZRQ4 is null or KZRQ4 ='' then WJRQ  else KZRQ4 end )  when kc ='4' then   (case when KZRQ5 is null or KZRQ5 ='' then WJRQ  else KZRQ5 end ) when kc ='5' then  b.WJRQ else  null end ),'YYYY-MM-DD') || ' ' ||
+		TO_CHAR(TO_DATE((case when kc ='1' then b.KZSJ2 when kc ='2' then  (case when KZRQ3 is null or KZRQ3 ='' then WJSJ  else KZSJ3 end )  when kc ='3' then  (case when KZRQ4 is null or KZRQ4 ='' then WJSJ  else KZSJ4 end )  when kc ='4' then   (case when KZRQ5 is null or KZRQ5 ='' then WJSJ  else KZSJ5 end ) when kc ='5' then  b.WJSJ else  null end ), 'HH24MI'), 'HH24:MI') || ':00' AS  JSSJ
 		from JSBA a
 		left join jsaa b on a.jh = b.jh
 		left join (

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

@@ -28,5 +28,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select * from (
 						  select * from JSwA where RJC>0 and jh=#{jh} and js=#{js} ) where ROWNUM=1
 	</select>
+	<select id="selectZwsj" resultType="com.ruoyi.project.zt.domain.Jswa">
+		select *from (
+		select * from JSwA where 1=1
+		<if test="jh!=null and jh!=''">
+			and jh =#{jh}
+		</if>
+		<if test="ksrq!=null and ksrq!=''">
+			and to_char(RQ,'YYYY-MM-DD')>=#{ksrq}
+		</if>
+		<if test="jsrq!=null  and jsrq!=''">
+			and to_char(RQ,'YYYY-MM-DD')&lt;=#{jsrq}
+		</if>
+		<if test="js!=null ">
+			and js = #{js}
+		</if>
+		)  where ROWNUM =1
+	</select>
 
 </mapper>
\ No newline at end of file

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

@@ -50,6 +50,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLjSzfxjgVo"/>
         where id = #{id}
     </select>
+    <select id="getszfxjgList" resultType="com.ruoyi.project.zt.domain.LjSzfxjg">
+        <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>
 
     <insert id="insertLjSzfxjg" parameterType="LjSzfxjg" useGeneratedKeys="true" keyProperty="id">
         insert into lj_szfxjg

src/main/resources/mybatis/zt/LjZjzhfxMapper.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.LjZjzhfxMapper">
+    
+    <resultMap type="LjZjzhfx" id="LjZjzhfxResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="kc"    column="kc"    />
+        <result property="zjzhmx"    column="zjzhmx"    />
+        <result property="tsgj"    column="tsgj"    />
+        <result property="zjzh"    column="zjzh"    />
+        <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="selectLjZjzhfxVo">
+        select id, jh, kc, zjzhmx, tsgj, zjzh, created_by, created_time, update_by, update_time from lj_zjzhfx
+    </sql>
+
+    <select id="selectLjZjzhfxList" parameterType="LjZjzhfx" resultMap="LjZjzhfxResult">
+        <include refid="selectLjZjzhfxVo"/>
+        <where>  
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="zjzhmx != null  and zjzhmx != ''"> and zjzhmx = #{zjzhmx}</if>
+            <if test="tsgj != null  and tsgj != ''"> and tsgj = #{tsgj}</if>
+            <if test="zjzh != null  and zjzh != ''"> and zjzh = #{zjzh}</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="selectLjZjzhfxById" parameterType="Long" resultMap="LjZjzhfxResult">
+        <include refid="selectLjZjzhfxVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLjZjzhfx" parameterType="LjZjzhfx" >
+        insert into lj_zjzhfx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="kc != null">kc,</if>
+            <if test="zjzhmx != null">zjzhmx,</if>
+            <if test="tsgj != null">tsgj,</if>
+            <if test="zjzh != null">zjzh,</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="jh != null">#{jh},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="zjzhmx != null">#{zjzhmx},</if>
+            <if test="tsgj != null">#{tsgj},</if>
+            <if test="zjzh != null">#{zjzh},</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="batchLjZjzhfx">
+        INSERT ALL
+        <foreach item="item" index="index" collection="list">
+            INTO lj_zjzhfx (jh, kc, zjzhmx, tsgj, zjzh)
+            VALUES (#{item.jh}, #{item.kc}, #{item.zjzhmx}, #{item.tsgj}, #{item.zjzh})
+        </foreach>
+        SELECT 1 FROM DUAL
+    </insert>
+
+    <update id="updateLjZjzhfx" parameterType="LjZjzhfx">
+        update lj_zjzhfx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="zjzhmx != null">zjzhmx = #{zjzhmx},</if>
+            <if test="tsgj != null">tsgj = #{tsgj},</if>
+            <if test="zjzh != null">zjzh = #{zjzh},</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="deleteLjZjzhfxById" parameterType="Long">
+        delete from lj_zjzhfx where id = #{id}
+    </delete>
+
+    <delete id="deleteLjZjzhfxByIds" parameterType="String">
+        delete from lj_zjzhfx 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/LjZtdfzhMapper.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.LjZtdfzhMapper">
+    
+    <resultMap type="LjZtdfzh" id="LjZtdfzhResult">
+        <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="zhdf"    column="zhdf"    />
+    </resultMap>
+
+    <sql id="selectLjZtdfzhVo">
+        select id, kc, ztxh, cc, jcdf, jsdf, zhdf from lj_ztdfzh
+    </sql>
+
+    <select id="selectLjZtdfzhList" parameterType="LjZtdfzh" resultMap="LjZtdfzhResult">
+        <include refid="selectLjZtdfzhVo"/>
+        <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="zhdf != null "> and zhdf = #{zhdf}</if>
+        </where>
+    </select>
+    
+    <select id="selectLjZtdfzhById" parameterType="Long" resultMap="LjZtdfzhResult">
+        <include refid="selectLjZtdfzhVo"/>
+        where id = #{id}
+    </select>
+    <select id="getZtzhzzdfList" resultType="com.ruoyi.project.zt.domain.LjZtdfzh">
+        <include refid="selectLjZtdfzhVo"/>
+        <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="zhdf != null "> and zhdf = #{zhdf}</if>
+        </where>
+    </select>
+
+    <insert id="insertLjZtdfzh" parameterType="LjZtdfzh" useGeneratedKeys="true" keyProperty="id">
+        insert into lj_ztdfzh
+        <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="zhdf != null">zhdf,</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="zhdf != null">#{zhdf},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLjZtdfzh" parameterType="LjZtdfzh">
+        update lj_ztdfzh
+        <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="zhdf != null">zhdf = #{zhdf},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLjZtdfzhById" parameterType="Long">
+        delete from lj_ztdfzh where id = #{id}
+    </delete>
+
+    <delete id="deleteLjZtdfzhByIds" parameterType="String">
+        delete from lj_ztdfzh 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

@@ -44,6 +44,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLjZtzhdfVo"/>
         where id = #{id}
     </select>
+    <select id="selectLjZtzhdfListByCom" 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>
 
     <insert id="insertLjZtzhdf" parameterType="LjZtzhdf" useGeneratedKeys="true" keyProperty="id">
         insert into lj_ztzhdf