修改

src/main/java/com/zjsgfa/project/zjsgfa/controller/SgfambController.java

+package com.zjsgfa.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.zjsgfa.framework.aspectj.lang.annotation.Log;
+import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
+import com.zjsgfa.project.zjsgfa.domain.Sgfamb;
+import com.zjsgfa.project.zjsgfa.service.ISgfambService;
+import com.zjsgfa.framework.web.controller.BaseController;
+import com.zjsgfa.framework.web.domain.AjaxResult;
+import com.zjsgfa.common.utils.poi.ExcelUtil;
+import com.zjsgfa.framework.web.page.TableDataInfo;
+
+/**
+ * 施工方案模板管理Controller
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@RestController
+@RequestMapping("/system/sgfamb")
+public class SgfambController extends BaseController
+{
+    @Autowired
+    private ISgfambService sgfambService;
+
+    /**
+     * 查询施工方案模板管理列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Sgfamb sgfamb)
+    {
+        startPage();
+        List<Sgfamb> list = sgfambService.selectSgfambList(sgfamb);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/selectList")
+    public TableDataInfo getList(Sgfamb sgfamb)
+    {
+//        startPage();
+        List<Sgfamb> list = sgfambService.selectSgfambList(sgfamb);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出施工方案模板管理列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:export')")
+    @Log(title = "施工方案模板管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Sgfamb sgfamb)
+    {
+        List<Sgfamb> list = sgfambService.selectSgfambList(sgfamb);
+        ExcelUtil<Sgfamb> util = new ExcelUtil<Sgfamb>(Sgfamb.class);
+        util.exportExcel(response, list, "施工方案模板管理数据");
+    }
+
+    /**
+     * 获取施工方案模板管理详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sgfambService.selectSgfambById(id));
+    }
+
+    /**
+     * 新增施工方案模板管理
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:add')")
+    @Log(title = "施工方案模板管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Sgfamb sgfamb)
+    {
+        return toAjax(sgfambService.insertSgfamb(sgfamb));
+    }
+
+    /**
+     * 修改施工方案模板管理
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:edit')")
+    @Log(title = "施工方案模板管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Sgfamb sgfamb)
+    {
+        return toAjax(sgfambService.updateSgfamb(sgfamb));
+    }
+
+    /**
+     * 删除施工方案模板管理
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfamb:remove')")
+    @Log(title = "施工方案模板管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sgfambService.deleteSgfambByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/controller/SgfambKcSggyController.java

+package com.zjsgfa.project.zjsgfa.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+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.zjsgfa.framework.aspectj.lang.annotation.Log;
+import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy;
+import com.zjsgfa.project.zjsgfa.service.ISgfambKcSggyService;
+import com.zjsgfa.framework.web.controller.BaseController;
+import com.zjsgfa.framework.web.domain.AjaxResult;
+import com.zjsgfa.common.utils.poi.ExcelUtil;
+import com.zjsgfa.framework.web.page.TableDataInfo;
+
+/**
+ * 施工方案模板管理—开次-施工概要Controller
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@RestController
+@RequestMapping("/system/sgfambKcSggy")
+public class SgfambKcSggyController extends BaseController
+{
+    @Autowired
+    private ISgfambKcSggyService sgfambKcSggyService;
+
+    /**
+     * 查询施工方案模板管理—开次-施工概要列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SgfambKcSggy sgfambKcSggy)
+    {
+        startPage();
+        List<SgfambKcSggy> list = sgfambKcSggyService.selectSgfambKcSggyList(sgfambKcSggy);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出施工方案模板管理—开次-施工概要列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:export')")
+    @Log(title = "施工方案模板管理—开次-施工概要", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SgfambKcSggy sgfambKcSggy)
+    {
+        List<SgfambKcSggy> list = sgfambKcSggyService.selectSgfambKcSggyList(sgfambKcSggy);
+        ExcelUtil<SgfambKcSggy> util = new ExcelUtil<SgfambKcSggy>(SgfambKcSggy.class);
+        util.exportExcel(response, list, "施工方案模板管理—开次-施工概要数据");
+    }
+
+    /**
+     * 获取施工方案模板管理—开次-施工概要详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:query')")
+    @GetMapping(value = "/{id}")
+    public Map<String, Object> getInfo(@PathVariable("id") Long id)
+    {
+        SgfambKcSggy sgfambKcSggy = sgfambKcSggyService.selectSgfambKcSggyById(id);
+        Map<String, Object> map =new HashMap<>();
+        map.put("data",sgfambKcSggy);
+        return map;
+    }
+
+    /**
+     * 新增施工方案模板管理—开次-施工概要
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:add')")
+    @Log(title = "施工方案模板管理—开次-施工概要", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SgfambKcSggy sgfambKcSggy)
+    {
+        return toAjax(sgfambKcSggyService.insertSgfambKcSggy(sgfambKcSggy));
+    }
+
+    /**
+     * 修改施工方案模板管理—开次-施工概要
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:edit')")
+    @Log(title = "施工方案模板管理—开次-施工概要", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SgfambKcSggy sgfambKcSggy)
+    {
+        return toAjax(sgfambKcSggyService.updateSgfambKcSggy(sgfambKcSggy));
+    }
+
+    /**
+     * 删除施工方案模板管理—开次-施工概要
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcSggy:remove')")
+    @Log(title = "施工方案模板管理—开次-施工概要", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sgfambKcSggyService.deleteSgfambKcSggyByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/controller/SgfambKcxxController.java

+package com.zjsgfa.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.zjsgfa.framework.aspectj.lang.annotation.Log;
+import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+import com.zjsgfa.project.zjsgfa.service.ISgfambKcxxService;
+import com.zjsgfa.framework.web.controller.BaseController;
+import com.zjsgfa.framework.web.domain.AjaxResult;
+import com.zjsgfa.common.utils.poi.ExcelUtil;
+import com.zjsgfa.framework.web.page.TableDataInfo;
+
+/**
+ * 施工方案模板管理—开次信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@RestController
+@RequestMapping("/system/sgfambKcxx")
+public class SgfambKcxxController extends BaseController
+{
+    @Autowired
+    private ISgfambKcxxService sgfambKcxxService;
+
+    /**
+     * 查询施工方案模板管理—开次信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SgfambKcxx sgfambKcxx)
+    {
+//        startPage();
+        List<SgfambKcxx> list = sgfambKcxxService.selectSgfambKcxxList(sgfambKcxx);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出施工方案模板管理—开次信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:export')")
+    @Log(title = "施工方案模板管理—开次信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SgfambKcxx sgfambKcxx)
+    {
+        List<SgfambKcxx> list = sgfambKcxxService.selectSgfambKcxxList(sgfambKcxx);
+        ExcelUtil<SgfambKcxx> util = new ExcelUtil<SgfambKcxx>(SgfambKcxx.class);
+        util.exportExcel(response, list, "施工方案模板管理—开次信息数据");
+    }
+
+    /**
+     * 获取施工方案模板管理—开次信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sgfambKcxxService.selectSgfambKcxxById(id));
+    }
+
+    /**
+     * 新增施工方案模板管理—开次信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:add')")
+    @Log(title = "施工方案模板管理—开次信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SgfambKcxx sgfambKcxx)
+    {
+        return toAjax(sgfambKcxxService.insertSgfambKcxx(sgfambKcxx));
+    }
+
+    /**
+     * 修改施工方案模板管理—开次信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:edit')")
+    @Log(title = "施工方案模板管理—开次信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SgfambKcxx sgfambKcxx)
+    {
+        return toAjax(sgfambKcxxService.updateSgfambKcxx(sgfambKcxx));
+    }
+
+    /**
+     * 删除施工方案模板管理—开次信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambKcxx:remove')")
+    @Log(title = "施工方案模板管理—开次信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sgfambKcxxService.deleteSgfambKcxxByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/controller/SgfambTjpzController.java

+package com.zjsgfa.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.zjsgfa.framework.aspectj.lang.annotation.Log;
+import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
+import com.zjsgfa.project.zjsgfa.domain.SgfambTjpz;
+import com.zjsgfa.project.zjsgfa.service.ISgfambTjpzService;
+import com.zjsgfa.framework.web.controller.BaseController;
+import com.zjsgfa.framework.web.domain.AjaxResult;
+import com.zjsgfa.common.utils.poi.ExcelUtil;
+import com.zjsgfa.framework.web.page.TableDataInfo;
+
+/**
+ * 施工方案模板-条件配置Controller
+ * 
+ * @author ruoyi
+ * @date 2025-09-25
+ */
+@RestController
+@RequestMapping("/system/sgfambTjpz")
+public class SgfambTjpzController extends BaseController
+{
+    @Autowired
+    private ISgfambTjpzService sgfambTjpzService;
+
+    /**
+     * 查询施工方案模板-条件配置列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SgfambTjpz sgfambTjpz)
+    {
+        startPage();
+        List<SgfambTjpz> list = sgfambTjpzService.selectSgfambTjpzList(sgfambTjpz);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/selectList")
+    public TableDataInfo selectList(SgfambTjpz sgfambTjpz)
+    {
+//        startPage();
+        List<SgfambTjpz> list = sgfambTjpzService.selectSgfambTjpzList(sgfambTjpz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出施工方案模板-条件配置列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:export')")
+    @Log(title = "施工方案模板-条件配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SgfambTjpz sgfambTjpz)
+    {
+        List<SgfambTjpz> list = sgfambTjpzService.selectSgfambTjpzList(sgfambTjpz);
+        ExcelUtil<SgfambTjpz> util = new ExcelUtil<SgfambTjpz>(SgfambTjpz.class);
+        util.exportExcel(response, list, "施工方案模板-条件配置数据");
+    }
+
+    /**
+     * 获取施工方案模板-条件配置详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sgfambTjpzService.selectSgfambTjpzById(id));
+    }
+
+    /**
+     * 新增施工方案模板-条件配置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:add')")
+    @Log(title = "施工方案模板-条件配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SgfambTjpz sgfambTjpz)
+    {
+        return toAjax(sgfambTjpzService.insertSgfambTjpz(sgfambTjpz));
+    }
+
+    /**
+     * 修改施工方案模板-条件配置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:edit')")
+    @Log(title = "施工方案模板-条件配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SgfambTjpz sgfambTjpz)
+    {
+        return toAjax(sgfambTjpzService.updateSgfambTjpz(sgfambTjpz));
+    }
+
+    /**
+     * 删除施工方案模板-条件配置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sgfambTjpz:remove')")
+    @Log(title = "施工方案模板-条件配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sgfambTjpzService.deleteSgfambTjpzByIds(ids));
+    }
+}

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

@@ -1495,7 +1495,7 @@ public class SjDjjcController extends BaseController
                 }else if(isPictureInRow(anchor, 1, 1)){
                     SjGztz sjGztz=new SjGztz();
                     sjGztz.setJh(jh);
-                    sjGztz.setGzlx("地震刨面图");
+                    sjGztz.setGzlx("地震剖面图");
                     String fileName = UUID.randomUUID().toString();
                     String lj = filePath + fileName + "." + ext;
                     File desc = new File(lj);
@@ -1514,7 +1514,7 @@ public class SjDjjcController extends BaseController
                 }else if(isPictureInRow(anchor, 2, 2)){
                     SjGztz sjGztz=new SjGztz();
                     sjGztz.setJh(jh);
-                    sjGztz.setGzlx("三压力刨面图");
+                    sjGztz.setGzlx("三压力剖面图");
                     String fileName = UUID.randomUUID().toString();
                     String lj = filePath + fileName + "." + ext;
                     File desc = new File(lj);
@@ -1811,7 +1811,7 @@ public class SjDjjcController extends BaseController
                     //计算垂深
                     double targetCs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg.getJs());
                     csaa = targetCs;
-                    sjFdsgcsDcyxList.addAll(processAndDisplay(dzfcList, previousDepth, targetCs, jh, sjJsjg.getKc()));
+                    sjFdsgcsDcyxList.addAll(processAndDisplayDc(dzfcList, previousDepth, targetCs, jh, sjJsjg.getKc(),sjJygjGdsjgdcsList));
                     sjFdfxList.addAll(processAndDisplayFd(dzfcList, previousDepth, targetCs, jh, sjJsjg.getKc(),sjJygjGdsjgdcsList,id));
                 }
                 if (sjFdsgcsDcyxList.size() > 0) {
@@ -1896,6 +1896,7 @@ public class SjDjjcController extends BaseController
             // 确定当前地层的显示结束深度
             double endDepth = Math.min(currentDepth, targetCs);
 
+
             // 显示当前地层的范围
             System.out.printf("%s\t%.0f-%.0f%n",
                     stratum.getDzfc(), previousDepth, endDepth);
@@ -1920,6 +1921,59 @@ public class SjDjjcController extends BaseController
     }
 
 
+    private static List<SjFdsgcsDcyx> processAndDisplayDc(List<SjDcfxDzfc> stratumList,double kscs, double targetCs,String jh,String kc,List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList) {
+
+        List<SjFdsgcsDcyx> list =new ArrayList<>();
+
+
+        System.out.println("名称\t井段垂深 / m");
+
+        double previousDepth = kscs;  // 从kscs开始计算
+        boolean foundStartingPoint = false;
+
+        System.out.println("名称\t井段垂深 / m");
+
+        for (SjDcfxDzfc stratum : stratumList) {
+            double currentDepth = stratum.getCs();
+
+            // 如果还没找到起始点，且当前地层深度小于kscs，跳过
+            if (!foundStartingPoint && currentDepth < kscs) {
+                continue;
+            }
+
+            // 标记已找到起始点
+            foundStartingPoint = true;
+
+            // 确定当前地层的显示结束深度
+            double endDepth = Math.min(currentDepth, targetCs);
+
+
+            // 显示当前地层的范围
+            System.out.printf("%s\t%.0f-%.0f%n",
+                    stratum.getDzfc(), previousDepth, endDepth);
+            SjFdsgcsDcyx sjFdsgcsDcyx = new SjFdsgcsDcyx();
+            sjFdsgcsDcyx.setJh(jh);
+            sjFdsgcsDcyx.setKc(kc);
+            sjFdsgcsDcyx.setDcmc(stratum.getDzfc());
+            sjFdsgcsDcyx.setJdcs(previousDepth + "-" + endDepth);
+            Double ksxs=getJs(sjJygjGdsjgdcsList,previousDepth);
+            Double jsxs=getJs(sjJygjGdsjgdcsList,endDepth);
+            sjFdsgcsDcyx.setJdxs(ksxs + "-" + jsxs);
+            sjFdsgcsDcyx.setYx(stratum.getYxts());
+            list.add(sjFdsgcsDcyx);
+
+            // 更新上一个深度
+            previousDepth = currentDepth;
+
+            // 如果当前地层已经超过cs参数，结束处理
+            if (currentDepth >= targetCs) {
+                break;
+            }
+        }
+
+        return list;
+    }
+
 
     private static List<SjFdfx> processAndDisplayFd(List<SjDcfxDzfc> stratumList,double kscs, double targetCs,String jh,String kc,List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList,Long id) {
 

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjZsjqkController.java

@@ -103,7 +103,7 @@ public class SjZsjqkController extends BaseController
     }
 
     @PostMapping("/addAll")
-    public AjaxResult addAll(List<SjZsjqk> sjZsjqkList)
+    public AjaxResult addAll(@RequestBody List<SjZsjqk> sjZsjqkList)
     {
        return toAjax(sjZsjqkService.insertSjZsjqkBatch(sjZsjqkList));
     }

src/main/java/com/zjsgfa/project/zjsgfa/domain/Cxtj.java

@@ -45,4 +45,8 @@ public class Cxtj extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
+    private String jhlist;
+
+    private String sfgk;
+
 }

src/main/java/com/zjsgfa/project/zjsgfa/domain/Sgfamb.java

+package com.zjsgfa.project.zjsgfa.domain;
+
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 施工方案模板管理对象 sgfamb
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Data
+public class Sgfamb extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String mbmc;
+
+    /** 区块 */
+    @Excel(name = "区块")
+    private String qk;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String bz;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+}

src/main/java/com/zjsgfa/project/zjsgfa/domain/SgfambKcSggy.java

+package com.zjsgfa.project.zjsgfa.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 施工方案模板管理—开次-施工概要对象 sgfamb_kc_sggy
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Data
+public class SgfambKcSggy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbid;
+
+    /** 开次 */
+    @Excel(name = "开次")
+    private String kc;
+
+    private String qk;
+
+    /** 开始井深 */
+    @Excel(name = "开始井深")
+    private BigDecimal ksjs;
+
+    /** 结束井深 */
+    @Excel(name = "结束井深")
+    private BigDecimal jsjs;
+
+    /** 钻头型号 */
+    @Excel(name = "钻头型号")
+    private String ztxh;
+
+    /** 钻压 */
+    @Excel(name = "钻压")
+    private String zjzy;
+
+    /** 转速 */
+    @Excel(name = "转速")
+    private String zjzs;
+
+    /** 排量 */
+    @Excel(name = "排量")
+    private String zjpl;
+
+    /** 泵压 */
+    @Excel(name = "泵压")
+    private String zjby;
+
+    /** 钻具组合 */
+    @Excel(name = "钻具组合")
+    private String zjzh;
+
+    /** 钻具组合注意事项 */
+    @Excel(name = "钻具组合注意事项")
+    private String zjzhzysx;
+
+    /** 轨迹分析 */
+    @Excel(name = "轨迹分析")
+    private String gjfx;
+
+    /** 轨迹优化 */
+    @Excel(name = "轨迹优化")
+    private String gjyh;
+
+    /** 钻井液措施 */
+    @Excel(name = "钻井液措施")
+    private String zjycs;
+
+    /** 钻井工程措施 */
+    @Excel(name = "钻井工程措施")
+    private String zjgccs;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    private String tjmc;
+
+    //钻头条件id
+    private Long zttjid;
+    //钻具组合条件id
+    private Long zjzhtjid;
+    //施工参数条件id
+    private Long sgcstjid;
+
+
+
+}

src/main/java/com/zjsgfa/project/zjsgfa/domain/SgfambKcxx.java

+package com.zjsgfa.project.zjsgfa.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 施工方案模板管理—开次信息对象 sgfamb_kcxx
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Data
+public class SgfambKcxx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbid;
+
+    /** 开次 */
+    @Excel(name = "开次")
+    private String kc;
+
+    /** 开始井深 */
+    @Excel(name = "开始井深")
+    private BigDecimal ksjs;
+
+    /** 结束井深 */
+    @Excel(name = "结束井深")
+    private BigDecimal jsjs;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+}

src/main/java/com/zjsgfa/project/zjsgfa/domain/SgfambTjpz.java

+package com.zjsgfa.project.zjsgfa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 施工方案模板-条件配置对象 sgfamb_tjpz
+ * 
+ * @author ruoyi
+ * @date 2025-09-25
+ */
+@Data
+public class SgfambTjpz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 条件名称 */
+    @Excel(name = "条件名称")
+    private String tjmc;
+
+    /** 类别(钻头、钻具组合、施工参数) */
+    @Excel(name = "类别(钻头、钻具组合、施工参数)")
+    private String lb;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String bz;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+}

src/main/java/com/zjsgfa/project/zjsgfa/domain/SjDjjc.java

@@ -140,6 +140,8 @@ public class SjDjjc extends BaseEntity
     @Excel(name = "附录状态", readConverterExp = "未=定稿/定稿")
     private String flzt;
 
+    private Long faid;
+
 
     public void setId(Long id)
     {

src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFdfx.java

@@ -73,6 +73,8 @@ public class SjFdfx extends BaseEntity
     @Excel(name = "划分依据")
     private String hfyj;
 
+
+
     private List<SjFdfx> list=new ArrayList<>();
 
 

src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFdsgcsDcyx.java

@@ -35,6 +35,9 @@ public class SjFdsgcsDcyx extends BaseEntity
     @Excel(name = "井段垂深")
     private String jdcs;
 
+    //井段斜深
+    private String jdxs;
+
     /** 岩性 */
     @Excel(name = "岩性")
     private String yx;

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SgfambKcSggyMapper.java

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy;
+
+/**
+ * 施工方案模板管理—开次-施工概要Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface SgfambKcSggyMapper 
+{
+    /**
+     * 查询施工方案模板管理—开次-施工概要
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 施工方案模板管理—开次-施工概要
+     */
+    public SgfambKcSggy selectSgfambKcSggyById(Long id);
+
+    /**
+     * 查询施工方案模板管理—开次-施工概要列表
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 施工方案模板管理—开次-施工概要集合
+     */
+    public List<SgfambKcSggy> selectSgfambKcSggyList(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 新增施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    public int insertSgfambKcSggy(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 修改施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    public int updateSgfambKcSggy(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 删除施工方案模板管理—开次-施工概要
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 结果
+     */
+    public int deleteSgfambKcSggyById(Long id);
+
+    /**
+     * 批量删除施工方案模板管理—开次-施工概要
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSgfambKcSggyByIds(Long[] ids);
+
+    List<SgfambKcSggy> selectSgfambKcSggyByZbid(Long faid);
+
+
+    List<SgfambKcSggy> selectSgfambKcSggyListByQk(SgfambKcSggy sgfambKcSggy);
+
+
+}

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SgfambKcxxMapper.java

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+
+/**
+ * 施工方案模板管理—开次信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface SgfambKcxxMapper 
+{
+    /**
+     * 查询施工方案模板管理—开次信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 施工方案模板管理—开次信息
+     */
+    public SgfambKcxx selectSgfambKcxxById(Long id);
+
+    /**
+     * 查询施工方案模板管理—开次信息列表
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 施工方案模板管理—开次信息集合
+     */
+    public List<SgfambKcxx> selectSgfambKcxxList(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 新增施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    public int insertSgfambKcxx(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 修改施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    public int updateSgfambKcxx(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 删除施工方案模板管理—开次信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 结果
+     */
+    public int deleteSgfambKcxxById(Long id);
+
+    /**
+     * 批量删除施工方案模板管理—开次信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSgfambKcxxByIds(Long[] ids);
+}

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SgfambMapper.java

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.Sgfamb;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+
+/**
+ * 施工方案模板管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface SgfambMapper 
+{
+    /**
+     * 查询施工方案模板管理
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 施工方案模板管理
+     */
+    public Sgfamb selectSgfambById(Long id);
+
+    /**
+     * 查询施工方案模板管理列表
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 施工方案模板管理集合
+     */
+    public List<Sgfamb> selectSgfambList(Sgfamb sgfamb);
+
+    /**
+     * 新增施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    public int insertSgfamb(Sgfamb sgfamb);
+
+    /**
+     * 修改施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    public int updateSgfamb(Sgfamb sgfamb);
+
+    /**
+     * 删除施工方案模板管理
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 结果
+     */
+    public int deleteSgfambById(Long id);
+
+    /**
+     * 批量删除施工方案模板管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSgfambByIds(Long[] ids);
+
+    /**
+     * 批量删除施工方案模板管理—开次信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSgfambKcxxByZbids(Long[] ids);
+    
+    /**
+     * 批量新增施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxxList 施工方案模板管理—开次信息列表
+     * @return 结果
+     */
+    public int batchSgfambKcxx(List<SgfambKcxx> sgfambKcxxList);
+    
+
+    /**
+     * 通过施工方案模板管理主键删除施工方案模板管理—开次信息信息
+     * 
+     * @param id 施工方案模板管理ID
+     * @return 结果
+     */
+    public int deleteSgfambKcxxByZbid(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SgfambTjpzMapper.java

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambTjpz;
+
+/**
+ * 施工方案模板-条件配置Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-25
+ */
+public interface SgfambTjpzMapper 
+{
+    /**
+     * 查询施工方案模板-条件配置
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 施工方案模板-条件配置
+     */
+    public SgfambTjpz selectSgfambTjpzById(Long id);
+
+    /**
+     * 查询施工方案模板-条件配置列表
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 施工方案模板-条件配置集合
+     */
+    public List<SgfambTjpz> selectSgfambTjpzList(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 新增施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    public int insertSgfambTjpz(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 修改施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    public int updateSgfambTjpz(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 删除施工方案模板-条件配置
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 结果
+     */
+    public int deleteSgfambTjpzById(Long id);
+
+    /**
+     * 批量删除施工方案模板-条件配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSgfambTjpzByIds(Long[] ids);
+}

src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjSggyGjsbxnyqMapper.java

@@ -58,4 +58,9 @@ public interface SjSggyGjsbxnyqMapper
      * @return 结果
      */
     public int deleteSjSggyGjsbxnyqByIds(Long[] ids);
+
+    int insertSjSggyGjsbxnyq2(SjSggyGjsbxnyq sjSggyZjzhcs);
+
+    int updateSjSggyGjsbxnyqByjh(SjSggyGjsbxnyq sjSggyGjsbxnyq);
+
 }

src/main/java/com/zjsgfa/project/zjsgfa/service/ISgfambKcSggyService.java

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy;
+
+/**
+ * 施工方案模板管理—开次-施工概要Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface ISgfambKcSggyService 
+{
+    /**
+     * 查询施工方案模板管理—开次-施工概要
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 施工方案模板管理—开次-施工概要
+     */
+    public SgfambKcSggy selectSgfambKcSggyById(Long id);
+
+    /**
+     * 查询施工方案模板管理—开次-施工概要列表
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 施工方案模板管理—开次-施工概要集合
+     */
+    public List<SgfambKcSggy> selectSgfambKcSggyList(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 新增施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    public int insertSgfambKcSggy(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 修改施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    public int updateSgfambKcSggy(SgfambKcSggy sgfambKcSggy);
+
+    /**
+     * 批量删除施工方案模板管理—开次-施工概要
+     * 
+     * @param ids 需要删除的施工方案模板管理—开次-施工概要主键集合
+     * @return 结果
+     */
+    public int deleteSgfambKcSggyByIds(Long[] ids);
+
+    /**
+     * 删除施工方案模板管理—开次-施工概要信息
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 结果
+     */
+    public int deleteSgfambKcSggyById(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/ISgfambKcxxService.java

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+
+/**
+ * 施工方案模板管理—开次信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface ISgfambKcxxService 
+{
+    /**
+     * 查询施工方案模板管理—开次信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 施工方案模板管理—开次信息
+     */
+    public SgfambKcxx selectSgfambKcxxById(Long id);
+
+    /**
+     * 查询施工方案模板管理—开次信息列表
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 施工方案模板管理—开次信息集合
+     */
+    public List<SgfambKcxx> selectSgfambKcxxList(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 新增施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    public int insertSgfambKcxx(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 修改施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    public int updateSgfambKcxx(SgfambKcxx sgfambKcxx);
+
+    /**
+     * 批量删除施工方案模板管理—开次信息
+     * 
+     * @param ids 需要删除的施工方案模板管理—开次信息主键集合
+     * @return 结果
+     */
+    public int deleteSgfambKcxxByIds(Long[] ids);
+
+    /**
+     * 删除施工方案模板管理—开次信息信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 结果
+     */
+    public int deleteSgfambKcxxById(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/ISgfambService.java

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.Sgfamb;
+
+/**
+ * 施工方案模板管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+public interface ISgfambService 
+{
+    /**
+     * 查询施工方案模板管理
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 施工方案模板管理
+     */
+    public Sgfamb selectSgfambById(Long id);
+
+    /**
+     * 查询施工方案模板管理列表
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 施工方案模板管理集合
+     */
+    public List<Sgfamb> selectSgfambList(Sgfamb sgfamb);
+
+    /**
+     * 新增施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    public int insertSgfamb(Sgfamb sgfamb);
+
+    /**
+     * 修改施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    public int updateSgfamb(Sgfamb sgfamb);
+
+    /**
+     * 批量删除施工方案模板管理
+     * 
+     * @param ids 需要删除的施工方案模板管理主键集合
+     * @return 结果
+     */
+    public int deleteSgfambByIds(Long[] ids);
+
+    /**
+     * 删除施工方案模板管理信息
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 结果
+     */
+    public int deleteSgfambById(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/ISgfambTjpzService.java

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SgfambTjpz;
+
+/**
+ * 施工方案模板-条件配置Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-25
+ */
+public interface ISgfambTjpzService 
+{
+    /**
+     * 查询施工方案模板-条件配置
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 施工方案模板-条件配置
+     */
+    public SgfambTjpz selectSgfambTjpzById(Long id);
+
+    /**
+     * 查询施工方案模板-条件配置列表
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 施工方案模板-条件配置集合
+     */
+    public List<SgfambTjpz> selectSgfambTjpzList(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 新增施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    public int insertSgfambTjpz(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 修改施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    public int updateSgfambTjpz(SgfambTjpz sgfambTjpz);
+
+    /**
+     * 批量删除施工方案模板-条件配置
+     * 
+     * @param ids 需要删除的施工方案模板-条件配置主键集合
+     * @return 结果
+     */
+    public int deleteSgfambTjpzByIds(Long[] ids);
+
+    /**
+     * 删除施工方案模板-条件配置信息
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 结果
+     */
+    public int deleteSgfambTjpzById(Long id);
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SgfambKcSggyServiceImpl.java

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import cn.hutool.core.codec.Base64;
+import com.zjsgfa.common.utils.DateUtils;
+import com.zjsgfa.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SgfambKcSggyMapper;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy;
+import com.zjsgfa.project.zjsgfa.service.ISgfambKcSggyService;
+
+/**
+ * 施工方案模板管理—开次-施工概要Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Service
+public class SgfambKcSggyServiceImpl implements ISgfambKcSggyService 
+{
+    @Autowired
+    private SgfambKcSggyMapper sgfambKcSggyMapper;
+
+    /**
+     * 查询施工方案模板管理—开次-施工概要
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 施工方案模板管理—开次-施工概要
+     */
+    @Override
+    public SgfambKcSggy selectSgfambKcSggyById(Long id)
+    {
+        SgfambKcSggy sgfambKcSggy = sgfambKcSggyMapper.selectSgfambKcSggyById(id);
+        return sgfambKcSggy;
+    }
+
+    /**
+     * 查询施工方案模板管理—开次-施工概要列表
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 施工方案模板管理—开次-施工概要
+     */
+    @Override
+    public List<SgfambKcSggy> selectSgfambKcSggyList(SgfambKcSggy sgfambKcSggy)
+    {
+        return sgfambKcSggyMapper.selectSgfambKcSggyList(sgfambKcSggy);
+    }
+
+    /**
+     * 新增施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    @Override
+    public int insertSgfambKcSggy(SgfambKcSggy sgfambKcSggy)
+    {
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getZjgccs())){
+            sgfambKcSggy.setZjgccs(new String(Base64.decode(sgfambKcSggy.getZjgccs()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getGjfx())){
+            sgfambKcSggy.setGjfx(new String(Base64.decode(sgfambKcSggy.getGjfx()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getGjyh())){
+            sgfambKcSggy.setGjyh(new String(Base64.decode(sgfambKcSggy.getGjyh()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getZjycs())){
+            sgfambKcSggy.setZjycs(new String(Base64.decode(sgfambKcSggy.getZjycs()), StandardCharsets.UTF_8));
+        }
+        int i = sgfambKcSggyMapper.insertSgfambKcSggy(sgfambKcSggy);
+        return i;
+    }
+
+    /**
+     * 修改施工方案模板管理—开次-施工概要
+     * 
+     * @param sgfambKcSggy 施工方案模板管理—开次-施工概要
+     * @return 结果
+     */
+    @Override
+    public int updateSgfambKcSggy(SgfambKcSggy sgfambKcSggy)
+    {
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getZjgccs())){
+            sgfambKcSggy.setZjgccs(new String(Base64.decode(sgfambKcSggy.getZjgccs()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getGjfx())){
+            sgfambKcSggy.setGjfx(new String(Base64.decode(sgfambKcSggy.getGjfx()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getGjyh())){
+            sgfambKcSggy.setGjyh(new String(Base64.decode(sgfambKcSggy.getGjyh()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sgfambKcSggy.getZjycs())){
+            sgfambKcSggy.setZjycs(new String(Base64.decode(sgfambKcSggy.getZjycs()), StandardCharsets.UTF_8));
+        }
+        sgfambKcSggy.setUpdateTime(DateUtils.getNowDate());
+        return sgfambKcSggyMapper.updateSgfambKcSggy(sgfambKcSggy);
+    }
+
+    /**
+     * 批量删除施工方案模板管理—开次-施工概要
+     * 
+     * @param ids 需要删除的施工方案模板管理—开次-施工概要主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambKcSggyByIds(Long[] ids)
+    {
+        return sgfambKcSggyMapper.deleteSgfambKcSggyByIds(ids);
+    }
+
+    /**
+     * 删除施工方案模板管理—开次-施工概要信息
+     * 
+     * @param id 施工方案模板管理—开次-施工概要主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambKcSggyById(Long id)
+    {
+        return sgfambKcSggyMapper.deleteSgfambKcSggyById(id);
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SgfambKcxxServiceImpl.java

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import com.zjsgfa.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SgfambKcxxMapper;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+import com.zjsgfa.project.zjsgfa.service.ISgfambKcxxService;
+
+/**
+ * 施工方案模板管理—开次信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Service
+public class SgfambKcxxServiceImpl implements ISgfambKcxxService 
+{
+    @Autowired
+    private SgfambKcxxMapper sgfambKcxxMapper;
+
+    /**
+     * 查询施工方案模板管理—开次信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 施工方案模板管理—开次信息
+     */
+    @Override
+    public SgfambKcxx selectSgfambKcxxById(Long id)
+    {
+        return sgfambKcxxMapper.selectSgfambKcxxById(id);
+    }
+
+    /**
+     * 查询施工方案模板管理—开次信息列表
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 施工方案模板管理—开次信息
+     */
+    @Override
+    public List<SgfambKcxx> selectSgfambKcxxList(SgfambKcxx sgfambKcxx)
+    {
+        return sgfambKcxxMapper.selectSgfambKcxxList(sgfambKcxx);
+    }
+
+    /**
+     * 新增施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    @Override
+    public int insertSgfambKcxx(SgfambKcxx sgfambKcxx)
+    {
+        return sgfambKcxxMapper.insertSgfambKcxx(sgfambKcxx);
+    }
+
+    /**
+     * 修改施工方案模板管理—开次信息
+     * 
+     * @param sgfambKcxx 施工方案模板管理—开次信息
+     * @return 结果
+     */
+    @Override
+    public int updateSgfambKcxx(SgfambKcxx sgfambKcxx)
+    {
+        sgfambKcxx.setUpdateTime(DateUtils.getNowDate());
+        return sgfambKcxxMapper.updateSgfambKcxx(sgfambKcxx);
+    }
+
+    /**
+     * 批量删除施工方案模板管理—开次信息
+     * 
+     * @param ids 需要删除的施工方案模板管理—开次信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambKcxxByIds(Long[] ids)
+    {
+        return sgfambKcxxMapper.deleteSgfambKcxxByIds(ids);
+    }
+
+    /**
+     * 删除施工方案模板管理—开次信息信息
+     * 
+     * @param id 施工方案模板管理—开次信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambKcxxById(Long id)
+    {
+        return sgfambKcxxMapper.deleteSgfambKcxxById(id);
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SgfambServiceImpl.java

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import com.zjsgfa.common.utils.DateUtils;
+import com.zjsgfa.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.zjsgfa.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.zjsgfa.project.zjsgfa.domain.SgfambKcxx;
+import com.zjsgfa.project.zjsgfa.mapper.SgfambMapper;
+import com.zjsgfa.project.zjsgfa.domain.Sgfamb;
+import com.zjsgfa.project.zjsgfa.service.ISgfambService;
+
+/**
+ * 施工方案模板管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-23
+ */
+@Service
+public class SgfambServiceImpl implements ISgfambService 
+{
+    @Autowired
+    private SgfambMapper sgfambMapper;
+
+    /**
+     * 查询施工方案模板管理
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 施工方案模板管理
+     */
+    @Override
+    public Sgfamb selectSgfambById(Long id)
+    {
+        return sgfambMapper.selectSgfambById(id);
+    }
+
+    /**
+     * 查询施工方案模板管理列表
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 施工方案模板管理
+     */
+    @Override
+    public List<Sgfamb> selectSgfambList(Sgfamb sgfamb)
+    {
+        return sgfambMapper.selectSgfambList(sgfamb);
+    }
+
+    /**
+     * 新增施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertSgfamb(Sgfamb sgfamb)
+    {
+        sgfamb.setCreatedBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        int rows = sgfambMapper.insertSgfamb(sgfamb);
+        return rows;
+    }
+
+    /**
+     * 修改施工方案模板管理
+     * 
+     * @param sgfamb 施工方案模板管理
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateSgfamb(Sgfamb sgfamb)
+    {
+        sgfamb.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        sgfamb.setUpdateTime(DateUtils.getNowDate());
+        return sgfambMapper.updateSgfamb(sgfamb);
+    }
+
+    /**
+     * 批量删除施工方案模板管理
+     * 
+     * @param ids 需要删除的施工方案模板管理主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSgfambByIds(Long[] ids)
+    {
+        sgfambMapper.deleteSgfambKcxxByZbids(ids);
+        return sgfambMapper.deleteSgfambByIds(ids);
+    }
+
+    /**
+     * 删除施工方案模板管理信息
+     * 
+     * @param id 施工方案模板管理主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteSgfambById(Long id)
+    {
+        sgfambMapper.deleteSgfambKcxxByZbid(id);
+        return sgfambMapper.deleteSgfambById(id);
+    }
+
+
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SgfambTjpzServiceImpl.java

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import com.zjsgfa.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SgfambTjpzMapper;
+import com.zjsgfa.project.zjsgfa.domain.SgfambTjpz;
+import com.zjsgfa.project.zjsgfa.service.ISgfambTjpzService;
+
+/**
+ * 施工方案模板-条件配置Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-25
+ */
+@Service
+public class SgfambTjpzServiceImpl implements ISgfambTjpzService 
+{
+    @Autowired
+    private SgfambTjpzMapper sgfambTjpzMapper;
+
+    /**
+     * 查询施工方案模板-条件配置
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 施工方案模板-条件配置
+     */
+    @Override
+    public SgfambTjpz selectSgfambTjpzById(Long id)
+    {
+        return sgfambTjpzMapper.selectSgfambTjpzById(id);
+    }
+
+    /**
+     * 查询施工方案模板-条件配置列表
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 施工方案模板-条件配置
+     */
+    @Override
+    public List<SgfambTjpz> selectSgfambTjpzList(SgfambTjpz sgfambTjpz)
+    {
+        return sgfambTjpzMapper.selectSgfambTjpzList(sgfambTjpz);
+    }
+
+    /**
+     * 新增施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    @Override
+    public int insertSgfambTjpz(SgfambTjpz sgfambTjpz)
+    {
+        return sgfambTjpzMapper.insertSgfambTjpz(sgfambTjpz);
+    }
+
+    /**
+     * 修改施工方案模板-条件配置
+     * 
+     * @param sgfambTjpz 施工方案模板-条件配置
+     * @return 结果
+     */
+    @Override
+    public int updateSgfambTjpz(SgfambTjpz sgfambTjpz)
+    {
+        sgfambTjpz.setUpdateTime(DateUtils.getNowDate());
+        return sgfambTjpzMapper.updateSgfambTjpz(sgfambTjpz);
+    }
+
+    /**
+     * 批量删除施工方案模板-条件配置
+     * 
+     * @param ids 需要删除的施工方案模板-条件配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambTjpzByIds(Long[] ids)
+    {
+        return sgfambTjpzMapper.deleteSgfambTjpzByIds(ids);
+    }
+
+    /**
+     * 删除施工方案模板-条件配置信息
+     * 
+     * @param id 施工方案模板-条件配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSgfambTjpzById(Long id)
+    {
+        return sgfambTjpzMapper.deleteSgfambTjpzById(id);
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java

@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.service.impl;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -34,6 +35,9 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
     private SjLjjwMapper sjLjjwMapper;
 
     @Autowired
+    private SjQkztfxMapper sjQkztfxMapper;
+
+    @Autowired
     private SjFdsgcsDcyxMapper sjFdsgcsDcyxMapper;
 
     @Autowired
@@ -186,6 +190,10 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
         SjLjjw sjLjjw =new SjLjjw();
         sjLjjw.setJh(sjFdsgcs.getJh());
         List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw);
+        SjQkztfx sjQkztfx =new SjQkztfx();
+        sjQkztfx.setJh(sjFdsgcs.getJh());
+        List<SjQkztfx> sjQkztfxes = sjQkztfxMapper.selectSjQkztfxList(sjQkztfx);
+
 
         List<ClFxsb> clFxsbList = clFxsbMapper.selectClFxsbList(new ClFxsb());
 
@@ -194,6 +202,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
         List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
 
         List<String> collect = sjLjjwList.stream().map(SjLjjw::getLjjh).collect(Collectors.toList());
+
+
         double previousDepth= 0;
         double csaa= 0;
         for (int i = 0; i < sjJsjgList.size(); i++) {
@@ -207,6 +217,16 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
             String kc = sjJsjg1.getKc();
             sjFdsgcs.setKc(kc);
             SjFdsgcs sjFdsgcs1 =sjFdsgcsMapper.selectSjFdsgcsByJhAndKc(sjFdsgcs);
+            List<String> fzqk=new ArrayList<>();
+            //查询一趟钻率
+            int kc1=i+1;
+            List<SjQkztfx> collect1 = sjQkztfxes.stream().filter(it -> it.getKc().equals(kc1 + "")).collect(Collectors.toList());
+            SjQkztfx sjQkztfx1 = collect1.stream().max(Comparator.comparing(SjQkztfx::getYtzl)).get();
+            Double ytzl=0.0;
+            if(sjQkztfx1!=null){
+                ytzl=sjQkztfx1.getYtzl();
+            }
+
             if(sjFdsgcs1==null){
                 //查询是否有复杂情况
                 if(collect.size()>0){
@@ -218,7 +238,6 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
                     String zjgccs="";
                     String zyfx="";
                     if(jsqaList.size()>0){
-                        List<String> fzqk=new ArrayList<>();
                         for(Jsqa item: jsqaList){
                             fzqk.add(item.getJh()+"在"+item.getJs()+"时发生"+item.getFzqk());
                             if(StringUtils.isNotEmpty(zjycs)){
@@ -292,10 +311,13 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
                         sjFdsgcs.setZyfx(zyfx);
                         sjFdsgcs.setTzqk(String.join(";",fzqk));
                     }else {
+                        if(ytzl>0&& ytzl!=100){
+
+                        }
+                        String tzqk="邻井一趟钻率为"+ytzl+"%，实现一趟钻完成率为"+ytzl+"%";
                         sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
+
                     }
-                }else {
-                    sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
                 }
                 //井段情况
                 double cs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg1.getJs());
@@ -325,7 +347,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
                     String zjgccs="";
                     String zyfx="";
                     if(jsqaList.size()>0){
-                        List<String> fzqk=new ArrayList<>();
+//                        List<String> fzqk=new ArrayList<>();
                         for(Jsqa item: jsqaList){
                             fzqk.add(item.getJh()+"在"+item.getJs()+"时发生"+item.getFzqk());
                             if(StringUtils.isNotEmpty(zjycs)){

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

@@ -5,6 +5,7 @@ import com.google.gson.*;
 import com.zjsgfa.common.utils.poi.ExcelUtil;
 import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zt.domain.*;
+import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.service.DjdcService;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -254,6 +255,9 @@ public class DjdcController {
             case  "getGzbjList":
                 //获取高指标井
                 return AjaxResult.success( djdcService.getGzbjList(param));
+            case  "getJsgaList":
+                //获取高指标井
+                return AjaxResult.success( djdcService.getJsgaList(param));
             default:
                 return AjaxResult.success();
         }
@@ -333,6 +337,12 @@ public class DjdcController {
                 ExcelUtil<Zsjfx> zsjfxExcelUtil = new ExcelUtil<Zsjfx>(Zsjfx.class);
                 zsjfxExcelUtil.exportExcel(response, zsjList, "Sheet1");
                 break;
+            case "exportJsgaList":
+                //导出
+                List<JsgaVo> jsgaList = djdcService.getJsgaList(param);
+                ExcelUtil<JsgaVo> jsgaExcelUtil = new ExcelUtil<JsgaVo>(JsgaVo.class);
+                jsgaExcelUtil.exportExcel(response, jsgaList, "Sheet1");
+                break;
             default:
                 break;
         }

src/main/java/com/zjsgfa/project/zt/domain/CommonParam.java

@@ -3,6 +3,7 @@ package com.zjsgfa.project.zt.domain;
 import com.zjsgfa.project.zt.domain.vo.SjInfo;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -29,7 +30,7 @@ public class CommonParam {
     private String qk;
 
     //设计井信息
-    private List<SjInfo> sj;
+    private List<SjInfo> sj=new ArrayList<>();
 
     //开始完井时间
     private String wjsjks;
@@ -69,6 +70,11 @@ public class CommonParam {
 
 
 
+    private Double ksjs;
+
+
+
+
     private String dc;
 
 }

src/main/java/com/zjsgfa/project/zt/domain/Jsga.java

+package com.zjsgfa.project.zt.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * JSGA表对应的实体类
+ */
+@Data
+public class Jsga {
+    // 编号
+    private String jh;
+    // 取样日期
+    private Date qyrq;
+    // 取样时间
+    private String qysj;
+    // 取样井深
+    private Double qyjs;
+    private Double ckwd;
+    private Double md;
+    private Double nd;
+    private Double hsl;
+    private Double ph;
+    private Double jql1;
+    private Double jql2;
+    private Double lsl;
+    private Double nbh;
+    private Double mcxs;
+    private Double xzndsds1;
+    private Double xzndsds2;
+    private Double xzndsds3;
+    private Double gwgylsl;
+    private Double gwgylsnbh;
+    private Double hyl;
+    private Double hsl2;
+    private Double zxhl;
+    private Double zgxl;
+    private Double mbthl;
+    private Double clhl;
+    private Double cahl;
+    private Double khl;
+    private Double pmhl;
+    private Double pfmfhl;
+    private Double zkhd;
+    private Double lgby;
+    private String zjylx;
+    private String bz;
+    private Double sxnd;
+    private Double dql;
+    private String dccw;
+
+}
\ No newline at end of file

src/main/java/com/zjsgfa/project/zt/domain/LjGzbj.java

@@ -25,4 +25,6 @@ public class LjGzbj {
     private Double sjts;
     //钻速（m/h）
     private Double zs;
+
+    private Double zb;
 }

src/main/java/com/zjsgfa/project/zt/domain/vo/JsgaVo.java

+package com.zjsgfa.project.zt.domain.vo;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class JsgaVo {
+
+    @Excel(name = "井号")
+    private String jh;
+    @Excel(name = "起始井深")
+    private Double qsjs;
+    @Excel(name = "钻至井深")
+    private Double zzjs;
+    @Excel(name = "进尺")
+    private Double jc;
+    @Excel(name = "机械转速")
+    private Double jxzs;
+    @Excel(name = "地层层位")
+    private String dccw;
+
+    private Double js;
+
+    private Double ksjs;
+    @Excel(name = "取样井深")
+    private String jd;
+
+    @Excel(name = "密度")
+    private String md;
+    @Excel(name = "漏斗粘度")
+    private String nd;
+    @Excel(name = "含砂")
+    private String hsl;
+    @Excel(name = "PH值")
+    private String ph;
+    @Excel(name = "静切力10s")
+    private String jql1;
+    @Excel(name = "静切力10min")
+    private String jql2;
+    @Excel(name = "滤失量")
+    private String lsl;
+    @Excel(name = "泥饼厚")
+    private String nbh;
+    @Excel(name = "摩擦系数")
+    private String mcxs;
+    @Excel(name = "复杂情况")
+    private String fzqk;
+    @Excel(name = "发生经过")
+    private String fsjgjyy;
+    @Excel(name = "处理概括")
+    private String clgk;
+
+
+}

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

@@ -3,6 +3,7 @@ package com.zjsgfa.project.zt.mapper;
 import com.zjsgfa.framework.aspectj.lang.annotation.DataSource;
 import com.zjsgfa.framework.aspectj.lang.enums.DataSourceType;
 import com.zjsgfa.project.zt.domain.*;
+import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -55,4 +56,7 @@ public interface DjdcInfoMapper {
 
     List<LjGzbj> getGzbjList(CommonParam param);
 
+    List<JsgaVo> getJsgaList(CommonParam param);
+
+
 }

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

@@ -4,6 +4,7 @@ package com.zjsgfa.project.zt.service;
 import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zjsgfa.domain.SjDcfxDzfc;
 import com.zjsgfa.project.zt.domain.*;
+import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 
 import java.util.List;
 import java.util.Map;
@@ -59,4 +60,7 @@ public interface DjdcService {
     Djjc selectZtsj(Djjc djjc);
 
     List<LjGzbj> getGzbjList(CommonParam param);
+
+    List<JsgaVo> getJsgaList(CommonParam param);
+
 }

src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java

@@ -13,6 +13,7 @@ import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zjsgfa.domain.*;
 import com.zjsgfa.project.zjsgfa.mapper.*;
 import com.zjsgfa.project.zt.domain.*;
+import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.domain.vo.SjInfo;
 import com.zjsgfa.project.zt.mapper.*;
 import com.zjsgfa.project.zt.service.DjdcService;
@@ -872,6 +873,10 @@ public class DjdcServiceImpl implements DjdcService {
 
     @Override
     public List<DjZtfx> getDjZtfxList(CommonParam param) {
+        if(StringUtils.isNotEmpty(param.getJh())){
+            String[] jhs = param.getJh().split(",");
+            param.setJhs(jhs);
+        }
         return djdcInfoMapper.getDjZtfxList(param);
     }
 
@@ -888,13 +893,12 @@ public class DjdcServiceImpl implements DjdcService {
         //根据qk获取钻头分析
         List<DjZtfx> djZtfxList = djdcInfoMapper.getDjZtfxList(param);
         //根据井号取钻头关键数据
-        List<Djjc> djjcList = getDjjcList(param);
+//        List<Djjc> djjcList = getDjjcList(param);
 
         DecimalFormat df = new DecimalFormat("#.00");
         List<SjInfo> sjInfoList = param.getSj();
 
 
-
         for(SjInfo info :sjInfoList){
             List<SjInfo> reList =new ArrayList<>();
 
@@ -994,6 +998,9 @@ public class DjdcServiceImpl implements DjdcService {
             }
 
             List<SjInfo> collect1 = reList.stream().distinct().collect(Collectors.toList());
+
+
+
             //计算得分
             calculateScores(collect1);
 
@@ -1075,22 +1082,22 @@ public class DjdcServiceImpl implements DjdcService {
 
             //钻头关键数据（匹配数据）
             List<SjInfo> collect3=new ArrayList<>();
-            List<Djjc> ztppList = djjcList.stream().filter(dj -> equals(dj.getZtcc(),info.getZtcc() )  && info.getKc().equals(dj.getKc())).collect(Collectors.toList());
-            ztppList.forEach(ztpp->{
-                SjInfo sjInfo=new SjInfo();
-                sjInfo.setKc(ztpp.getKc());
-                sjInfo.setZtcc(ztpp.getZtcc());
-                sjInfo.setZtxh(ztpp.getZtxh());
-                sjInfo.setJc(ztpp.getJc()==null?0.0:ztpp.getJc());
-                sjInfo.setJs(ztpp.getJxzs() ==null?0.0:ztpp.getJxzs());
-                sjInfo.setZb(ztpp.getZb());
-                sjInfo.setSl(1);
-                sjInfo.setGnmk("钻头关键数据");
-                collect3.add(sjInfo);
-            });
-
-            calculateScores(collect3);
-            collect1.addAll(collect3);
+//            List<Djjc> ztppList = djjcList.stream().filter(dj -> equals(dj.getZtcc(),info.getZtcc() )  && info.getKc().equals(dj.getKc())).collect(Collectors.toList());
+//            ztppList.forEach(ztpp->{
+//                SjInfo sjInfo=new SjInfo();
+//                sjInfo.setKc(ztpp.getKc());
+//                sjInfo.setZtcc(ztpp.getZtcc());
+//                sjInfo.setZtxh(ztpp.getZtxh());
+//                sjInfo.setJc(ztpp.getJc()==null?0.0:ztpp.getJc());
+//                sjInfo.setJs(ztpp.getJxzs() ==null?0.0:ztpp.getJxzs());
+//                sjInfo.setZb(ztpp.getZb());
+//                sjInfo.setSl(1);
+//                sjInfo.setGnmk("钻头关键数据");
+//                collect3.add(sjInfo);
+//            });
+
+//            calculateScores(collect3);
+//            collect1.addAll(collect3);
             for(SjInfo sjInfodf:collect1){
                 LjZtzhdf ljZtzhdf=new LjZtzhdf();
                 ljZtzhdf.setKc(sjInfodf.getKc());
@@ -1105,7 +1112,6 @@ public class DjdcServiceImpl implements DjdcService {
                     ljZtzhdfList.add(ljZtzhdf);
                 }
             }
-
         }
         List<LjZtdfzh> ljZtdfzhList= new ArrayList<>();
         //去重
@@ -1121,7 +1127,7 @@ public class DjdcServiceImpl implements DjdcService {
                 ljZtdfzh.setCc(item.getCc());
                 ljZtdfzh.setJcdf(Double.parseDouble(df.format(item.getJcdf()+(item.getJsdf()*0.25))));
                 ljZtdfzh.setJsdf(Double.parseDouble(df.format(item.getJsdf()+(item.getJcdf()*0.25))));
-                ljZtdfzh.setZhdf(Double.parseDouble(df.format((item.getJcdf()*0.5)+(item.getJcdf()*5))));
+                ljZtdfzh.setZhdf(Double.parseDouble(df.format((item.getJcdf()*0.5)+(item.getJsdf()*0.5)+item.getSldf())));
                 ljZtdfzhMapper.insertLjZtdfzh(ljZtdfzh);
                 ljZtdfzhList.add(ljZtdfzh);
             }
@@ -1659,6 +1665,8 @@ public class DjdcServiceImpl implements DjdcService {
 
                     if(collect.size()>0){
                         ljDzfc.setGzts(String.join( ",",collect.stream().distinct().collect(Collectors.toList())));
+                    }else {
+                        ljDzfc.setGzts("无");
                     }
 
                     Map<String, List<LjDcyx>> map = ljDcyxes1.stream().collect(
@@ -1688,6 +1696,8 @@ public class DjdcServiceImpl implements DjdcService {
                 }
                 if(yqcts.size()>0){
                     ljDzfc.setYqsts(String.join( ",",yqcts));
+                }else {
+                    ljDzfc.setYqsts("无");
                 }
 
 
@@ -1764,6 +1774,8 @@ public class DjdcServiceImpl implements DjdcService {
                     List<String> tsyx = tsyxclxxes.stream().filter(tsyxclxx -> tsyxclxx.getTsyx().contains(sjDcfxDzfc.getYxts())).map(Tsyxclxx::getWt).collect(Collectors.toList());
                     if(tsyx.size()>0){
                         sjDcfxDzfc.setGzts(String.join( ",",tsyx));
+                    }else {
+                        sjDcfxDzfc.setGzts("无");
                     }
                 }
 
@@ -1908,9 +1920,46 @@ public class DjdcServiceImpl implements DjdcService {
 
     @Override
     public List<LjGzbj> getGzbjList(CommonParam param) {
+        //查询临井
+        if(StringUtils.isNotEmpty(param.getJh())){
+            String[] jhs = param.getJh().split(",");
+            param.setJhs(jhs);
+        }
         return djdcInfoMapper.getGzbjList(param);
     }
 
+    @Override
+    public List<JsgaVo> getJsgaList(CommonParam param) {
+        //查询临井
+        if(StringUtils.isNotEmpty(param.getJh())){
+            String[] jhs = param.getJh().split(",");
+            param.setJhs(jhs);
+        }
+        List<JsgaVo> list =djdcInfoMapper.getJsgaList(param);
+        for(JsgaVo item:list){
+            if(StringUtils.isNotEmpty(item.getFzqk())){
+                String[] split = item.getFzqk().split("@");
+                List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList());
+                item.setFzqk(String.join(",",collect));
+            }
+            if(StringUtils.isNotEmpty(item.getFsjgjyy())){
+                String[] split = item.getFsjgjyy().split("@");
+                List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList());
+                item.setFsjgjyy(String.join(",",collect));
+            }
+            if(StringUtils.isNotEmpty(item.getClgk())){
+                String[] split = item.getClgk().split("@");
+                List<String> collect = Arrays.stream(split).distinct().collect(Collectors.toList());
+                item.setClgk(String.join(",",collect));
+            }
+        }
+
+
+
+
+        return list;
+    }
+
     /**
      * 计算斜深
      * @param a 层位垂深
@@ -1971,11 +2020,11 @@ public class DjdcServiceImpl implements DjdcService {
                 SjInfo item = jsSorted.get(i);
                 double score = 0.0;
                 if (i == 0) {
-                    score = 0.25;
+                    score = 1;
                 } else if (i == 1 && item.getJs() == maxJs) {
-                    score = 0.25; // 并列第一
+                    score = 1; // 并列第一
                 } else if (i == 1) {
-                    score = 0.25 * 0.8; // 第二名
+                    score = 0.8; // 第二名
                 }
                 item.setJsScore(score);
             }
@@ -1988,11 +2037,11 @@ public class DjdcServiceImpl implements DjdcService {
                 SjInfo item = slSorted.get(i);
                 double score = 0.0;
                 if (i == 0) {
-                    score = 0.5;
+                    score = 1;
                 } else if (i == 1 && item.getSl() == maxSl) {
-                    score = 0.5; // 并列第一
+                    score = 1; // 并列第一
                 } else if (i == 1) {
-                    score = 0.5 * 0.8; // 第二名
+                    score = 0.8; // 第二名
                 }
                 item.setSlScore(score);
             }

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

@@ -14,10 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdTime"    column="created_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="jhlist"    column="jhlist"    />
+        <result property="sfgk"    column="sfgk"    />
     </resultMap>
 
     <sql id="selectCxtjVo">
-        select id, cxtjmc, qk, jh, bz, created_by, created_time, update_by, update_time from cxtj
+        select id, cxtjmc, qk, jh, bz, created_by, created_time, update_by, update_time, jhlist, sfgk from cxtj
     </sql>
 
     <select id="selectCxtjList" parameterType="Cxtj" resultMap="CxtjResult">
@@ -27,8 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qk != null  and qk != ''"> and qk = #{qk}</if>
             <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
             <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
-            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="createdBy != null  and createdBy != ''"> and (created_by = #{createdBy} or sfgk='是')</if>
             <if test="createdTime != null "> and created_time = #{createdTime}</if>
+            <if test="sfgk != null "> and sfgk = #{sfgk}</if>
         </where>
         order by created_time desc
     </select>
@@ -49,6 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="jhlist != null">jhlist,</if>
+            <if test="sfgk != null">sfgk,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cxtjmc != null">#{cxtjmc},</if>
@@ -59,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="jhlist != null">#{jhlist},</if>
+            <if test="sfgk != null">#{sfgk},</if>
          </trim>
     </insert>
 
@@ -73,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="jhlist != null">jhlist = #{jhlist},</if>
+            <if test="sfgk != null">sfgk = #{sfgk},</if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mybatis/zjsgfa/SgfambKcSggyMapper.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.zjsgfa.project.zjsgfa.mapper.SgfambKcSggyMapper">
+    
+    <resultMap type="SgfambKcSggy" id="SgfambKcSggyResult">
+        <result property="id"    column="id"    />
+        <result property="zbid"    column="zbid"    />
+        <result property="kc"    column="kc"    />
+        <result property="ksjs"    column="ksjs"    />
+        <result property="jsjs"    column="jsjs"    />
+        <result property="ztxh"    column="ztxh"    />
+        <result property="zjzy"    column="zjzy"    />
+        <result property="zjzs"    column="zjzs"    />
+        <result property="zjpl"    column="zjpl"    />
+        <result property="zjby"    column="zjby"    />
+        <result property="zjzh"    column="zjzh"    />
+        <result property="zjzhzysx"    column="zjzhzysx"    />
+        <result property="gjfx"    column="gjfx"    />
+        <result property="gjyh"    column="gjyh"    />
+        <result property="zjycs"    column="zjycs"    />
+        <result property="zjgccs"    column="zjgccs"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="zttjid"    column="zttjid"    />
+        <result property="zjzhtjid"    column="zjzhtjid"    />
+        <result property="sgcstjid"    column="sgcstjid"    />
+        <result property="tjmc"    column="tjmc"    />
+    </resultMap>
+
+    <sql id="selectSgfambKcSggyVo">
+        select id, zbid, kc, ksjs, jsjs, ztxh, zjzy, zjzs, zjpl, zjby, zjzh, zjzhzysx, gjfx, gjyh, zjycs,
+               zjgccs, created_by, created_time, update_by, update_time, zttjid,zjzhtjid,sgcstjid,tjmc from sgfamb_kc_sggy
+    </sql>
+
+    <select id="selectSgfambKcSggyList" parameterType="SgfambKcSggy" resultMap="SgfambKcSggyResult">
+        <include refid="selectSgfambKcSggyVo"/>
+        <where>  
+            <if test="zbid != null "> and zbid = #{zbid}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="ksjs != null "> and ksjs = #{ksjs}</if>
+            <if test="jsjs != null "> and jsjs = #{jsjs}</if>
+            <if test="ztxh != null  and ztxh != ''"> and ztxh = #{ztxh}</if>
+            <if test="zjzy != null  and zjzy != ''"> and zjzy = #{zjzy}</if>
+            <if test="zjzs != null  and zjzs != ''"> and zjzs = #{zjzs}</if>
+            <if test="zjpl != null  and zjpl != ''"> and zjpl = #{zjpl}</if>
+            <if test="zjby != null  and zjby != ''"> and zjby = #{zjby}</if>
+            <if test="zjzh != null  and zjzh != ''"> and zjzh = #{zjzh}</if>
+            <if test="zjzhzysx != null  and zjzhzysx != ''"> and zjzhzysx = #{zjzhzysx}</if>
+            <if test="gjfx != null  and gjfx != ''"> and gjfx = #{gjfx}</if>
+            <if test="gjyh != null  and gjyh != ''"> and gjyh = #{gjyh}</if>
+            <if test="zjycs != null  and zjycs != ''"> and zjycs = #{zjycs}</if>
+            <if test="zjgccs != null  and zjgccs != ''"> and zjgccs = #{zjgccs}</if>
+            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="createdTime != null "> and created_time = #{createdTime}</if>
+            <if test="zttjid != null "> and zttjid = #{zttjid}</if>
+            <if test="zjzhtjid != null "> and zjzhtjid = #{zjzhtjid}</if>
+            <if test="sgcstjid != null "> and sgcstjid = #{sgcstjid}</if>
+            <if test="tjmc != null "> and tjmc = #{tjmc}</if>
+        </where>
+    </select>
+    
+    <select id="selectSgfambKcSggyById" parameterType="Long" resultMap="SgfambKcSggyResult">
+        <include refid="selectSgfambKcSggyVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectSgfambKcSggyByZbid" resultType="com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy">
+        <include refid="selectSgfambKcSggyVo"/>
+        where zbid = #{faid}
+    </select>
+    <select id="selectSgfambKcSggyListByQk" resultType="com.zjsgfa.project.zjsgfa.domain.SgfambKcSggy">
+        select a.*,b.qk from sgfamb_kc_sggy a left join sgfamb b on a.zbid=b.id
+        where 1=1
+        <if  test="qk != null">
+            and qk = #{qk}
+        </if>
+    </select>
+
+    <insert id="insertSgfambKcSggy" parameterType="SgfambKcSggy" useGeneratedKeys="true" keyProperty="id">
+        insert into sgfamb_kc_sggy
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">zbid,</if>
+            <if test="kc != null">kc,</if>
+            <if test="ksjs != null">ksjs,</if>
+            <if test="jsjs != null">jsjs,</if>
+            <if test="ztxh != null">ztxh,</if>
+            <if test="zjzy != null">zjzy,</if>
+            <if test="zjzs != null">zjzs,</if>
+            <if test="zjpl != null">zjpl,</if>
+            <if test="zjby != null">zjby,</if>
+            <if test="zjzh != null">zjzh,</if>
+            <if test="zjzhzysx != null">zjzhzysx,</if>
+            <if test="gjfx != null">gjfx,</if>
+            <if test="gjyh != null">gjyh,</if>
+            <if test="zjycs != null">zjycs,</if>
+            <if test="zjgccs != null">zjgccs,</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>
+            <if test="zttjid != null">zttjid,</if>
+            <if test="zjzhtjid != null">zjzhtjid,</if>
+            <if test="sgcstjid != null">sgcstjid,</if>
+            <if test="tjmc != null">tjmc,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">#{zbid},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="ksjs != null">#{ksjs},</if>
+            <if test="jsjs != null">#{jsjs},</if>
+            <if test="ztxh != null">#{ztxh},</if>
+            <if test="zjzy != null">#{zjzy},</if>
+            <if test="zjzs != null">#{zjzs},</if>
+            <if test="zjpl != null">#{zjpl},</if>
+            <if test="zjby != null">#{zjby},</if>
+            <if test="zjzh != null">#{zjzh},</if>
+            <if test="zjzhzysx != null">#{zjzhzysx},</if>
+            <if test="gjfx != null">#{gjfx},</if>
+            <if test="gjyh != null">#{gjyh},</if>
+            <if test="zjycs != null">#{zjycs},</if>
+            <if test="zjgccs != null">#{zjgccs},</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>
+            <if test="zttjid != null">#{zttjid},</if>
+            <if test="zjzhtjid != null">#{zjzhtjid},</if>
+            <if test="sgcstjid != null">#{sgcstjid},</if>
+            <if test="tjmc != null">#{tjmc},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSgfambKcSggy" parameterType="SgfambKcSggy">
+        update sgfamb_kc_sggy
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbid != null">zbid = #{zbid},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="ksjs != null">ksjs = #{ksjs},</if>
+            <if test="jsjs != null">jsjs = #{jsjs},</if>
+            <if test="ztxh != null">ztxh = #{ztxh},</if>
+            <if test="zjzy != null">zjzy = #{zjzy},</if>
+            <if test="zjzs != null">zjzs = #{zjzs},</if>
+            <if test="zjpl != null">zjpl = #{zjpl},</if>
+            <if test="zjby != null">zjby = #{zjby},</if>
+            <if test="zjzh != null">zjzh = #{zjzh},</if>
+            <if test="zjzhzysx != null">zjzhzysx = #{zjzhzysx},</if>
+            <if test="gjfx != null">gjfx = #{gjfx},</if>
+            <if test="gjyh != null">gjyh = #{gjyh},</if>
+            <if test="zjycs != null">zjycs = #{zjycs},</if>
+            <if test="zjgccs != null">zjgccs = #{zjgccs},</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>
+            <if test="zttjid != null">zttjid = #{zttjid},</if>
+            <if test="sgcstjid != null">sgcstjid = #{sgcstjid},</if>
+            <if test="zjzhtjid != null">zjzhtjid = #{zjzhtjid},</if>
+            <if test="tjmc != null">tjmc = #{tjmc},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSgfambKcSggyById" parameterType="Long">
+        delete from sgfamb_kc_sggy where id = #{id}
+    </delete>
+
+    <delete id="deleteSgfambKcSggyByIds" parameterType="String">
+        delete from sgfamb_kc_sggy 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/SgfambKcxxMapper.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.zjsgfa.project.zjsgfa.mapper.SgfambKcxxMapper">
+    
+    <resultMap type="SgfambKcxx" id="SgfambKcxxResult">
+        <result property="id"    column="id"    />
+        <result property="zbid"    column="zbid"    />
+        <result property="kc"    column="kc"    />
+        <result property="ksjs"    column="ksjs"    />
+        <result property="jsjs"    column="jsjs"    />
+        <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="selectSgfambKcxxVo">
+        select id, zbid, kc, ksjs, jsjs, created_by, created_time, update_by, update_time from sgfamb_kcxx
+    </sql>
+
+    <select id="selectSgfambKcxxList" parameterType="SgfambKcxx" resultMap="SgfambKcxxResult">
+        <include refid="selectSgfambKcxxVo"/>
+        <where>  
+            <if test="zbid != null "> and zbid = #{zbid}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="ksjs != null "> and ksjs = #{ksjs}</if>
+            <if test="jsjs != null "> and jsjs = #{jsjs}</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="selectSgfambKcxxById" parameterType="Long" resultMap="SgfambKcxxResult">
+        <include refid="selectSgfambKcxxVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSgfambKcxx" parameterType="SgfambKcxx" useGeneratedKeys="true" keyProperty="id">
+        insert into sgfamb_kcxx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">zbid,</if>
+            <if test="kc != null">kc,</if>
+            <if test="ksjs != null">ksjs,</if>
+            <if test="jsjs != null">jsjs,</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="zbid != null">#{zbid},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="ksjs != null">#{ksjs},</if>
+            <if test="jsjs != null">#{jsjs},</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="updateSgfambKcxx" parameterType="SgfambKcxx">
+        update sgfamb_kcxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbid != null">zbid = #{zbid},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="ksjs != null">ksjs = #{ksjs},</if>
+            <if test="jsjs != null">jsjs = #{jsjs},</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="deleteSgfambKcxxById" parameterType="Long">
+        delete from sgfamb_kcxx where id = #{id}
+    </delete>
+
+    <delete id="deleteSgfambKcxxByIds" parameterType="String">
+        delete from sgfamb_kcxx 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/SgfambMapper.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.zjsgfa.project.zjsgfa.mapper.SgfambMapper">
+    
+    <resultMap type="Sgfamb" id="SgfambResult">
+        <result property="id"    column="id"    />
+        <result property="mbmc"    column="mbmc"    />
+        <result property="qk"    column="qk"    />
+        <result property="bz"    column="bz"    />
+        <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>
+
+
+    <resultMap type="SgfambKcxx" id="SgfambKcxxResult">
+        <result property="id"    column="id"    />
+        <result property="zbid"    column="zbid"    />
+        <result property="kc"    column="kc"    />
+        <result property="ksjs"    column="ksjs"    />
+        <result property="jsjs"    column="jsjs"    />
+        <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="selectSgfambVo">
+        select id, mbmc, qk, bz, created_by, created_time, update_by, update_time from sgfamb
+    </sql>
+
+    <select id="selectSgfambList" parameterType="Sgfamb" resultMap="SgfambResult">
+        <include refid="selectSgfambVo"/>
+        <where>  
+            <if test="mbmc != null  and mbmc != ''"> and mbmc like  concat('%', #{mbmc}, '%')</if>
+            <if test="qk != null  and qk != ''"> and qk = #{qk}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</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="selectSgfambById" parameterType="Long" resultMap="SgfambResult">
+        select id, mbmc, qk, bz, created_by, created_time, update_by, update_time
+        from sgfamb
+        where id = #{id}
+    </select>
+
+    <insert id="insertSgfamb" parameterType="Sgfamb" useGeneratedKeys="true" keyProperty="id">
+        insert into sgfamb
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="mbmc != null">mbmc,</if>
+            <if test="qk != null">qk,</if>
+            <if test="bz != null">bz,</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="mbmc != null">#{mbmc},</if>
+            <if test="qk != null">#{qk},</if>
+            <if test="bz != null">#{bz},</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="updateSgfamb" parameterType="Sgfamb">
+        update sgfamb
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="mbmc != null">mbmc = #{mbmc},</if>
+            <if test="qk != null">qk = #{qk},</if>
+            <if test="bz != null">bz = #{bz},</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="deleteSgfambById" parameterType="Long">
+        delete from sgfamb where id = #{id}
+    </delete>
+
+    <delete id="deleteSgfambByIds" parameterType="String">
+        delete from sgfamb 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/SgfambTjpzMapper.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.zjsgfa.project.zjsgfa.mapper.SgfambTjpzMapper">
+    
+    <resultMap type="SgfambTjpz" id="SgfambTjpzResult">
+        <result property="id"    column="id"    />
+        <result property="tjmc"    column="tjmc"    />
+        <result property="lb"    column="lb"    />
+        <result property="bz"    column="bz"    />
+        <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="selectSgfambTjpzVo">
+        select id, tjmc, lb, bz, created_by, created_time, update_by, update_time from sgfamb_tjpz
+    </sql>
+
+    <select id="selectSgfambTjpzList" parameterType="SgfambTjpz" resultMap="SgfambTjpzResult">
+        <include refid="selectSgfambTjpzVo"/>
+        <where>  
+            <if test="tjmc != null  and tjmc != ''"> and tjmc = #{tjmc}</if>
+            <if test="lb != null  and lb != ''"> and lb = #{lb}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</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="selectSgfambTjpzById" parameterType="Long" resultMap="SgfambTjpzResult">
+        <include refid="selectSgfambTjpzVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSgfambTjpz" parameterType="SgfambTjpz" useGeneratedKeys="true" keyProperty="id">
+        insert into sgfamb_tjpz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tjmc != null">tjmc,</if>
+            <if test="lb != null">lb,</if>
+            <if test="bz != null">bz,</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="tjmc != null">#{tjmc},</if>
+            <if test="lb != null">#{lb},</if>
+            <if test="bz != null">#{bz},</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="updateSgfambTjpz" parameterType="SgfambTjpz">
+        update sgfamb_tjpz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tjmc != null">tjmc = #{tjmc},</if>
+            <if test="lb != null">lb = #{lb},</if>
+            <if test="bz != null">bz = #{bz},</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="deleteSgfambTjpzById" parameterType="Long">
+        delete from sgfamb_tjpz where id = #{id}
+    </delete>
+
+    <delete id="deleteSgfambTjpzByIds" parameterType="String">
+        delete from sgfamb_tjpz 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/SjFdsgcsDcyxMapper.xml

@@ -12,10 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jdcs"    column="jdcs"    />
         <result property="yx"    column="yx"    />
         <result property="bz"    column="bz"    />
+        <result property="jdxs"    column="jdxs"    />
     </resultMap>
 
     <sql id="selectSjFdsgcsDcyxVo">
-        select id, dcmc, jdcs, yx, bz from sj_fdsgcs_dcyx
+        select id, dcmc, jdcs, yx, bz,jdxs from sj_fdsgcs_dcyx
     </sql>
 
     <select id="selectSjFdsgcsDcyxList" parameterType="SjFdsgcsDcyx" resultMap="SjFdsgcsDcyxResult">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jdcs != null">jdcs,</if>
             <if test="yx != null">yx,</if>
             <if test="bz != null">bz,</if>
+            <if test="jdxs != null">jdxs,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
@@ -68,12 +70,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jdcs != null">#{jdcs},</if>
             <if test="yx != null">#{yx},</if>
             <if test="bz != null">#{bz},</if>
+            <if test="jdxs != null">#{jdxs},</if>
          </trim>
     </insert>
     <insert id="insertSjFdsgcsDcyxBatch">
-        insert into sj_fdsgcs_dcyx (jh, kc, dcmc, jdcs, yx, bz) values
+        insert into sj_fdsgcs_dcyx (jh, kc, dcmc, jdcs, yx, bz, jdxs) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.jh}, #{item.kc}, #{item.dcmc}, #{item.jdcs}, #{item.yx}, #{item.bz})
+            (#{item.jh}, #{item.kc}, #{item.dcmc}, #{item.jdcs}, #{item.yx}, #{item.bz}, #{item.jdxs})
         </foreach>
 
     </insert>
@@ -87,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jdcs != null">jdcs = #{jdcs},</if>
             <if test="yx != null">yx = #{yx},</if>
             <if test="bz != null">bz = #{bz},</if>
+            <if test="jdxs != null">jdxs = #{jdxs},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -149,6 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sjyh != null">#{sjyh},</if>
          </trim>
     </insert>
+    <insert id="insertSjSggyGjsbxnyq2">
+        insert into sj_sggy_gjsbxnyq ( 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, sjyh)
+        SELECT #{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, sjyh from sj_sggy_gjsbxnyq where jh='通用'
+    </insert>
 
     <update id="updateSjSggyGjsbxnyq" parameterType="SjSggyGjsbxnyq">
         update sj_sggy_gjsbxnyq
@@ -186,6 +190,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateSjSggyGjsbxnyqByjh">
+        update sj_sggy_gjsbxnyq
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="sjyh != null">sjyh = #{sjyh},</if>
+        </trim>
+        where jh = #{jh}
+    </update>
 
     <delete id="deleteSjSggyGjsbxnyqById" parameterType="Long">
         delete from sj_sggy_gjsbxnyq where id = #{id}

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

@@ -536,18 +536,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		JS,
 		LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
 		from JSDB
-		where jh in(
-		select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%')  and wjrq >sysdate-365*2
-		) and tgcc not like '%导管%'
-		-------------------------------------------------
+		where
+		    1=1
+		  and tgcc not like '%导管%'
+		<if test="qk != null and qk !=''">
+			and jh in(
+			select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%') and wjrq >sysdate-365*2
+			)
+		</if>
+		<if test="jhs!=null">
+			and jh in
+			<foreach item="jh" collection="jhs"
+					 open="(" separator="," close=")">
+				#{jh}
+			</foreach>
+		</if>
 		) ss
-		right join (select * from jsha where jh in(select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%')  and wjrq >sysdate-365*2))jsha
+		right join (select * from jsha where 1=1
+		<if test="qk != null and qk !=''">
+			and jh in(
+			select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%') and wjrq >sysdate-365*2
+			)
+		</if>
+		<if test="jhs!=null">
+			and jh in
+			<foreach item="jh" collection="jhs"
+					 open="(" separator="," close=")">
+				#{jh}
+			</foreach>
+		</if>
+		                               )jsha
 		on jsha.jh=ss.jh  and jsha.zzjs between ss.lag_js and ss.js
 		)ss
 		group by ss.kc,ss.ztxh,ss.cc,ss.cj
 	</select>
 	<select id="getFdcsList" resultType="com.zjsgfa.project.zt.domain.Jsha">
-		select a.jh,c.kc,zy, zs, gj, bs, pl, lgby, ztyj, hkyh, cjl, pssd, ztsgl, bsgl, sfsdzg, sfsdzt, gllyl
+		select a.jh,c.kc,d.zzjs,d.jc,d.jxzs,zy, zs, gj, bs, pl, lgby, ztyj, hkyh, cjl, pssd, ztsgl, bsgl, sfsdzg, sfsdzt, gllyl
 		from JSBA a
 		left join jsaa b on a.jh = b.jh
 		left join (
@@ -562,7 +586,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		) t) c on a.jh=c.jh
 		left join (
 		select jh,xh,
-		JC,ZZJS,zy, zs, gj, bs, pl, lgby, ztyj, hkyh, cjl, pssd, ztsgl, bsgl, sfsdzg, sfsdzt, gllyl
+		JC,ZZJS,jxzs,zy, zs, gj, bs, pl, lgby, ztyj, hkyh, cjl, pssd, ztsgl, bsgl, sfsdzg, sfsdzt, gllyl
 		from JSHA
 
 		order by xh
@@ -700,25 +724,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getGzbjList" resultType="com.zjsgfa.project.zt.domain.LjGzbj">
 
 		select a.jh,
-			   a.QK,
-			   t.*,
-			   ROUND(NVL(c.SJTS, 0) * 24, 2)sjts,
-			   case when  c.SJTS is not null  then  ROUND((nvl(JD2,0)-nvl(JD1,0)) / (ROUND(NVL(c.SJTS,0)*24,2)),2) else 0 end   zs
+		a.QK,
+		d.zb,
+		t.*,
+		ROUND(NVL(c.SJTS, 0) * 24, 2)sjts,
+		case when c.SJTS is not null then ROUND((nvl(JD2,0)-nvl(JD1,0)) / (ROUND(NVL(c.SJTS,0)*24,2)),2) else 0 end zs
 		from JSaa a
-				 left join (SELECT jh,
-								   ztzj,
-								   kc,
-								   (CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END)                        ksjs,
-								   js,
-								   CONCAT(CASE WHEN kc = 1 THEN '0-' ELSE LAG_JS || '-' END, JS) AS jd
-							FROM (SELECT jh,
-										 ZTZJ,
-										 ROW_NUMBER()  OVER (PARTITION BY jh ORDER BY js)  AS kc, JS,
-										 LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
-								  FROM JSDB) t) t on a.JH = t.JH
-				 left join (select *
-							from JSTA
-							where NVL(JD1, 0) != NVL(JD2,0)) c on a.JH = c.JH and t.js = c.JD2
+		left join (SELECT jh,
+		ztzj,
+		kc,
+		(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,
+		js,
+		CONCAT(CASE WHEN kc = 1 THEN '0-' ELSE LAG_JS || '-' END, JS) AS jd
+		FROM (SELECT jh,
+		ZTZJ,
+		ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc, JS,
+		LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
+		FROM JSDB) t) t on a.JH = t.JH
+		left join (select *
+		from JSTA
+		where NVL(JD1, 0) != NVL(JD2,0)) c on a.JH = c.JH and t.js = c.JD2
+		left join (
+		select jh,ZZJS,
+		ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
+		from JSHA
+
+		order by xh
+		) d on a.JH=d.jh and d.zzjs>ksjs and d.zzjs &lt;=js
 		where
 		    1=1
 		<if test="qk!=null and qk!=''">
@@ -730,7 +762,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="ztzj!=null and ztzj !=''">
 			and t.ZTZJ=#{ztzj}
 		</if>
+		<if test="jhs!=null">
+			and a.jh in
+			<foreach item="jh" collection="jhs"
+					 open="(" separator="," close=")">
+				#{jh}
+			</foreach>
+		</if>
+
+		order by zb desc
+	</select>
+    <select id="getJsgaList" resultType="com.zjsgfa.project.zt.domain.vo.JsgaVo">
+		select distinct  a.jh,a.QSJS,a.ZZJS,a.JC,a.JXZS,
+		b.qyjs jd,b.DCCW,
+		md , nd , hsl, ph, jql1, jql2, lsl, nbh, mcxs,c.FZQK,c.FSJGJYY,c.CLGK
+		from jsha a
+		left join jsga b on  a.jh = b.JH AND  b.QYJS > a.QSJS AND b.QYJS &lt;= a.ZZJS
+		left join JSQA c on b.jh = c.JH AND c.JS > a.QSJS AND c.js &lt;= a.ZZJS
+		where  1=1
+		<if test="jhs!=null">
+			and a.jh in
+			<foreach item="jh" collection="jhs"
+					 open="(" separator="," close=")">
+				#{jh}
+			</foreach>
+		</if>
+
+		<if test="js!=null">
+			and b.qyjs &lt;= #{js}
+		</if>
+
+		<if test="ksjs!=null">
+			and b.qyjs >= #{ksjs}
+		</if>
 
-		order by zs desc
+		order by a.jh,a.QSJS,b.qyjs
 	</select>
 </mapper>
\ No newline at end of file