修改

pom.xml

@@ -322,6 +322,9 @@
             <groupId>org.apache.httpcomponents.client5</groupId>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
             <artifactId>httpclient5</artifactId>
         </dependency>
         </dependency>
+
+
+
     </dependencies>
     </dependencies>
 
 
 	<build>
 	<build>

src/main/java/com/zjsgfa/project/system/mapper/SysUserMapper.java

@@ -124,4 +124,13 @@ public interface SysUserMapper
      * @return 结果
      * @return 结果
      */
      */
     public SysUser checkEmailUnique(String email);
     public SysUser checkEmailUnique(String email);
+
+    SysUser selectUserByLoginName(String userName);
+
+    List<SysUser> selectUserLoginNamesByRoleKeyDept(@Param("deptId") Long deptId,@Param("roleKey") String roleKey);
+
+
+    List<SysUser> selectUserListByRoleKey(String roleKey);
+
+
 }
 }

src/main/java/com/zjsgfa/project/system/service/ISysUserService.java

@@ -203,4 +203,9 @@ public interface ISysUserService
      * @return 结果
      * @return 结果
      */
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    SysUser selectUserByLoginName(String userName);
+
+    List<String> selectUserLoginNamesByRoleKeyDept(Long secondaryUnit, String lcsp1);
+
 }
 }

src/main/java/com/zjsgfa/project/system/service/impl/SysUserServiceImpl.java

@@ -547,4 +547,16 @@ public class SysUserServiceImpl implements ISysUserService
         }
         }
         return successMsg.toString();
         return successMsg.toString();
     }
     }
+
+    @Override
+    public SysUser selectUserByLoginName(String userName) {
+        return userMapper.selectUserByLoginName(userName);
+    }
+
+    @Override
+    public List<String> selectUserLoginNamesByRoleKeyDept(Long deptId, String roleKey) {
+        List<SysUser> userList=userMapper.selectUserLoginNamesByRoleKeyDept(deptId,roleKey);
+        List<String> collect = userList.stream().map(SysUser::getUserName).collect(Collectors.toList());
+        return collect;
+    }
 }
 }

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

+package com.zjsgfa.project.zjsgfa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zjsgfa.common.utils.SecurityUtils;
+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.BizTodoItem;
+import com.zjsgfa.project.zjsgfa.service.IBizTodoItemService;
+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 2026-02-11
+ */
+@RestController
+@RequestMapping("/system/bizTodoItem")
+public class BizTodoItemController extends BaseController
+{
+    @Autowired
+    private IBizTodoItemService bizTodoItemService;
+
+    /**
+     * 查询待办事项列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizTodoItem bizTodoItem)
+    {
+        startPage();
+        bizTodoItem.setIsHandle("0");
+        bizTodoItem.setTodoUserId(SecurityUtils.getUsername());
+        List<BizTodoItem> list = bizTodoItemService.selectBizTodoItemList(bizTodoItem);
+        return getDataTable(list);
+    }
+
+    //已办任务
+    @GetMapping("/doneList")
+    public TableDataInfo getdolist(BizTodoItem bizTodoItem)
+    {
+        startPage();
+        bizTodoItem.setIsHandle("1");
+        bizTodoItem.setTodoUserId(SecurityUtils.getUsername());
+        List<BizTodoItem> list = bizTodoItemService.selectBizTodoItemList(bizTodoItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出待办事项列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:export')")
+    @Log(title = "待办事项", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizTodoItem bizTodoItem)
+    {
+        List<BizTodoItem> list = bizTodoItemService.selectBizTodoItemList(bizTodoItem);
+        ExcelUtil<BizTodoItem> util = new ExcelUtil<BizTodoItem>(BizTodoItem.class);
+        util.exportExcel(response, list, "待办事项数据");
+    }
+
+    /**
+     * 获取待办事项详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizTodoItemService.selectBizTodoItemById(id));
+    }
+
+    /**
+     * 新增待办事项
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:add')")
+    @Log(title = "待办事项", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizTodoItem bizTodoItem)
+    {
+        return toAjax(bizTodoItemService.insertBizTodoItem(bizTodoItem));
+    }
+
+    /**
+     * 修改待办事项
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:edit')")
+    @Log(title = "待办事项", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizTodoItem bizTodoItem)
+    {
+        return toAjax(bizTodoItemService.updateBizTodoItem(bizTodoItem));
+    }
+
+    /**
+     * 删除待办事项
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bizTodoItem:remove')")
+    @Log(title = "待办事项", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bizTodoItemService.deleteBizTodoItemByIds(ids));
+    }
+}

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

@@ -230,8 +230,19 @@ public class SjDjjcController extends BaseController
     @Autowired
     @Autowired
     private IDcmbglService dcmbglService;
     private IDcmbglService dcmbglService;
 
 
+    @Autowired
+    private SjLjfzqkMapper sjLjfzqkMapper;
 
 
 
 
+    @Autowired
+    private SjGcjbsjMapper sjGcjbsjMapper;
+
+    @Autowired
+    private SjLjzjysyqkMapper sjLjzjysyqkMapper;
+
+    @Autowired
+    private SjZsjqkMapper sjZsjqkMapper;
+
 
 
     /**
     /**
      * 查询设计信息-井基础信息列表
      * 查询设计信息-井基础信息列表
@@ -2166,7 +2177,8 @@ public class SjDjjcController extends BaseController
                 String param = gson.toJson(map2);
                 String param = gson.toJson(map2);
 //                System.out.println("最终参数"+param);
 //                System.out.println("最终参数"+param);
                 //调用接口
                 //调用接口
-                String body = HttpRequest.post("http://10.68.202.238:12001/api/pdf2xlsx").body(param).execute().body();
+//                String body = HttpRequest.post("http://10.68.202.238:12001/api/pdf2xlsx").body(param).execute().body();
+                String body = HttpRequest.post("http://10.68.249.11:12001/api/pdf2xlsx").body(param).execute().body();
                 System.out.println("接口返回数据"+body);
                 System.out.println("接口返回数据"+body);
                 JsonObject root = gson.fromJson(body, JsonObject.class);
                 JsonObject root = gson.fromJson(body, JsonObject.class);
                 JsonObject outerData = root.getAsJsonObject("message");
                 JsonObject outerData = root.getAsJsonObject("message");
@@ -2269,7 +2281,10 @@ public class SjDjjcController extends BaseController
                     .bind("sjQkztfxList", policy)//行循环策略
                     .bind("sjQkztfxList", policy)//行循环策略
                     .bind("sjSzfxjgList", policy)//行循环策略
                     .bind("sjSzfxjgList", policy)//行循环策略
                     .bind("sjDcfxDzfcList", policy)//行循环策略
                     .bind("sjDcfxDzfcList", policy)//行循环策略
+                    .bind("zjysyqkList", policy)//行循环策略
+                    .bind("sjZsjqks", policy)//行循环策略
                     .bind("sjDcfxTsyxList", policy)//行循环策略
                     .bind("sjDcfxTsyxList", policy)//行循环策略
+                    .bind("sjLjfzqks", policy)//行循环策略
                     .bind("sjJhzqList", policy)//行循环策略
                     .bind("sjJhzqList", policy)//行循环策略
                     .bind("sjH2sList", policy)//行循环策略
                     .bind("sjH2sList", policy)//行循环策略
                     .bind("sjLjsmList", policy)//行循环策略
                     .bind("sjLjsmList", policy)//行循环策略
@@ -2299,6 +2314,18 @@ public class SjDjjcController extends BaseController
                     .bind("zjzhzysx", htmlRenderPolicy)//富文本策略
                     .bind("zjzhzysx", htmlRenderPolicy)//富文本策略
                     .bind("zjycs", htmlRenderPolicy)//富文本策略
                     .bind("zjycs", htmlRenderPolicy)//富文本策略
                     .bind("zjgccs", htmlRenderPolicy)//富文本策略
                     .bind("zjgccs", htmlRenderPolicy)//富文本策略
+                    .bind("qjzdts", htmlRenderPolicy)//富文本策略
+                    .bind("dzfc", htmlRenderPolicy)//富文本策略
+                    .bind("fjdzdts", htmlRenderPolicy)//富文本策略
+                    .bind("wjzyts", htmlRenderPolicy)//富文本策略
+                    .bind("qtzdts", htmlRenderPolicy)//富文本策略
+                    .bind("ljzjysyqk", htmlRenderPolicy)//富文本策略
+                    .bind("sgzd", htmlRenderPolicy)//富文本策略
+                    .bind("fjdzjyxn", htmlRenderPolicy)//富文本策略
+                    .bind("fjdcljdjl", htmlRenderPolicy)//富文本策略
+                    .bind("fjdzjywhycl", htmlRenderPolicy)//富文本策略
+                    .bind("qtyq", htmlRenderPolicy)//富文本策略
+                    .bind("qcqzynr", htmlRenderPolicy)//富文本策略
                     .bind("sjFdsgcsTsgjList", policy)//行策略
                     .bind("sjFdsgcsTsgjList", policy)//行策略
                     .bind("sjFdsgcsDcyxList", policy)//行策略
                     .bind("sjFdsgcsDcyxList", policy)//行策略
                     .bind("sjLjtjztList", policy)//行策略
                     .bind("sjLjtjztList", policy)//行策略
@@ -2347,7 +2374,13 @@ public class SjDjjcController extends BaseController
             dataModel.put("jkzzb", "");
             dataModel.put("jkzzb", "");
         }
         }
 
 
-
+        //查询工层基础信息
+        SjGcjbsj sjGcjbsj = sjGcjbsjMapper.selectSjGcjbsjById(sjDjjc.getId());
+        if(sjGcjbsj!=null){
+            dataModel.put("sgdw", sjGcjbsj.getSgdw());
+        }else {
+            dataModel.put("sgdw","");
+        }
 
 
         dataModel.put("gzwz", sjDjjc.getGzwz());
         dataModel.put("gzwz", sjDjjc.getGzwz());
         dataModel.put("wzcw", sjDjjc.getWzcw());
         dataModel.put("wzcw", sjDjjc.getWzcw());
@@ -2571,6 +2604,14 @@ public class SjDjjcController extends BaseController
             dataModel.put("plqt","");
             dataModel.put("plqt","");
         }
         }
 
 
+
+        SjZysx qcqzynr = sjZysxList.stream().filter(it -> it.getLb().equals("浅层气")).findFirst().orElse(null);
+        if(qcqzynr!=null){
+            dataModel.put("qcqzynr",qcqzynr.getZysx());
+        }else {
+            dataModel.put("qcqzynr","");
+        }
+
         SjZysx tsyxfx = sjZysxList.stream().filter(it -> it.getLb().equals("特殊岩性风险")).findFirst().orElse(null);
         SjZysx tsyxfx = sjZysxList.stream().filter(it -> it.getLb().equals("特殊岩性风险")).findFirst().orElse(null);
         if(tsyxfx!=null){
         if(tsyxfx!=null){
             dataModel.put("tsyxfx",tsyxfx.getZysx());
             dataModel.put("tsyxfx",tsyxfx.getZysx());
@@ -2687,11 +2728,37 @@ public class SjDjjcController extends BaseController
             dataModel.put("jlgh", sjJkzp1.getJlgh());
             dataModel.put("jlgh", sjJkzp1.getJlgh());
             dataModel.put("syyq", sjJkzp1.getSyyq());
             dataModel.put("syyq", sjJkzp1.getSyyq());
             dataModel.put("clcb", sjJkzp1.getClcb());
             dataModel.put("clcb", sjJkzp1.getClcb());
+
+            dataModel.put("dzfc", sjJkzp1.getDzfc());
+            dataModel.put("qjzdts", sjJkzp1.getQjzdts());
+            dataModel.put("fjdzdts", sjJkzp1.getFjdzdts());
+            dataModel.put("wjzyts", sjJkzp1.getWjzyts());
+            dataModel.put("qtzdts", sjJkzp1.getQtzdts());
+            dataModel.put("ljzjysyqk", sjJkzp1.getLjzjysyqk());
+            dataModel.put("sgzd", sjJkzp1.getSgzd());
+            dataModel.put("fjdzjyxn", sjJkzp1.getFjdzjyxn());
+            dataModel.put("fjdcljdjl", sjJkzp1.getFjdcljdjl());
+            dataModel.put("fjdzjywhycl", sjJkzp1.getFjdzjywhycl());
+            dataModel.put("qtyq", sjJkzp1.getQtyq());
+
         }else {
         }else {
             dataModel.put("zjkzz", sjJkzp.getZjkzz());
             dataModel.put("zjkzz", sjJkzp.getZjkzz());
             dataModel.put("jlgh", sjJkzp.getJlgh());
             dataModel.put("jlgh", sjJkzp.getJlgh());
             dataModel.put("syyq", sjJkzp.getSyyq());
             dataModel.put("syyq", sjJkzp.getSyyq());
             dataModel.put("clcb", sjJkzp.getClcb());
             dataModel.put("clcb", sjJkzp.getClcb());
+
+
+            dataModel.put("dzfc", sjJkzp.getDzfc());
+            dataModel.put("qjzdts", sjJkzp.getQjzdts());
+            dataModel.put("fjdzdts", sjJkzp.getFjdzdts());
+            dataModel.put("wjzyts", sjJkzp.getWjzyts());
+            dataModel.put("qtzdts", sjJkzp.getQtzdts());
+            dataModel.put("ljzjysyqk", sjJkzp.getLjzjysyqk());
+            dataModel.put("sgzd", sjJkzp.getSgzd());
+            dataModel.put("fjdzjyxn", sjJkzp.getFjdzjyxn());
+            dataModel.put("fjdcljdjl", sjJkzp.getFjdcljdjl());
+            dataModel.put("fjdzjywhycl", sjJkzp.getFjdzjywhycl());
+            dataModel.put("qtyq", sjJkzp.getQtyq());
         }
         }
         SjHse sjHse =new SjHse();
         SjHse sjHse =new SjHse();
         sjHse.setJh(jh);
         sjHse.setJh(jh);
@@ -2871,8 +2938,22 @@ public class SjDjjcController extends BaseController
         dataModel.put("fdsgcsList", fdsgcsList);
         dataModel.put("fdsgcsList", fdsgcsList);
 
 
 
 
+        //邻井复杂情况
+        SjLjfzqk ljfzqk =new SjLjfzqk();
+        ljfzqk.setZbid(sjDjjc.getId());
+        List<SjLjfzqk> sjLjfzqks = sjLjfzqkMapper.selectSjLjfzqkList(ljfzqk);
+        dataModel.put("sjLjfzqks", sjLjfzqks);
 
 
+        //邻井钻井液使用情况
+        SjLjzjysyqk sjLjzjysyqk =new SjLjzjysyqk();
+        sjLjzjysyqk.setJh(jh);
+        List<SjLjzjysyqk> zjysyqkList = sjLjzjysyqkMapper.selectSjLjzjysyqkList(sjLjzjysyqk);
+        dataModel.put("zjysyqkList", zjysyqkList);
 
 
+        SjZsjqk sjZsjqk =new SjZsjqk();
+        sjZsjqk.setJh(jh);
+        List<SjZsjqk> sjZsjqks = sjZsjqkMapper.selectSjZsjqkList(sjZsjqk);
+        dataModel.put("sjZsjqks", sjZsjqks);
         return dataModel;
         return dataModel;
     }
     }
 
 

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjGcjbsjController.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.SjGcjbsj;
+import com.zjsgfa.project.zjsgfa.service.ISjGcjbsjService;
+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 2026-02-02
+ */
+@RestController
+@RequestMapping("/system/SjGcjbsj")
+public class SjGcjbsjController extends BaseController
+{
+    @Autowired
+    private ISjGcjbsjService sjGcjbsjService;
+
+    /**
+     * 查询工程基本数据列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjGcjbsj sjGcjbsj)
+    {
+        startPage();
+        List<SjGcjbsj> list = sjGcjbsjService.selectSjGcjbsjList(sjGcjbsj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工程基本数据列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:export')")
+    @Log(title = "工程基本数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjGcjbsj sjGcjbsj)
+    {
+        List<SjGcjbsj> list = sjGcjbsjService.selectSjGcjbsjList(sjGcjbsj);
+        ExcelUtil<SjGcjbsj> util = new ExcelUtil<SjGcjbsj>(SjGcjbsj.class);
+        util.exportExcel(response, list, "工程基本数据数据");
+    }
+
+    /**
+     * 获取工程基本数据详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        SjGcjbsj sjGcjbsj = sjGcjbsjService.selectSjGcjbsjById(id);
+        if(sjGcjbsj==null){
+            sjGcjbsj=new SjGcjbsj();
+        }
+        return success(sjGcjbsj);
+    }
+
+    /**
+     * 新增工程基本数据
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:add')")
+    @Log(title = "工程基本数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjGcjbsj sjGcjbsj)
+    {
+        return toAjax(sjGcjbsjService.insertSjGcjbsj(sjGcjbsj));
+    }
+
+    /**
+     * 修改工程基本数据
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:edit')")
+    @Log(title = "工程基本数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjGcjbsj sjGcjbsj)
+    {
+        return toAjax(sjGcjbsjService.updateSjGcjbsj(sjGcjbsj));
+    }
+
+    /**
+     * 删除工程基本数据
+     */
+    //@PreAuthorize("@ss.hasPermi('system:SjGcjbsj:remove')")
+    @Log(title = "工程基本数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjGcjbsjService.deleteSjGcjbsjByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjLjfzqkController.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.SjLjfzqk;
+import com.zjsgfa.project.zjsgfa.service.ISjLjfzqkService;
+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 2026-02-04
+ */
+@RestController
+@RequestMapping("/system/sjLjfzqk")
+public class SjLjfzqkController extends BaseController
+{
+    @Autowired
+    private ISjLjfzqkService sjLjfzqkService;
+
+    /**
+     * 查询邻井复杂情况列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjLjfzqk sjLjfzqk)
+    {
+        startPage();
+        List<SjLjfzqk> list = sjLjfzqkService.selectSjLjfzqkList(sjLjfzqk);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出邻井复杂情况列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:export')")
+    @Log(title = "邻井复杂情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjLjfzqk sjLjfzqk)
+    {
+        List<SjLjfzqk> list = sjLjfzqkService.selectSjLjfzqkList(sjLjfzqk);
+        ExcelUtil<SjLjfzqk> util = new ExcelUtil<SjLjfzqk>(SjLjfzqk.class);
+        util.exportExcel(response, list, "邻井复杂情况数据");
+    }
+
+    /**
+     * 获取邻井复杂情况详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjLjfzqkService.selectSjLjfzqkById(id));
+    }
+
+    /**
+     * 新增邻井复杂情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:add')")
+    @Log(title = "邻井复杂情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjLjfzqk sjLjfzqk)
+    {
+        return toAjax(sjLjfzqkService.insertSjLjfzqk(sjLjfzqk));
+    }
+
+    /**
+     * 修改邻井复杂情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:edit')")
+    @Log(title = "邻井复杂情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjLjfzqk sjLjfzqk)
+    {
+        return toAjax(sjLjfzqkService.updateSjLjfzqk(sjLjfzqk));
+    }
+
+    /**
+     * 删除邻井复杂情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjfzqk:remove')")
+    @Log(title = "邻井复杂情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjLjfzqkService.deleteSjLjfzqkByIds(ids));
+    }
+}

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

@@ -86,6 +86,12 @@ public class SjLjjwController extends BaseController
         return toAjax(sjLjjwService.insertSjLjjwBatch(list));
         return toAjax(sjLjjwService.insertSjLjjwBatch(list));
     }
     }
 
 
+    @PostMapping("/pladd2")
+    public AjaxResult pladd2(@RequestBody List<SjLjjw> list) throws Exception
+    {
+        return toAjax(sjLjjwService.insertSjLjjwBatch2(list));
+    }
+
     /**
     /**
      * 修改设计-邻井井位
      * 修改设计-邻井井位
      */
      */

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjLjzjysyqkController.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.SjLjzjysyqk;
+import com.zjsgfa.project.zjsgfa.service.ISjLjzjysyqkService;
+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 2026-02-04
+ */
+@RestController
+@RequestMapping("/system/sjLjzjysyqk")
+public class SjLjzjysyqkController extends BaseController
+{
+    @Autowired
+    private ISjLjzjysyqkService sjLjzjysyqkService;
+
+    /**
+     * 查询邻井钻井液使用情况列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjLjzjysyqk sjLjzjysyqk)
+    {
+        startPage();
+        List<SjLjzjysyqk> list = sjLjzjysyqkService.selectSjLjzjysyqkList(sjLjzjysyqk);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出邻井钻井液使用情况列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:export')")
+    @Log(title = "邻井钻井液使用情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjLjzjysyqk sjLjzjysyqk)
+    {
+        List<SjLjzjysyqk> list = sjLjzjysyqkService.selectSjLjzjysyqkList(sjLjzjysyqk);
+        ExcelUtil<SjLjzjysyqk> util = new ExcelUtil<SjLjzjysyqk>(SjLjzjysyqk.class);
+        util.exportExcel(response, list, "邻井钻井液使用情况数据");
+    }
+
+    /**
+     * 获取邻井钻井液使用情况详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(sjLjzjysyqkService.selectSjLjzjysyqkById(id));
+    }
+
+    /**
+     * 新增邻井钻井液使用情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:add')")
+    @Log(title = "邻井钻井液使用情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjLjzjysyqk sjLjzjysyqk)
+    {
+        return toAjax(sjLjzjysyqkService.insertSjLjzjysyqk(sjLjzjysyqk));
+    }
+
+    /**
+     * 修改邻井钻井液使用情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:edit')")
+    @Log(title = "邻井钻井液使用情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjLjzjysyqk sjLjzjysyqk)
+    {
+        return toAjax(sjLjzjysyqkService.updateSjLjzjysyqk(sjLjzjysyqk));
+    }
+
+    /**
+     * 删除邻井钻井液使用情况
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sjLjzjysyqk:remove')")
+    @Log(title = "邻井钻井液使用情况", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjLjzjysyqkService.deleteSjLjzjysyqkByIds(ids));
+    }
+}

src/main/java/com/zjsgfa/project/zjsgfa/controller/SjNdxmController.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.SjNdxm;
+import com.zjsgfa.project.zjsgfa.service.ISjNdxmService;
+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 2026-02-02
+ */
+@RestController
+@RequestMapping("/system/ndxm")
+public class SjNdxmController extends BaseController
+{
+    @Autowired
+    private ISjNdxmService sjNdxmService;
+
+    /**
+     * 查询难度项目列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SjNdxm sjNdxm)
+    {
+        startPage();
+        List<SjNdxm> list = sjNdxmService.selectSjNdxmList(sjNdxm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出难度项目列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:export')")
+    @Log(title = "难度项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SjNdxm sjNdxm)
+    {
+        List<SjNdxm> list = sjNdxmService.selectSjNdxmList(sjNdxm);
+        ExcelUtil<SjNdxm> util = new ExcelUtil<SjNdxm>(SjNdxm.class);
+        util.exportExcel(response, list, "难度项目数据");
+    }
+
+    /**
+     * 获取难度项目详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        SjNdxm sjNdxm = sjNdxmService.selectSjNdxmById(id);
+        if(sjNdxm==null){
+            sjNdxm=new SjNdxm();
+        }
+        return AjaxResult.success(sjNdxm);
+    }
+
+    /**
+     * 新增难度项目
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:add')")
+    @Log(title = "难度项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SjNdxm sjNdxm)
+    {
+        return toAjax(sjNdxmService.insertSjNdxm(sjNdxm));
+    }
+
+    /**
+     * 修改难度项目
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:edit')")
+    @Log(title = "难度项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SjNdxm sjNdxm)
+    {
+        return toAjax(sjNdxmService.updateSjNdxm(sjNdxm));
+    }
+
+    /**
+     * 删除难度项目
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ndxm:remove')")
+    @Log(title = "难度项目", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sjNdxmService.deleteSjNdxmByIds(ids));
+    }
+}

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

 package com.zjsgfa.project.zjsgfa.controller;
 package com.zjsgfa.project.zjsgfa.controller;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
@@ -78,6 +79,12 @@ public class SjSggyZjyFdxnbController extends BaseController
         return toAjax(sjSggyZjyFdxnbService.insertSjSggyZjyFdxnb(sjSggyZjyFdxnb));
         return toAjax(sjSggyZjyFdxnbService.insertSjSggyZjyFdxnb(sjSggyZjyFdxnb));
     }
     }
 
 
+    @PostMapping("/pladd")
+    public AjaxResult pladd(@RequestBody List<SjSggyZjyFdxnb> list)
+    {
+        return toAjax(sjSggyZjyFdxnbService.insertSjSggyZjyFdxnbBatch(list));
+    }
+
     /**
     /**
      * 修改设计信息-施工概要-分段钻井液性能设计
      * 修改设计信息-施工概要-分段钻井液性能设计
      */
      */

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

@@ -2,7 +2,7 @@ package com.zjsgfa.project.zjsgfa.controller;
 
 
 import java.util.List;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
-
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,8 +24,8 @@ import com.zjsgfa.framework.web.page.TableDataInfo;
 /**
 /**
  * 设计-注水井情况Controller
  * 设计-注水井情况Controller
  * 
  * 
- * @author
- * @date 2025-08-05
+ * @author ruoyi
+ * @date 2026-02-04
  */
  */
 @RestController
 @RestController
 @RequestMapping("/system/sjZsjqk")
 @RequestMapping("/system/sjZsjqk")
@@ -37,7 +37,7 @@ public class SjZsjqkController extends BaseController
     /**
     /**
      * 查询设计-注水井情况列表
      * 查询设计-注水井情况列表
      */
      */
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:list')")
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SjZsjqk sjZsjqk)
     public TableDataInfo list(SjZsjqk sjZsjqk)
     {
     {
@@ -49,7 +49,7 @@ public class SjZsjqkController extends BaseController
     /**
     /**
      * 导出设计-注水井情况列表
      * 导出设计-注水井情况列表
      */
      */
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:export')")
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:export')")
     @Log(title = "设计-注水井情况", businessType = BusinessType.EXPORT)
     @Log(title = "设计-注水井情况", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SjZsjqk sjZsjqk)
     public void export(HttpServletResponse response, SjZsjqk sjZsjqk)
@@ -62,18 +62,18 @@ public class SjZsjqkController extends BaseController
     /**
     /**
      * 获取设计-注水井情况详细信息
      * 获取设计-注水井情况详细信息
      */
      */
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:query')")
-    @GetMapping(value = "/{sjjh}")
-    public AjaxResult getInfo(@PathVariable("sjjh") String sjjh)
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
-        return success(sjZsjqkService.selectSjZsjqkBySjjh(sjjh));
+        return success(sjZsjqkService.selectSjZsjqkById(id));
     }
     }
 
 
     /**
     /**
      * 新增设计-注水井情况
      * 新增设计-注水井情况
      */
      */
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
     @Log(title = "设计-注水井情况", businessType = BusinessType.INSERT)
     @Log(title = "设计-注水井情况", businessType = BusinessType.INSERT)
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody SjZsjqk sjZsjqk)
     public AjaxResult add(@RequestBody SjZsjqk sjZsjqk)
     {
     {
@@ -83,7 +83,7 @@ public class SjZsjqkController extends BaseController
     /**
     /**
      * 修改设计-注水井情况
      * 修改设计-注水井情况
      */
      */
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:edit')")
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:edit')")
     @Log(title = "设计-注水井情况", businessType = BusinessType.UPDATE)
     @Log(title = "设计-注水井情况", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody SjZsjqk sjZsjqk)
     public AjaxResult edit(@RequestBody SjZsjqk sjZsjqk)
@@ -94,18 +94,11 @@ public class SjZsjqkController extends BaseController
     /**
     /**
      * 删除设计-注水井情况
      * 删除设计-注水井情况
      */
      */
-    //@PreAuthorize("@ss.hasPermi('system:sjZsjqk:remove')")
+    @PreAuthorize("@ss.hasPermi('system:sjZsjqk:remove')")
     @Log(title = "设计-注水井情况", businessType = BusinessType.DELETE)
     @Log(title = "设计-注水井情况", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{sjjhs}")
-    public AjaxResult remove(@PathVariable String[] sjjhs)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
     {
-        return toAjax(sjZsjqkService.deleteSjZsjqkBySjjhs(sjjhs));
+        return toAjax(sjZsjqkService.deleteSjZsjqkByIds(ids));
     }
     }
-
-    @PostMapping("/addAll")
-    public AjaxResult addAll(@RequestBody List<SjZsjqk> sjZsjqkList)
-    {
-       return toAjax(sjZsjqkService.insertSjZsjqkBatch(sjZsjqkList));
-    }
-
 }
 }

src/main/java/com/zjsgfa/project/zjsgfa/domain/BizTodoItem.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;
+
+/**
+ * 待办事项对象 biz_todo_item
+ * 
+ * @author ruoyi
+ * @date 2026-02-11
+ */
+@Data
+public class BizTodoItem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 ID */
+    private Long id;
+
+    /** 事项标题 */
+    @Excel(name = "事项标题")
+    private String itemName;
+
+    /** 事项内容 */
+    @Excel(name = "事项内容")
+    private String itemContent;
+
+    /** 模块名称 (必须以 uri 一致) */
+    @Excel(name = "模块名称 (必须以 uri 一致)")
+    private String module;
+
+    /** 任务 ID */
+    @Excel(name = "任务 ID")
+    private String taskId;
+
+    /** 流程实例 ID */
+    @Excel(name = "流程实例 ID")
+    private String instanceId;
+
+    /** 任务名称 (必须以表单页面名称一致) */
+    @Excel(name = "任务名称 (必须以表单页面名称一致)")
+    private String taskName;
+
+    /** 节点名称 */
+    @Excel(name = "节点名称")
+    private String nodeName;
+
+    /** 是否查看 default 0 (0 否 1 是) */
+    @Excel(name = "是否查看 default 0 (0 否 1 是)")
+    private String isView;
+
+    /** 是否处理 default 0 (0 否 1 是) */
+    @Excel(name = "是否处理 default 0 (0 否 1 是)")
+    private String isHandle;
+
+    /** 待办人 ID */
+    @Excel(name = "待办人 ID")
+    private String todoUserId;
+
+    /** 待办人名称 */
+    @Excel(name = "待办人名称")
+    private String todoUserName;
+
+    /** 处理人 ID */
+    @Excel(name = "处理人 ID")
+    private String handleUserId;
+
+    /** 处理人名称 */
+    @Excel(name = "处理人名称")
+    private String handleUserName;
+
+    /** 通知时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "通知时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date todoTime;
+
+    /** 处理时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date handleTime;
+
+
+    private String searchOtherTodoFlag;
+
+}

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

+package com.zjsgfa.project.zjsgfa.domain;
+
+
+import com.zjsgfa.framework.web.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * Created by wangjian on 2021/11/29.
+ */
+public class ProcessBaseEntity extends BaseEntity {
+
+    /** 申请人姓名 */
+    private String applyUserName;
+
+    /** 任务ID */
+    private String taskId;
+
+    /** 任务名称 */
+    private String taskName;
+
+    /** 办理时间 */
+    private Date doneTime;
+
+    /** 创建人 */
+    private String createUserName;
+
+    /** 流程实例状态 1 激活 2 挂起 */
+    private String suspendState;
+
+    /** 审批意见 的 流程走向选择 true=同意，back=退回，reject=拒绝 */
+    private String flowTrendOption;
+
+    /** 审核时的批注 */
+    private String p_COM_comment;
+    /** 审核时的选择 */
+    private String p_B_approved;
+
+    public String getApplyUserName() {
+        return applyUserName;
+    }
+
+    public void setApplyUserName(String applyUserName) {
+        this.applyUserName = applyUserName;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public Date getDoneTime() {
+        return doneTime;
+    }
+
+    public void setDoneTime(Date doneTime) {
+        this.doneTime = doneTime;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public String getSuspendState() {
+        return suspendState;
+    }
+
+    public void setSuspendState(String suspendState) {
+        this.suspendState = suspendState;
+    }
+
+    public String getFlowTrendOption() {
+        return flowTrendOption;
+    }
+
+    public void setFlowTrendOption(String flowTrendOption) {
+        this.flowTrendOption = flowTrendOption;
+    }
+
+    public String getP_COM_comment() {
+        return p_COM_comment;
+    }
+
+    public void setP_COM_comment(String p_COM_comment) {
+        this.p_COM_comment = p_COM_comment;
+    }
+
+    public String getP_B_approved() {
+        return p_B_approved;
+    }
+
+    public void setP_B_approved(String p_B_approved) {
+        this.p_B_approved = p_B_approved;
+    }
+}

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

 package com.zjsgfa.project.zjsgfa.domain;
 package com.zjsgfa.project.zjsgfa.domain;
 
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
  * @author
  * @author
  * @date 2025-07-28
  * @date 2025-07-28
  */
  */
+@Data
 public class SjDcfxDzfc extends BaseEntity
 public class SjDcfxDzfc extends BaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -46,6 +48,8 @@ public class SjDcfxDzfc extends BaseEntity
     @Excel(name = "故障提示")
     @Excel(name = "故障提示")
     private String gzts;
     private String gzts;
 
 
+    private String bz;
+
     public void setId(Long id) 
     public void setId(Long id) 
     {
     {
         this.id = id;
         this.id = id;

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

 package com.zjsgfa.project.zjsgfa.domain;
 package com.zjsgfa.project.zjsgfa.domain;
 
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
@@ -15,7 +16,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
  * @date 2025-06-23
  * @date 2025-06-23
  */
  */
 @Data
 @Data
-public class SjDjjc extends BaseEntity
+public class SjDjjc extends ProcessBaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
@@ -109,6 +110,44 @@ public class SjDjjc extends BaseEntity
 
 
 
 
 
 
+    /** 甲方单位 */
+    @Excel(name = "甲方单位")
+    private String jfdw;
+
+    /** 补心高 */
+    @Excel(name = "补心高")
+    private String bxg;
+
+    /** 油层套管联入高度 */
+    @Excel(name = "油层套管联入高度")
+    private String yctglrgd;
+
+    /** 地理位置 */
+    @Excel(name = "地理位置")
+    private String dlwz;
+
+    /** 构造名称 */
+    @Excel(name = "构造名称")
+    private String gzmc;
+
+    /** A靶点横坐标 */
+    @Excel(name = "A靶点横坐标")
+    private Double ahzb;
+
+    /** A靶点纵坐标 */
+    @Excel(name = "A靶点纵坐标")
+    private Double azzb;
+
+    /** B靶点横坐标 */
+    @Excel(name = "B靶点横坐标")
+    private Double bhzb;
+
+    /** B靶点纵坐标 */
+    @Excel(name = "B靶点纵坐标")
+    private Double bzzb;
+
+
+
     /** 设计状态（未定稿/定稿） */
     /** 设计状态（未定稿/定稿） */
     @Excel(name = "设计状态", readConverterExp = "未=定稿/定稿")
     @Excel(name = "设计状态", readConverterExp = "未=定稿/定稿")
     private String sjzt;
     private String sjzt;
@@ -155,4 +194,35 @@ public class SjDjjc extends BaseEntity
     private String cjrmc;
     private String cjrmc;
 
 
 
 
+    /** 流程实例id */
+//    @Excel(name = "流程实例id")
+    private String instanceId;
+
+    /** 流程状态 */
+//    @Excel(name = "流程状态")
+    private String processStatus;
+
+    /** 驳回意见原因 */
+//    @Excel(name = "驳回意见原因")
+    private String refuseContent;
+
+    /** 类型 流程 */
+//    @Excel(name = "类型 流程")
+    private String type;
+
+    /** 申请人 流程 */
+//    @Excel(name = "申请人 流程")
+    private String applyUser;
+
+    /** 申请时间 流程 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "申请时间 流程", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+
+    private String flowTrend;
+
+    private String taskId;
+
+
 }
 }

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

+package com.zjsgfa.project.zjsgfa.domain;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 工程基本数据对象 sj_gcjbsj
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Data
+public class SjGcjbsj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbid;
+
+    /** 施工队伍 */
+    @Excel(name = "施工队伍")
+    private String sgdw;
+
+    /** 钻井队长 */
+    @Excel(name = "钻井队长")
+    private String zjdz;
+
+    /** 设计井深 */
+    @Excel(name = "设计井深")
+    private String sjjs;
+
+    /** 搬迁时间 */
+    @Excel(name = "搬迁时间")
+    private String bqsj;
+
+    /** 完钻井深 */
+    @Excel(name = "完钻井深")
+    private String wzjs;
+
+    /** 完钻垂深 */
+    @Excel(name = "完钻垂深")
+    private String wzcs;
+
+    /** 一开时间 */
+    @Excel(name = "一开时间")
+    private String yksj;
+
+    /** 二开时间 */
+    @Excel(name = "二开时间")
+    private String eksj;
+
+    /** 三开时间 */
+    @Excel(name = "三开时间")
+    private String sksj;
+
+    /** 四开时间 */
+    @Excel(name = "四开时间")
+    private String siksj;
+
+    /** 完钻方法 */
+    @Excel(name = "完钻方法")
+    private String wzfs;
+
+    /** 钻机月 */
+    @Excel(name = "钻机月")
+    private String zjty;
+
+    /** 钻机月速 */
+    @Excel(name = "钻机月速")
+    private String zjys;
+
+    /** 完钻时间 */
+    @Excel(name = "完钻时间")
+    private String wzsj;
+
+    /** 完井时间 */
+    @Excel(name = "完井时间")
+    private String wjsj;
+
+    /** 平均机械钻速 */
+    @Excel(name = "平均机械钻速")
+    private String pjjxzs;
+
+    /** 钻井周期(天) */
+    @Excel(name = "钻井周期(天)")
+    private String zjzq1;
+
+    /** 钻井周期(时) */
+    @Excel(name = "钻井周期(时)")
+    private String zjzq2;
+
+    /** 建井周期(天) */
+    @Excel(name = "建井周期(天)")
+    private String jjzq1;
+
+    /** 建井周期(时) */
+    @Excel(name = "建井周期(时)")
+    private String jjzq2;
+
+    /** 井身质量 */
+    @Excel(name = "井身质量")
+    private String jszl;
+
+    /** 固井质量 */
+    @Excel(name = "固井质量")
+    private String gjzl;
+
+    /** 取芯进尺 */
+    @Excel(name = "取芯进尺")
+    private String qxjc;
+
+    /** 岩芯长度 */
+    @Excel(name = "岩芯长度")
+    private String yxcd;
+
+    /** 收获率 */
+    @Excel(name = "收获率")
+    private String shl1;
+
+    /** 钻井液技术外包 */
+    @Excel(name = "钻井液技术外包")
+    private String zjyjswb;
+
+}

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

@@ -2,6 +2,7 @@ package com.zjsgfa.project.zjsgfa.domain;
 
 
 import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import com.zjsgfa.framework.web.domain.BaseEntity;
  * @author
  * @author
  * @date 2025-07-24
  * @date 2025-07-24
  */
  */
+@Data
 public class SjJkzp extends BaseEntity
 public class SjJkzp extends BaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -49,6 +51,50 @@ public class SjJkzp extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
     private Date createdTime;
 
 
+
+    /** 地质分层 */
+    @Excel(name = "地质分层")
+    private String dzfc;
+
+    /** 全井重点提示 */
+    @Excel(name = "全井重点提示")
+    private String qjzdts;
+
+    /** 分井段重点提示 */
+    @Excel(name = "分井段重点提示")
+    private String fjdzdts;
+
+    /** 完井作业提示 */
+    @Excel(name = "完井作业提示")
+    private String wjzyts;
+
+    /** 其它重点提示 */
+    @Excel(name = "其它重点提示")
+    private String qtzdts;
+
+    /** 邻井钻井液使用情况 */
+    @Excel(name = "邻井钻井液使用情况")
+    private String ljzjysyqk;
+
+    /** 施工的重点、难点 */
+    @Excel(name = "施工的重点、难点")
+    private String sgzd;
+
+    /** 分井段钻井液性能 */
+    @Excel(name = "分井段钻井液性能")
+    private String fjdzjyxn;
+
+    /** 分井段处理剂的加量 */
+    @Excel(name = "分井段处理剂的加量")
+    private String fjdcljdjl;
+
+    /** 分段钻井液维护与处理 */
+    @Excel(name = "分段钻井液维护与处理")
+    private String fjdzjywhycl;
+
+    /** 其它要求 */
+    @Excel(name = "其它要求")
+    private String qtyq;
     public void setId(Long id) 
     public void setId(Long id) 
     {
     {
         this.id = id;
         this.id = id;

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

+package com.zjsgfa.project.zjsgfa.domain;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 邻井复杂情况对象 sj_ljfzqk
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+@Data
+public class SjLjfzqk extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    private Long zbid;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 邻井井号 */
+    @Excel(name = "邻井井号")
+    private String ljjh;
+
+    /** 距离 */
+    @Excel(name = "距离")
+    private String jl;
+
+    /** 时间 */
+    @Excel(name = "时间")
+    private String sj;
+
+    /** 完钻井深 */
+    @Excel(name = "完钻井深")
+    private String wzjs;
+
+    /** 复杂情况 */
+    @Excel(name = "复杂情况")
+    private String fzqk;
+}

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

+package com.zjsgfa.project.zjsgfa.domain;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 邻井钻井液使用情况对象 sj_ljzjysyqk
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+@Data
+public class SjLjzjysyqk extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 井号 */
+    @Excel(name = "井号")
+    private String jh;
+
+    /** 邻井井号 */
+    @Excel(name = "邻井井号")
+    private String ljjh;
+
+    /** 完井日期 */
+    @Excel(name = "完井日期")
+    private String wjrq;
+
+    /** 层位 */
+    @Excel(name = "层位")
+    private String cw;
+
+    /** 井段(m) */
+    @Excel(name = "井段(m)")
+    private String jd;
+
+    /** 钻井液相对密度 */
+    @Excel(name = "钻井液相对密度")
+    private String zjyxdmd;
+
+    /** 槽面油气水显示及复杂情况 */
+    @Excel(name = "槽面油气水显示及复杂情况")
+    private String fzqk;
+
+    /** 位于井口方位(°) */
+    @Excel(name = "位于井口方位(°)")
+    private String jkfw;
+
+    /** 位于井口距离(m) */
+    @Excel(name = "位于井口距离(m)")
+    private String jklj;
+
+    /** 位于靶点方位(°) */
+    @Excel(name = "位于靶点方位(°)")
+    private String bdfw;
+
+    /** 位于靶点距离(m) */
+    @Excel(name = "位于靶点距离(m)")
+    private String bdlj;
+}

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

+package com.zjsgfa.project.zjsgfa.domain;
+
+import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
+import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 难度项目对象 sj_ndxm
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Data
+public class SjNdxm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 主表id */
+    @Excel(name = "主表id")
+    private Long zbid;
+
+    /** 水平位移(m) */
+    @Excel(name = "水平位移(m)")
+    private String spwy;
+
+    /** 造斜点(m) */
+    @Excel(name = "造斜点(m)")
+    private String zxdp;
+
+    /** 斜井段长(m) */
+    @Excel(name = "斜井段长(m)")
+    private String xjdc;
+
+    /** 裸眼段长(m) */
+    @Excel(name = "裸眼段长(m)")
+    private String lydc;
+
+    /** 密度(g/cm³) */
+    @Excel(name = "密度(g/cm³)")
+    private String md;
+
+    /** 井深<=1000m时密度(g/cm³) */
+    @Excel(name = "井深<=1000m时密度(g/cm³)")
+    private String md1;
+
+    /** 井斜(°) */
+    @Excel(name = "井斜(°)")
+    private String jx;
+
+    /** 位垂比 */
+    @Excel(name = "位垂比")
+    private String wcb;
+
+    /** 水平井垂深(m) */
+    @Excel(name = "水平井垂深(m)")
+    private String spjcs;
+
+    /** 开窗侧钻井裸眼段(m) */
+    @Excel(name = "开窗侧钻井裸眼段(m)")
+    private String kccdc;
+
+    /** 尾管是否安装 */
+    @Excel(name = "尾管是否安装")
+    private String wgsaz;
+
+    /** 开次 */
+    @Excel(name = "开次")
+    private String kc;
+
+    /** 五段制斜井后井斜降超过20°或扭方位超过60° */
+    @Excel(name = "五段制斜井后井斜降超过20°或扭方位超过60°")
+    private String jxtj;
+
+    /** 地质填井侧钻 */
+    @Excel(name = "地质填井侧钻")
+    private String dztjcz;
+
+    /** 难度系数计算值 */
+    @Excel(name = "难度系数计算值")
+    private String ndxsjs;
+
+    /** 难度系数调整值 */
+    @Excel(name = "难度系数调整值")
+    private String ndxstj;
+
+    /** 难度系数结果 */
+    @Excel(name = "难度系数结果")
+    private String ndxsjg;
+
+    /** 难度系数调整说明 */
+    @Excel(name = "难度系数调整说明")
+    private String tjsm;
+
+}

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

@@ -82,6 +82,19 @@ public class SjSggyZjyFdxnb extends BaseEntity
     @Excel(name = "创建人")
     @Excel(name = "创建人")
     private String createdBy;
     private String createdBy;
 
 
+
+    /** HTHP失水 */
+    @Excel(name = "HTHP失水")
+    private String hthpss;
+
+    /** HTHP泥饼 */
+    @Excel(name = "HTHP泥饼")
+    private String hthpnb;
+
+    /** MBT */
+    @Excel(name = "MBT")
+    private String mbt;
+
     /** 创建时间 */
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")

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

 package com.zjsgfa.project.zjsgfa.domain;
 package com.zjsgfa.project.zjsgfa.domain;
 
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
 import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
 import com.zjsgfa.framework.web.domain.BaseEntity;
 import com.zjsgfa.framework.web.domain.BaseEntity;
+import lombok.Data;
 
 
 /**
 /**
  * 设计-注水井情况对象 sj_zsjqk
  * 设计-注水井情况对象 sj_zsjqk
  * 
  * 
- * @author
- * @date 2025-08-05
+ * @author ruoyi
+ * @date 2026-02-04
  */
  */
+@Data
 public class SjZsjqk extends BaseEntity
 public class SjZsjqk extends BaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    /** 实际井号 */
-    @Excel(name = "实际井号")
+    /** 主键 */
+    private Long id;
+
+    /** 设计井号 */
+    @Excel(name = "设计井号")
     private String sjjh;
     private String sjjh;
 
 
     /** 井号 */
     /** 井号 */
@@ -41,19 +44,19 @@ public class SjZsjqk extends BaseEntity
 
 
     /** 井口压力 */
     /** 井口压力 */
     @Excel(name = "井口压力")
     @Excel(name = "井口压力")
-    private Double jkyl;
+    private String jkyl;
 
 
     /** 地层压力 */
     /** 地层压力 */
     @Excel(name = "地层压力")
     @Excel(name = "地层压力")
-    private Double dcyl;
+    private String dcyl;
 
 
     /** 日注量 */
     /** 日注量 */
     @Excel(name = "日注量")
     @Excel(name = "日注量")
-    private Double rzl;
+    private String rzl;
 
 
     /** 累计注入量 */
     /** 累计注入量 */
     @Excel(name = "累计注入量")
     @Excel(name = "累计注入量")
-    private Double ljzrl;
+    private String ljzrl;
 
 
     /** 注入状态 */
     /** 注入状态 */
     @Excel(name = "注入状态")
     @Excel(name = "注入状态")
@@ -61,173 +64,38 @@ public class SjZsjqk extends BaseEntity
 
 
     /** 井口距离 */
     /** 井口距离 */
     @Excel(name = "井口距离")
     @Excel(name = "井口距离")
-    private Double jkjl;
+    private String jkjl;
 
 
     /** 井底距离 */
     /** 井底距离 */
     @Excel(name = "井底距离")
     @Excel(name = "井底距离")
-    private Double jdjl;
+    private String jdjl;
 
 
     /** 是否停驻 */
     /** 是否停驻 */
     @Excel(name = "是否停驻")
     @Excel(name = "是否停驻")
     private String sftz;
     private String sftz;
 
 
-    public void setSjjh(String sjjh) 
-    {
-        this.sjjh = sjjh;
-    }
-
-    public String getSjjh() 
-    {
-        return sjjh;
-    }
-
-    public void setJh(String jh) 
-    {
-        this.jh = jh;
-    }
-
-    public String getJh() 
-    {
-        return jh;
-    }
-
-    public void setJhbm(String jhbm) 
-    {
-        this.jhbm = jhbm;
-    }
-
-    public String getJhbm() 
-    {
-        return jhbm;
-    }
-
-    public void setZqlxmc(String zqlxmc) 
-    {
-        this.zqlxmc = zqlxmc;
-    }
-
-    public String getZqlxmc() 
-    {
-        return zqlxmc;
-    }
-
-    public void setCwmc(String cwmc) 
-    {
-        this.cwmc = cwmc;
-    }
-
-    public String getCwmc() 
-    {
-        return cwmc;
-    }
-
-    public void setSdfw(String sdfw) 
-    {
-        this.sdfw = sdfw;
-    }
-
-    public String getSdfw() 
-    {
-        return sdfw;
-    }
-
-    public void setJkyl(Double jkyl) 
-    {
-        this.jkyl = jkyl;
-    }
-
-    public Double getJkyl() 
-    {
-        return jkyl;
-    }
-
-    public void setDcyl(Double dcyl) 
-    {
-        this.dcyl = dcyl;
-    }
-
-    public Double getDcyl() 
-    {
-        return dcyl;
-    }
-
-    public void setRzl(Double rzl) 
-    {
-        this.rzl = rzl;
-    }
-
-    public Double getRzl() 
-    {
-        return rzl;
-    }
-
-    public void setLjzrl(Double ljzrl) 
-    {
-        this.ljzrl = ljzrl;
-    }
-
-    public Double getLjzrl() 
-    {
-        return ljzrl;
-    }
-
-    public void setZrzt(String zrzt) 
-    {
-        this.zrzt = zrzt;
-    }
-
-    public String getZrzt() 
-    {
-        return zrzt;
-    }
-
-    public void setJkjl(Double jkjl) 
-    {
-        this.jkjl = jkjl;
-    }
-
-    public Double getJkjl() 
-    {
-        return jkjl;
-    }
-
-    public void setJdjl(Double jdjl) 
-    {
-        this.jdjl = jdjl;
-    }
-
-    public Double getJdjl() 
-    {
-        return jdjl;
-    }
-
-    public void setSftz(String sftz) 
-    {
-        this.sftz = sftz;
-    }
-
-    public String getSftz() 
-    {
-        return sftz;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("sjjh", getSjjh())
-            .append("jh", getJh())
-            .append("jhbm", getJhbm())
-            .append("zqlxmc", getZqlxmc())
-            .append("cwmc", getCwmc())
-            .append("sdfw", getSdfw())
-            .append("jkyl", getJkyl())
-            .append("dcyl", getDcyl())
-            .append("rzl", getRzl())
-            .append("ljzrl", getLjzrl())
-            .append("zrzt", getZrzt())
-            .append("jkjl", getJkjl())
-            .append("jdjl", getJdjl())
-            .append("sftz", getSftz())
-            .toString();
-    }
+    /** 注水井段 */
+    @Excel(name = "注水井段")
+    private String zsjd;
+
+    /** 井口注压 */
+    @Excel(name = "井口注压")
+    private String jkzy;
+
+    /** 井口方位 */
+    @Excel(name = "井口方位")
+    private String jkfw;
+
+    /** 靶点方位 */
+    @Excel(name = "靶点方位")
+    private String bdfw;
+
+    /** 靶点距离 */
+    @Excel(name = "靶点距离")
+    private String bdjl;
+
+    /** 操作 */
+    @Excel(name = "操作")
+    private String cz;
+
 }
 }

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

@@ -84,4 +84,17 @@ public class SjZtgjsj extends BaseEntity
     @Excel(name = "指标")
     @Excel(name = "指标")
     private Double zb;
     private Double zb;
 
 
+
+    /** 厂家 */
+    @Excel(name = "厂家")
+    private String cj;
+
+    /** 水眼 */
+    @Excel(name = "水眼")
+    private String sy;
+
+    /** 造斜点 */
+    @Excel(name = "造斜点")
+    private String zxd;
+
 }
 }

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

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.BizTodoItem;
+
+/**
+ * 待办事项Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-11
+ */
+public interface BizTodoItemMapper 
+{
+    /**
+     * 查询待办事项
+     * 
+     * @param id 待办事项主键
+     * @return 待办事项
+     */
+    public BizTodoItem selectBizTodoItemById(Long id);
+
+    /**
+     * 查询待办事项列表
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 待办事项集合
+     */
+    public List<BizTodoItem> selectBizTodoItemList(BizTodoItem bizTodoItem);
+
+    /**
+     * 新增待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    public int insertBizTodoItem(BizTodoItem bizTodoItem);
+
+    /**
+     * 修改待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    public int updateBizTodoItem(BizTodoItem bizTodoItem);
+
+    /**
+     * 删除待办事项
+     * 
+     * @param id 待办事项主键
+     * @return 结果
+     */
+    public int deleteBizTodoItemById(Long id);
+
+    /**
+     * 批量删除待办事项
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBizTodoItemByIds(Long[] ids);
+
+    BizTodoItem selectTodoItemByTaskId(String taskId);
+
+    List<String> selectTodoUserListByTaskId(String taskId);
+
+
+    String selectTodoUserByTaskId(String taskId);
+
+}

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

@@ -65,4 +65,6 @@ public interface SjDjjcMapper
 
 
     int batchDeleteByJhPrefix(@Param("jh") String jh);
     int batchDeleteByJhPrefix(@Param("jh") String jh);
 
 
+    SjDjjc selectSjDjjcByinstanceId(String instanceId);
+
 }
 }

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

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjGcjbsj;
+
+/**
+ * 工程基本数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface SjGcjbsjMapper 
+{
+    /**
+     * 查询工程基本数据
+     * 
+     * @param id 工程基本数据主键
+     * @return 工程基本数据
+     */
+    public SjGcjbsj selectSjGcjbsjById(Long id);
+
+    /**
+     * 查询工程基本数据列表
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 工程基本数据集合
+     */
+    public List<SjGcjbsj> selectSjGcjbsjList(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 新增工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    public int insertSjGcjbsj(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 修改工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    public int updateSjGcjbsj(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 删除工程基本数据
+     * 
+     * @param id 工程基本数据主键
+     * @return 结果
+     */
+    public int deleteSjGcjbsjById(Long id);
+
+    /**
+     * 批量删除工程基本数据
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGcjbsjByIds(Long[] ids);
+}

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

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
+
+/**
+ * 邻井复杂情况Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+public interface SjLjfzqkMapper 
+{
+    /**
+     * 查询邻井复杂情况
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 邻井复杂情况
+     */
+    public SjLjfzqk selectSjLjfzqkById(Long id);
+
+    /**
+     * 查询邻井复杂情况列表
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 邻井复杂情况集合
+     */
+    public List<SjLjfzqk> selectSjLjfzqkList(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 新增邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    public int insertSjLjfzqk(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 修改邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    public int updateSjLjfzqk(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 删除邻井复杂情况
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 结果
+     */
+    public int deleteSjLjfzqkById(Long id);
+
+    /**
+     * 批量删除邻井复杂情况
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjLjfzqkByIds(Long[] ids);
+
+    int deleteSjLjfzqkByJh(Long zbid);
+
+    int insertSjLjfzqkBatch(List<SjLjfzqk> jsqaList);
+
+}

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

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjLjzjysyqk;
+
+/**
+ * 邻井钻井液使用情况Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+public interface SjLjzjysyqkMapper 
+{
+    /**
+     * 查询邻井钻井液使用情况
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 邻井钻井液使用情况
+     */
+    public SjLjzjysyqk selectSjLjzjysyqkById(Long id);
+
+    /**
+     * 查询邻井钻井液使用情况列表
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 邻井钻井液使用情况集合
+     */
+    public List<SjLjzjysyqk> selectSjLjzjysyqkList(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 新增邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    public int insertSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 修改邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    public int updateSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 删除邻井钻井液使用情况
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 结果
+     */
+    public int deleteSjLjzjysyqkById(Long id);
+
+    /**
+     * 批量删除邻井钻井液使用情况
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjLjzjysyqkByIds(Long[] ids);
+}

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

+package com.zjsgfa.project.zjsgfa.mapper;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjNdxm;
+
+/**
+ * 难度项目Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface SjNdxmMapper 
+{
+    /**
+     * 查询难度项目
+     * 
+     * @param id 难度项目主键
+     * @return 难度项目
+     */
+    public SjNdxm selectSjNdxmById(Long id);
+
+    /**
+     * 查询难度项目列表
+     * 
+     * @param sjNdxm 难度项目
+     * @return 难度项目集合
+     */
+    public List<SjNdxm> selectSjNdxmList(SjNdxm sjNdxm);
+
+    /**
+     * 新增难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    public int insertSjNdxm(SjNdxm sjNdxm);
+
+    /**
+     * 修改难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    public int updateSjNdxm(SjNdxm sjNdxm);
+
+    /**
+     * 删除难度项目
+     * 
+     * @param id 难度项目主键
+     * @return 结果
+     */
+    public int deleteSjNdxmById(Long id);
+
+    /**
+     * 批量删除难度项目
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSjNdxmByIds(Long[] ids);
+}

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

@@ -6,18 +6,18 @@ import com.zjsgfa.project.zjsgfa.domain.SjZsjqk;
 /**
 /**
  * 设计-注水井情况Mapper接口
  * 设计-注水井情况Mapper接口
  * 
  * 
- * @author
- * @date 2025-08-05
+ * @author ruoyi
+ * @date 2026-02-04
  */
  */
 public interface SjZsjqkMapper 
 public interface SjZsjqkMapper 
 {
 {
     /**
     /**
      * 查询设计-注水井情况
      * 查询设计-注水井情况
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 设计-注水井情况
      * @return 设计-注水井情况
      */
      */
-    public SjZsjqk selectSjZsjqkBySjjh(String sjjh);
+    public SjZsjqk selectSjZsjqkById(Long id);
 
 
     /**
     /**
      * 查询设计-注水井情况列表
      * 查询设计-注水井情况列表
@@ -46,20 +46,16 @@ public interface SjZsjqkMapper
     /**
     /**
      * 删除设计-注水井情况
      * 删除设计-注水井情况
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteSjZsjqkBySjjh(String sjjh);
+    public int deleteSjZsjqkById(Long id);
 
 
     /**
     /**
      * 批量删除设计-注水井情况
      * 批量删除设计-注水井情况
      * 
      * 
-     * @param sjjhs 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteSjZsjqkBySjjhs(String[] sjjhs);
-
-    int insertSjZsjqkBatch(List<SjZsjqk> list);
-
-
+    public int deleteSjZsjqkByIds(Long[] ids);
 }
 }

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

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.BizTodoItem;
+
+/**
+ * 待办事项Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-11
+ */
+public interface IBizTodoItemService 
+{
+    /**
+     * 查询待办事项
+     * 
+     * @param id 待办事项主键
+     * @return 待办事项
+     */
+    public BizTodoItem selectBizTodoItemById(Long id);
+
+    /**
+     * 查询待办事项列表
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 待办事项集合
+     */
+    public List<BizTodoItem> selectBizTodoItemList(BizTodoItem bizTodoItem);
+
+    /**
+     * 新增待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    public int insertBizTodoItem(BizTodoItem bizTodoItem);
+
+    /**
+     * 修改待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    public int updateBizTodoItem(BizTodoItem bizTodoItem);
+
+    /**
+     * 批量删除待办事项
+     * 
+     * @param ids 需要删除的待办事项主键集合
+     * @return 结果
+     */
+    public int deleteBizTodoItemByIds(Long[] ids);
+
+    /**
+     * 删除待办事项信息
+     * 
+     * @param id 待办事项主键
+     * @return 结果
+     */
+    public int deleteBizTodoItemById(Long id);
+
+
+//    int insertTodoItem(String instanceId, String itemName, String itemContent, String module);
+}

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

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjGcjbsj;
+
+/**
+ * 工程基本数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface ISjGcjbsjService 
+{
+    /**
+     * 查询工程基本数据
+     * 
+     * @param id 工程基本数据主键
+     * @return 工程基本数据
+     */
+    public SjGcjbsj selectSjGcjbsjById(Long id);
+
+    /**
+     * 查询工程基本数据列表
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 工程基本数据集合
+     */
+    public List<SjGcjbsj> selectSjGcjbsjList(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 新增工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    public int insertSjGcjbsj(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 修改工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    public int updateSjGcjbsj(SjGcjbsj sjGcjbsj);
+
+    /**
+     * 批量删除工程基本数据
+     * 
+     * @param ids 需要删除的工程基本数据主键集合
+     * @return 结果
+     */
+    public int deleteSjGcjbsjByIds(Long[] ids);
+
+    /**
+     * 删除工程基本数据信息
+     * 
+     * @param id 工程基本数据主键
+     * @return 结果
+     */
+    public int deleteSjGcjbsjById(Long id);
+}

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

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
+
+/**
+ * 邻井复杂情况Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+public interface ISjLjfzqkService 
+{
+    /**
+     * 查询邻井复杂情况
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 邻井复杂情况
+     */
+    public SjLjfzqk selectSjLjfzqkById(Long id);
+
+    /**
+     * 查询邻井复杂情况列表
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 邻井复杂情况集合
+     */
+    public List<SjLjfzqk> selectSjLjfzqkList(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 新增邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    public int insertSjLjfzqk(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 修改邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    public int updateSjLjfzqk(SjLjfzqk sjLjfzqk);
+
+    /**
+     * 批量删除邻井复杂情况
+     * 
+     * @param ids 需要删除的邻井复杂情况主键集合
+     * @return 结果
+     */
+    public int deleteSjLjfzqkByIds(Long[] ids);
+
+    /**
+     * 删除邻井复杂情况信息
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 结果
+     */
+    public int deleteSjLjfzqkById(Long id);
+}

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

@@ -63,4 +63,6 @@ public interface ISjLjjwService
 
 
     int deleteSjLjjwByJh(String jh);
     int deleteSjLjjwByJh(String jh);
 
 
+    int insertSjLjjwBatch2(List<SjLjjw> list) throws Exception;
+
 }
 }

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

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjLjzjysyqk;
+
+/**
+ * 邻井钻井液使用情况Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+public interface ISjLjzjysyqkService 
+{
+    /**
+     * 查询邻井钻井液使用情况
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 邻井钻井液使用情况
+     */
+    public SjLjzjysyqk selectSjLjzjysyqkById(Long id);
+
+    /**
+     * 查询邻井钻井液使用情况列表
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 邻井钻井液使用情况集合
+     */
+    public List<SjLjzjysyqk> selectSjLjzjysyqkList(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 新增邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    public int insertSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 修改邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    public int updateSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk);
+
+    /**
+     * 批量删除邻井钻井液使用情况
+     * 
+     * @param ids 需要删除的邻井钻井液使用情况主键集合
+     * @return 结果
+     */
+    public int deleteSjLjzjysyqkByIds(Long[] ids);
+
+    /**
+     * 删除邻井钻井液使用情况信息
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 结果
+     */
+    public int deleteSjLjzjysyqkById(Long id);
+}

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

+package com.zjsgfa.project.zjsgfa.service;
+
+import java.util.List;
+import com.zjsgfa.project.zjsgfa.domain.SjNdxm;
+
+/**
+ * 难度项目Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+public interface ISjNdxmService 
+{
+    /**
+     * 查询难度项目
+     * 
+     * @param id 难度项目主键
+     * @return 难度项目
+     */
+    public SjNdxm selectSjNdxmById(Long id);
+
+    /**
+     * 查询难度项目列表
+     * 
+     * @param sjNdxm 难度项目
+     * @return 难度项目集合
+     */
+    public List<SjNdxm> selectSjNdxmList(SjNdxm sjNdxm);
+
+    /**
+     * 新增难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    public int insertSjNdxm(SjNdxm sjNdxm);
+
+    /**
+     * 修改难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    public int updateSjNdxm(SjNdxm sjNdxm);
+
+    /**
+     * 批量删除难度项目
+     * 
+     * @param ids 需要删除的难度项目主键集合
+     * @return 结果
+     */
+    public int deleteSjNdxmByIds(Long[] ids);
+
+    /**
+     * 删除难度项目信息
+     * 
+     * @param id 难度项目主键
+     * @return 结果
+     */
+    public int deleteSjNdxmById(Long id);
+}

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

 package com.zjsgfa.project.zjsgfa.service;
 package com.zjsgfa.project.zjsgfa.service;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 import com.zjsgfa.project.zjsgfa.domain.SjSggyZjyFdxnb;
 import com.zjsgfa.project.zjsgfa.domain.SjSggyZjyFdxnb;
@@ -59,4 +60,6 @@ public interface ISjSggyZjyFdxnbService
      * @return 结果
      * @return 结果
      */
      */
     public int deleteSjSggyZjyFdxnbById(Long id);
     public int deleteSjSggyZjyFdxnbById(Long id);
+
+    int insertSjSggyZjyFdxnbBatch(List<SjSggyZjyFdxnb> list);
 }
 }

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

@@ -6,18 +6,18 @@ import com.zjsgfa.project.zjsgfa.domain.SjZsjqk;
 /**
 /**
  * 设计-注水井情况Service接口
  * 设计-注水井情况Service接口
  * 
  * 
- * @author
- * @date 2025-08-05
+ * @author ruoyi
+ * @date 2026-02-04
  */
  */
 public interface ISjZsjqkService 
 public interface ISjZsjqkService 
 {
 {
     /**
     /**
      * 查询设计-注水井情况
      * 查询设计-注水井情况
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 设计-注水井情况
      * @return 设计-注水井情况
      */
      */
-    public SjZsjqk selectSjZsjqkBySjjh(String sjjh);
+    public SjZsjqk selectSjZsjqkById(Long id);
 
 
     /**
     /**
      * 查询设计-注水井情况列表
      * 查询设计-注水井情况列表
@@ -46,19 +46,16 @@ public interface ISjZsjqkService
     /**
     /**
      * 批量删除设计-注水井情况
      * 批量删除设计-注水井情况
      * 
      * 
-     * @param sjjhs 需要删除的设计-注水井情况主键集合
+     * @param ids 需要删除的设计-注水井情况主键集合
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteSjZsjqkBySjjhs(String[] sjjhs);
+    public int deleteSjZsjqkByIds(Long[] ids);
 
 
     /**
     /**
      * 删除设计-注水井情况信息
      * 删除设计-注水井情况信息
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteSjZsjqkBySjjh(String sjjh);
-
-    int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList);
-
+    public int deleteSjZsjqkById(Long id);
 }
 }

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

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+
+import com.zjsgfa.common.utils.DateUtils;
+import com.zjsgfa.common.utils.StringUtils;
+import com.zjsgfa.project.system.domain.SysUser;
+import com.zjsgfa.project.system.mapper.SysUserMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.BizTodoItemMapper;
+import com.zjsgfa.project.zjsgfa.domain.BizTodoItem;
+import com.zjsgfa.project.zjsgfa.service.IBizTodoItemService;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 待办事项Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-11
+ */
+@Service
+public class BizTodoItemServiceImpl implements IBizTodoItemService 
+{
+    @Autowired
+    private BizTodoItemMapper bizTodoItemMapper;
+
+//    @Autowired
+//    private TaskService taskService;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    /**
+     * 查询待办事项
+     * 
+     * @param id 待办事项主键
+     * @return 待办事项
+     */
+    @Override
+    public BizTodoItem selectBizTodoItemById(Long id)
+    {
+        return bizTodoItemMapper.selectBizTodoItemById(id);
+    }
+
+    /**
+     * 查询待办事项列表
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 待办事项
+     */
+    @Override
+    public List<BizTodoItem> selectBizTodoItemList(BizTodoItem bizTodoItem)
+    {
+        return bizTodoItemMapper.selectBizTodoItemList(bizTodoItem);
+    }
+
+    /**
+     * 新增待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    @Override
+    public int insertBizTodoItem(BizTodoItem bizTodoItem)
+    {
+        return bizTodoItemMapper.insertBizTodoItem(bizTodoItem);
+    }
+
+    /**
+     * 修改待办事项
+     * 
+     * @param bizTodoItem 待办事项
+     * @return 结果
+     */
+    @Override
+    public int updateBizTodoItem(BizTodoItem bizTodoItem)
+    {
+        return bizTodoItemMapper.updateBizTodoItem(bizTodoItem);
+    }
+
+    /**
+     * 批量删除待办事项
+     * 
+     * @param ids 需要删除的待办事项主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizTodoItemByIds(Long[] ids)
+    {
+        return bizTodoItemMapper.deleteBizTodoItemByIds(ids);
+    }
+
+    /**
+     * 删除待办事项信息
+     * 
+     * @param id 待办事项主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBizTodoItemById(Long id)
+    {
+        return bizTodoItemMapper.deleteBizTodoItemById(id);
+    }
+
+//    @Override
+//    public int insertTodoItem(String instanceId, String itemName, String itemContent, String module) {
+//        BizTodoItem todoItem = new BizTodoItem();
+//        todoItem.setItemName(itemName);
+//        todoItem.setItemContent(itemContent);
+//        todoItem.setIsView("0");
+//        todoItem.setIsHandle("0");
+//        todoItem.setModule(module);
+//        todoItem.setTodoTime(DateUtils.getNowDate());
+//        List<Task> taskList = taskService.createTaskQuery().processInstanceId(instanceId).active().list();
+//        int counter = 0;
+//        for (Task task: taskList) {
+//
+//            // todoitem 去重
+//            BizTodoItem bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId());
+//            if (bizTodoItem != null) continue;
+//
+//            BizTodoItem newItem = new BizTodoItem();
+//            BeanUtils.copyProperties(todoItem, newItem);
+//            newItem.setInstanceId(instanceId);
+//            newItem.setTaskId(task.getId());
+//            newItem.setTaskName("task" + task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1));
+//            newItem.setNodeName(task.getName());
+//            String assignee = task.getAssignee();
+//            if (StringUtils.isNotBlank(assignee)) {
+//                newItem.setTodoUserId(assignee);
+//                SysUser user = userMapper.selectUserByLoginName(assignee);
+//                newItem.setTodoUserName(user.getNickName());
+//                bizTodoItemMapper.insertBizTodoItem(newItem);
+//                counter++;
+//            } else {
+//                // 查询候选用户组
+//                List<String> todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId());
+//                if (!CollectionUtils.isEmpty(todoUserIdList)) {
+//                    for (String todoUserId: todoUserIdList) {
+//                        SysUser todoUser = userMapper.selectUserByLoginName(todoUserId);
+//                        newItem.setTodoUserId(todoUser.getUserName());
+//                        newItem.setTodoUserName(todoUser.getNickName());
+//                        bizTodoItemMapper.insertBizTodoItem(newItem);
+//                        counter++;
+//                    }
+//                } else {
+//                    // 查询候选用户
+//                    String todoUserId = bizTodoItemMapper.selectTodoUserByTaskId(task.getId());
+//                    SysUser todoUser = userMapper.selectUserByLoginName(todoUserId);
+//                    newItem.setTodoUserId(todoUser.getUserName());
+//                    newItem.setTodoUserName(todoUser.getNickName());
+//                    bizTodoItemMapper.insertBizTodoItem(newItem);
+//                    counter++;
+//                }
+//            }
+//        }
+//        return counter;
+//    }
+}

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

@@ -330,7 +330,7 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
             String json = gson.toJson(map);
             String json = gson.toJson(map);
             //调用httpsPost请求获取数据
             //调用httpsPost请求获取数据
 //            String url = "https://10.68.249.59:12001/api/ljzjymd";
 //            String url = "https://10.68.249.59:12001/api/ljzjymd";
-            String url = "http://10.68.202.238:12001/api/ljzjymd";
+            String url = "http://10.68.249.11:12001/api/ljzjymd";
             System.out.println(json);
             System.out.println(json);
             String result = HttpRequest.post(url).body(json).execute().body();
             String result = HttpRequest.post(url).body(json).execute().body();
             System.out.println(result);
             System.out.println(result);

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

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SjGcjbsjMapper;
+import com.zjsgfa.project.zjsgfa.domain.SjGcjbsj;
+import com.zjsgfa.project.zjsgfa.service.ISjGcjbsjService;
+
+/**
+ * 工程基本数据Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Service
+public class SjGcjbsjServiceImpl implements ISjGcjbsjService 
+{
+    @Autowired
+    private SjGcjbsjMapper sjGcjbsjMapper;
+
+    /**
+     * 查询工程基本数据
+     * 
+     * @param id 工程基本数据主键
+     * @return 工程基本数据
+     */
+    @Override
+    public SjGcjbsj selectSjGcjbsjById(Long id)
+    {
+        return sjGcjbsjMapper.selectSjGcjbsjById(id);
+    }
+
+    /**
+     * 查询工程基本数据列表
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 工程基本数据
+     */
+    @Override
+    public List<SjGcjbsj> selectSjGcjbsjList(SjGcjbsj sjGcjbsj)
+    {
+        return sjGcjbsjMapper.selectSjGcjbsjList(sjGcjbsj);
+    }
+
+    /**
+     * 新增工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    @Override
+    public int insertSjGcjbsj(SjGcjbsj sjGcjbsj)
+    {
+
+        return sjGcjbsjMapper.insertSjGcjbsj(sjGcjbsj);
+    }
+
+    /**
+     * 修改工程基本数据
+     * 
+     * @param sjGcjbsj 工程基本数据
+     * @return 结果
+     */
+    @Override
+    public int updateSjGcjbsj(SjGcjbsj sjGcjbsj)
+    {
+        return sjGcjbsjMapper.updateSjGcjbsj(sjGcjbsj);
+    }
+
+    /**
+     * 批量删除工程基本数据
+     * 
+     * @param ids 需要删除的工程基本数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGcjbsjByIds(Long[] ids)
+    {
+        return sjGcjbsjMapper.deleteSjGcjbsjByIds(ids);
+    }
+
+    /**
+     * 删除工程基本数据信息
+     * 
+     * @param id 工程基本数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjGcjbsjById(Long id)
+    {
+        return sjGcjbsjMapper.deleteSjGcjbsjById(id);
+    }
+}

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

@@ -161,6 +161,58 @@ public class SjJkzpServiceImpl implements ISjJkzpService
         if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
         if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
             sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
             sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
         }
         }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getDzfc())){
+            sjJkzp.setDzfc(new String(Base64.decode(sjJkzp.getDzfc()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQjzdts())){
+            sjJkzp.setQjzdts(new String(Base64.decode(sjJkzp.getQjzdts()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzdts())){
+            sjJkzp.setFjdzdts(new String(Base64.decode(sjJkzp.getFjdzdts()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getWjzyts())){
+            sjJkzp.setWjzyts(new String(Base64.decode(sjJkzp.getWjzyts()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQtzdts())){
+            sjJkzp.setQtzdts(new String(Base64.decode(sjJkzp.getQtzdts()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getLjzjysyqk())){
+            sjJkzp.setLjzjysyqk(new String(Base64.decode(sjJkzp.getLjzjysyqk()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getSgzd())){
+            sjJkzp.setSgzd(new String(Base64.decode(sjJkzp.getSgzd()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzjyxn())){
+            sjJkzp.setFjdzjyxn(new String(Base64.decode(sjJkzp.getFjdzjyxn()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdcljdjl())){
+            sjJkzp.setFjdcljdjl(new String(Base64.decode(sjJkzp.getFjdcljdjl()), StandardCharsets.UTF_8));
+        }
+
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzjywhycl())){
+            sjJkzp.setFjdzjywhycl(new String(Base64.decode(sjJkzp.getFjdzjywhycl()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQtyq())){
+            sjJkzp.setQtyq(new String(Base64.decode(sjJkzp.getQtyq()), StandardCharsets.UTF_8));
+        }
+
+
         return sjJkzpMapper.insertSjJkzp(sjJkzp);
         return sjJkzpMapper.insertSjJkzp(sjJkzp);
     }
     }
 
 
@@ -186,6 +238,59 @@ public class SjJkzpServiceImpl implements ISjJkzpService
         if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
         if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
             sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
             sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
         }
         }
+
+
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getDzfc())){
+            sjJkzp.setDzfc(new String(Base64.decode(sjJkzp.getDzfc()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQjzdts())){
+            sjJkzp.setQjzdts(new String(Base64.decode(sjJkzp.getQjzdts()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzdts())){
+            sjJkzp.setFjdzdts(new String(Base64.decode(sjJkzp.getFjdzdts()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getWjzyts())){
+            sjJkzp.setWjzyts(new String(Base64.decode(sjJkzp.getWjzyts()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQtzdts())){
+            sjJkzp.setQtzdts(new String(Base64.decode(sjJkzp.getQtzdts()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getLjzjysyqk())){
+            sjJkzp.setLjzjysyqk(new String(Base64.decode(sjJkzp.getLjzjysyqk()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getSgzd())){
+            sjJkzp.setSgzd(new String(Base64.decode(sjJkzp.getSgzd()), StandardCharsets.UTF_8));
+        }
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzjyxn())){
+            sjJkzp.setFjdzjyxn(new String(Base64.decode(sjJkzp.getFjdzjyxn()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdcljdjl())){
+            sjJkzp.setFjdcljdjl(new String(Base64.decode(sjJkzp.getFjdcljdjl()), StandardCharsets.UTF_8));
+        }
+
+
+
+        if(StringUtils.isNotEmpty(sjJkzp.getFjdzjywhycl())){
+            sjJkzp.setFjdzjywhycl(new String(Base64.decode(sjJkzp.getFjdzjywhycl()), StandardCharsets.UTF_8));
+        }
+
+        if(StringUtils.isNotEmpty(sjJkzp.getQtyq())){
+            sjJkzp.setQtyq(new String(Base64.decode(sjJkzp.getQtyq()), StandardCharsets.UTF_8));
+        }
         sjJkzp.setUpdateTime(DateUtils.getNowDate());
         sjJkzp.setUpdateTime(DateUtils.getNowDate());
         return sjJkzpMapper.updateSjJkzp(sjJkzp);
         return sjJkzpMapper.updateSjJkzp(sjJkzp);
     }
     }

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

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SjLjfzqkMapper;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
+import com.zjsgfa.project.zjsgfa.service.ISjLjfzqkService;
+
+/**
+ * 邻井复杂情况Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+@Service
+public class SjLjfzqkServiceImpl implements ISjLjfzqkService 
+{
+    @Autowired
+    private SjLjfzqkMapper sjLjfzqkMapper;
+
+    /**
+     * 查询邻井复杂情况
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 邻井复杂情况
+     */
+    @Override
+    public SjLjfzqk selectSjLjfzqkById(Long id)
+    {
+        return sjLjfzqkMapper.selectSjLjfzqkById(id);
+    }
+
+    /**
+     * 查询邻井复杂情况列表
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 邻井复杂情况
+     */
+    @Override
+    public List<SjLjfzqk> selectSjLjfzqkList(SjLjfzqk sjLjfzqk)
+    {
+        return sjLjfzqkMapper.selectSjLjfzqkList(sjLjfzqk);
+    }
+
+    /**
+     * 新增邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    @Override
+    public int insertSjLjfzqk(SjLjfzqk sjLjfzqk)
+    {
+        return sjLjfzqkMapper.insertSjLjfzqk(sjLjfzqk);
+    }
+
+    /**
+     * 修改邻井复杂情况
+     * 
+     * @param sjLjfzqk 邻井复杂情况
+     * @return 结果
+     */
+    @Override
+    public int updateSjLjfzqk(SjLjfzqk sjLjfzqk)
+    {
+        return sjLjfzqkMapper.updateSjLjfzqk(sjLjfzqk);
+    }
+
+    /**
+     * 批量删除邻井复杂情况
+     * 
+     * @param ids 需要删除的邻井复杂情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjLjfzqkByIds(Long[] ids)
+    {
+        return sjLjfzqkMapper.deleteSjLjfzqkByIds(ids);
+    }
+
+    /**
+     * 删除邻井复杂情况信息
+     * 
+     * @param id 邻井复杂情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjLjfzqkById(Long id)
+    {
+        return sjLjfzqkMapper.deleteSjLjfzqkById(id);
+    }
+}

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

 package com.zjsgfa.project.zjsgfa.service.impl;
 package com.zjsgfa.project.zjsgfa.service.impl;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
+import com.zjsgfa.common.utils.bean.BeanUtils;
+import com.zjsgfa.project.zjsgfa.domain.SjDjjc;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
+import com.zjsgfa.project.zjsgfa.domain.SjZtgjsj;
+import com.zjsgfa.project.zjsgfa.mapper.SjDjjcMapper;
+import com.zjsgfa.project.zjsgfa.mapper.SjLjfzqkMapper;
+import com.zjsgfa.project.zjsgfa.mapper.SjZtgjsjMapper;
+import com.zjsgfa.project.zt.domain.CommonParam;
+import com.zjsgfa.project.zt.domain.DjZqsjfx;
+import com.zjsgfa.project.zt.domain.Djjc;
+import com.zjsgfa.project.zt.domain.Jsqa;
+import com.zjsgfa.project.zt.service.DjdcService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.zjsgfa.project.zjsgfa.mapper.SjLjjwMapper;
 import com.zjsgfa.project.zjsgfa.mapper.SjLjjwMapper;
@@ -22,6 +35,18 @@ public class SjLjjwServiceImpl implements ISjLjjwService
     @Autowired
     @Autowired
     private SjLjjwMapper sjLjjwMapper;
     private SjLjjwMapper sjLjjwMapper;
 
 
+    @Autowired
+    private SjDjjcMapper sjDjjcMapper;
+    @Autowired
+    private DjdcService djdcService;
+
+    @Autowired
+    private SjZtgjsjMapper sjZtgjsjMapper;
+
+
+    @Autowired
+    private SjLjfzqkMapper sjLjfzqkMapper;
+
     /**
     /**
      * 查询设计-邻井井位
      * 查询设计-邻井井位
      * 
      * 
@@ -101,6 +126,8 @@ public class SjLjjwServiceImpl implements ISjLjjwService
         sjLjjw.setJh(jh);
         sjLjjw.setJh(jh);
         sjLjjw.setLb1(list.get(0).getLb1());
         sjLjjw.setLb1(list.get(0).getLb1());
 
 
+
+        //钻头数据信息
         List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw);
         List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw);
 
 
         Set<String> jhSet = sjLjjws.stream()
         Set<String> jhSet = sjLjjws.stream()
@@ -109,6 +136,10 @@ public class SjLjjwServiceImpl implements ISjLjjwService
         List<SjLjjw> difference = list.stream()
         List<SjLjjw> difference = list.stream()
                 .filter(item -> !jhSet.contains(item.getLjjh()))
                 .filter(item -> !jhSet.contains(item.getLjjh()))
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+
+
+
+
         if(difference.size()>0){
         if(difference.size()>0){
             int i = sjLjjwMapper.insertSjLjjwBatch(difference);
             int i = sjLjjwMapper.insertSjLjjwBatch(difference);
             return i;
             return i;
@@ -116,10 +147,82 @@ public class SjLjjwServiceImpl implements ISjLjjwService
             return 1;
             return 1;
         }
         }
 
 
+
+
+
     }
     }
 
 
     @Override
     @Override
     public int deleteSjLjjwByJh(String jh) {
     public int deleteSjLjjwByJh(String jh) {
         return sjLjjwMapper.deleteSjLjjwByJh(jh);
         return sjLjjwMapper.deleteSjLjjwByJh(jh);
     }
     }
+
+    @Override
+    public int insertSjLjjwBatch2(List<SjLjjw> list) throws Exception {
+        String jh = list.get(0).getJh();
+        SjLjjw sjLjjw=new SjLjjw();
+        sjLjjw.setJh(jh);
+        sjLjjw.setLb1(list.get(0).getLb1());
+
+        List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw);
+
+        Set<String> jhSet = sjLjjws.stream()
+                .map(SjLjjw::getLjjh)
+                .collect(Collectors.toSet());
+        List<SjLjjw> difference = list.stream()
+                .filter(item -> !jhSet.contains(item.getLjjh()))
+                .collect(Collectors.toList());
+        SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcByJh(jh);
+        //钻头数据信息
+        CommonParam param1 = new CommonParam();
+        param1.setJh(String.join(",",list.stream().map(SjLjjw::getLjjh).collect(Collectors.toList())));
+        List<Djjc> djjcList = djdcService.getDjjcList(param1);
+        List<SjZtgjsj> sjZtgjsjList=new ArrayList<>();
+
+        djjcList.forEach(item->{
+            SjZtgjsj sjZtgjsj=new SjZtgjsj();
+            BeanUtils.copyProperties(item,sjZtgjsj);
+            sjZtgjsj.setJh(jh);
+            sjZtgjsj.setLjjh(item.getJh());
+            sjZtgjsj.setSy(item.getPz());
+            sjZtgjsj.setZjymd(item.getZjymd()!=null?item.getZjymd().toString():"");
+            String kc  =item.getKc();
+            if(kc.equals("1")){
+                kc="一开";
+            }else if(kc.equals("2")){
+                kc="二开";
+            }else if(kc.equals("3")){
+                kc="三开";
+            }else if(kc.equals("4")){
+                kc="四开";
+            }else if(kc.equals("5")){
+                kc="五开";
+            }
+            sjZtgjsj.setKc(kc);
+            sjZtgjsjList.add(sjZtgjsj);
+        });
+        if(sjZtgjsjList.size()>0){
+            sjZtgjsjMapper.deleteSjZtgjsjByJh(jh);
+            sjZtgjsjMapper.insertSjZtgjsjBatch(sjZtgjsjList);
+        }
+        //复杂情况
+        param1.setJkhzb(sjDjjc.getJkhzb());
+        param1.setJkzzb(sjDjjc.getJkzzb());
+        List<SjLjfzqk> jsqaList=djdcService.getJsqaListByJh(param1);
+        if(jsqaList.size()>0){
+            jsqaList.forEach(it->{it.setZbid(sjDjjc.getId());});
+            sjLjfzqkMapper.deleteSjLjfzqkByJh(sjDjjc.getId());
+            sjLjfzqkMapper.insertSjLjfzqkBatch(jsqaList);
+        }
+
+
+
+        if(difference.size()>0){
+            int i = sjLjjwMapper.insertSjLjjwBatch(difference);
+            return i;
+        }else {
+            return 1;
+        }
+
+    }
 }
 }

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

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SjLjzjysyqkMapper;
+import com.zjsgfa.project.zjsgfa.domain.SjLjzjysyqk;
+import com.zjsgfa.project.zjsgfa.service.ISjLjzjysyqkService;
+
+/**
+ * 邻井钻井液使用情况Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-04
+ */
+@Service
+public class SjLjzjysyqkServiceImpl implements ISjLjzjysyqkService 
+{
+    @Autowired
+    private SjLjzjysyqkMapper sjLjzjysyqkMapper;
+
+    /**
+     * 查询邻井钻井液使用情况
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 邻井钻井液使用情况
+     */
+    @Override
+    public SjLjzjysyqk selectSjLjzjysyqkById(Long id)
+    {
+        return sjLjzjysyqkMapper.selectSjLjzjysyqkById(id);
+    }
+
+    /**
+     * 查询邻井钻井液使用情况列表
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 邻井钻井液使用情况
+     */
+    @Override
+    public List<SjLjzjysyqk> selectSjLjzjysyqkList(SjLjzjysyqk sjLjzjysyqk)
+    {
+        return sjLjzjysyqkMapper.selectSjLjzjysyqkList(sjLjzjysyqk);
+    }
+
+    /**
+     * 新增邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    @Override
+    public int insertSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk)
+    {
+        return sjLjzjysyqkMapper.insertSjLjzjysyqk(sjLjzjysyqk);
+    }
+
+    /**
+     * 修改邻井钻井液使用情况
+     * 
+     * @param sjLjzjysyqk 邻井钻井液使用情况
+     * @return 结果
+     */
+    @Override
+    public int updateSjLjzjysyqk(SjLjzjysyqk sjLjzjysyqk)
+    {
+        return sjLjzjysyqkMapper.updateSjLjzjysyqk(sjLjzjysyqk);
+    }
+
+    /**
+     * 批量删除邻井钻井液使用情况
+     * 
+     * @param ids 需要删除的邻井钻井液使用情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjLjzjysyqkByIds(Long[] ids)
+    {
+        return sjLjzjysyqkMapper.deleteSjLjzjysyqkByIds(ids);
+    }
+
+    /**
+     * 删除邻井钻井液使用情况信息
+     * 
+     * @param id 邻井钻井液使用情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjLjzjysyqkById(Long id)
+    {
+        return sjLjzjysyqkMapper.deleteSjLjzjysyqkById(id);
+    }
+}

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

+package com.zjsgfa.project.zjsgfa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zjsgfa.project.zjsgfa.mapper.SjNdxmMapper;
+import com.zjsgfa.project.zjsgfa.domain.SjNdxm;
+import com.zjsgfa.project.zjsgfa.service.ISjNdxmService;
+
+/**
+ * 难度项目Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-02-02
+ */
+@Service
+public class SjNdxmServiceImpl implements ISjNdxmService 
+{
+    @Autowired
+    private SjNdxmMapper sjNdxmMapper;
+
+    /**
+     * 查询难度项目
+     * 
+     * @param id 难度项目主键
+     * @return 难度项目
+     */
+    @Override
+    public SjNdxm selectSjNdxmById(Long id)
+    {
+        return sjNdxmMapper.selectSjNdxmById(id);
+    }
+
+    /**
+     * 查询难度项目列表
+     * 
+     * @param sjNdxm 难度项目
+     * @return 难度项目
+     */
+    @Override
+    public List<SjNdxm> selectSjNdxmList(SjNdxm sjNdxm)
+    {
+        return sjNdxmMapper.selectSjNdxmList(sjNdxm);
+    }
+
+    /**
+     * 新增难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    @Override
+    public int insertSjNdxm(SjNdxm sjNdxm)
+    {
+        return sjNdxmMapper.insertSjNdxm(sjNdxm);
+    }
+
+    /**
+     * 修改难度项目
+     * 
+     * @param sjNdxm 难度项目
+     * @return 结果
+     */
+    @Override
+    public int updateSjNdxm(SjNdxm sjNdxm)
+    {
+        return sjNdxmMapper.updateSjNdxm(sjNdxm);
+    }
+
+    /**
+     * 批量删除难度项目
+     * 
+     * @param ids 需要删除的难度项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjNdxmByIds(Long[] ids)
+    {
+        return sjNdxmMapper.deleteSjNdxmByIds(ids);
+    }
+
+    /**
+     * 删除难度项目信息
+     * 
+     * @param id 难度项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSjNdxmById(Long id)
+    {
+        return sjNdxmMapper.deleteSjNdxmById(id);
+    }
+}

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

@@ -68,7 +68,11 @@ public class SjSggyZjyFdxnbServiceImpl implements ISjSggyZjyFdxnbService
                 new HashMap<String, String>() {{ put("name", "总固含(%)"); put("field", "zgh"); }},
                 new HashMap<String, String>() {{ put("name", "总固含(%)"); put("field", "zgh"); }},
                 new HashMap<String, String>() {{ put("name", "摩阻系数"); put("field", "mzxs"); }},
                 new HashMap<String, String>() {{ put("name", "摩阻系数"); put("field", "mzxs"); }},
                 new HashMap<String, String>() {{ put("name", "动切力(Pa)"); put("field", "dql"); }},
                 new HashMap<String, String>() {{ put("name", "动切力(Pa)"); put("field", "dql"); }},
-                new HashMap<String, String>() {{ put("name", "塑性黏度(mPa·s)"); put("field", "sxnd"); }}
+                new HashMap<String, String>() {{ put("name", "塑性黏度(mPa·s)"); put("field", "sxnd"); }},
+                new HashMap<String, String>() {{ put("name", "HTHP失水 (ml)"); put("field", "hthpss"); }},
+                new HashMap<String, String>() {{ put("name", "HTHP泥饼 (mm)"); put("field", "hthpnb"); }},
+                new HashMap<String, String>() {{ put("name", "MBT"); put("field", "mbt"); }},
+                new HashMap<String, String>() {{ put("name", "id"); put("field", "id"); }}
         );
         );
 
 
         // 提取井段（去重，按顺序排列）
         // 提取井段（去重，按顺序排列）
@@ -176,4 +180,13 @@ public class SjSggyZjyFdxnbServiceImpl implements ISjSggyZjyFdxnbService
     {
     {
         return sjSggyZjyFdxnbMapper.deleteSjSggyZjyFdxnbById(id);
         return sjSggyZjyFdxnbMapper.deleteSjSggyZjyFdxnbById(id);
     }
     }
+
+    @Override
+    public int insertSjSggyZjyFdxnbBatch(List<SjSggyZjyFdxnb> list) {
+        if(list.size()>0){
+            sjSggyZjyFdxnbMapper.deleteSjSggyZjyFdxnbByJh(list.get(0).getJh());
+        }
+
+        return sjSggyZjyFdxnbMapper.insertSjSggyZjyFdxnbBatch(list);
+    }
 }
 }

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

@@ -10,8 +10,8 @@ import com.zjsgfa.project.zjsgfa.service.ISjZsjqkService;
 /**
 /**
  * 设计-注水井情况Service业务层处理
  * 设计-注水井情况Service业务层处理
  * 
  * 
- * @author
- * @date 2025-08-05
+ * @author ruoyi
+ * @date 2026-02-04
  */
  */
 @Service
 @Service
 public class SjZsjqkServiceImpl implements ISjZsjqkService 
 public class SjZsjqkServiceImpl implements ISjZsjqkService 
@@ -22,13 +22,13 @@ public class SjZsjqkServiceImpl implements ISjZsjqkService
     /**
     /**
      * 查询设计-注水井情况
      * 查询设计-注水井情况
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 设计-注水井情况
      * @return 设计-注水井情况
      */
      */
     @Override
     @Override
-    public SjZsjqk selectSjZsjqkBySjjh(String sjjh)
+    public SjZsjqk selectSjZsjqkById(Long id)
     {
     {
-        return sjZsjqkMapper.selectSjZsjqkBySjjh(sjjh);
+        return sjZsjqkMapper.selectSjZsjqkById(id);
     }
     }
 
 
     /**
     /**
@@ -70,29 +70,24 @@ public class SjZsjqkServiceImpl implements ISjZsjqkService
     /**
     /**
      * 批量删除设计-注水井情况
      * 批量删除设计-注水井情况
      * 
      * 
-     * @param sjjhs 需要删除的设计-注水井情况主键
+     * @param ids 需要删除的设计-注水井情况主键
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int deleteSjZsjqkBySjjhs(String[] sjjhs)
+    public int deleteSjZsjqkByIds(Long[] ids)
     {
     {
-        return sjZsjqkMapper.deleteSjZsjqkBySjjhs(sjjhs);
+        return sjZsjqkMapper.deleteSjZsjqkByIds(ids);
     }
     }
 
 
     /**
     /**
      * 删除设计-注水井情况信息
      * 删除设计-注水井情况信息
      * 
      * 
-     * @param sjjh 设计-注水井情况主键
+     * @param id 设计-注水井情况主键
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int deleteSjZsjqkBySjjh(String sjjh)
+    public int deleteSjZsjqkById(Long id)
     {
     {
-        return sjZsjqkMapper.deleteSjZsjqkBySjjh(sjjh);
-    }
-
-    @Override
-    public int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList) {
-        return sjZsjqkMapper.insertSjZsjqkBatch(sjZsjqkList);
+        return sjZsjqkMapper.deleteSjZsjqkById(id);
     }
     }
 }
 }

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

@@ -88,4 +88,6 @@ public class CommonParam {
 
 
     private String dmxnr;
     private String dmxnr;
 
 
+    private String searchType;
+
 }
 }

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

@@ -32,4 +32,7 @@ public class Jsqa {
     private Double bfb;
     private Double bfb;
 
 
     private List<String> jhs;
     private List<String> jhs;
+
+
+    private String ljjh;
 }
 }

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

@@ -2,6 +2,7 @@ package com.zjsgfa.project.zt.mapper;
 
 
 import com.zjsgfa.framework.aspectj.lang.annotation.DataSource;
 import com.zjsgfa.framework.aspectj.lang.annotation.DataSource;
 import com.zjsgfa.framework.aspectj.lang.enums.DataSourceType;
 import com.zjsgfa.framework.aspectj.lang.enums.DataSourceType;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
 import com.zjsgfa.project.zt.domain.*;
 import com.zjsgfa.project.zt.domain.*;
 import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.domain.vo.JswaVo;
 import com.zjsgfa.project.zt.domain.vo.JswaVo;
@@ -88,4 +89,6 @@ public interface DjdcInfoMapper {
     List<Ljjw> getLjjwListNew(CommonParam param);
     List<Ljjw> getLjjwListNew(CommonParam param);
 
 
 
 
+    List<SjLjfzqk> getJsqaListByJh(CommonParam param);
+
 }
 }

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

@@ -3,6 +3,7 @@ package com.zjsgfa.project.zt.service;
 
 
 import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.framework.web.domain.AjaxResult;
 import com.zjsgfa.project.zjsgfa.domain.SjDcfxDzfc;
 import com.zjsgfa.project.zjsgfa.domain.SjDcfxDzfc;
+import com.zjsgfa.project.zjsgfa.domain.SjLjfzqk;
 import com.zjsgfa.project.zt.domain.*;
 import com.zjsgfa.project.zt.domain.*;
 import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.domain.vo.JsgaVo;
 import com.zjsgfa.project.zt.domain.vo.JswaVo;
 import com.zjsgfa.project.zt.domain.vo.JswaVo;
@@ -93,4 +94,6 @@ public interface DjdcService {
     List<Djjc> getJhKcList(String ljjh);
     List<Djjc> getJhKcList(String ljjh);
 
 
 
 
+    List<SjLjfzqk> getJsqaListByJh(CommonParam param);
+
 }
 }

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

@@ -870,37 +870,36 @@ public class DjdcServiceImpl implements DjdcService {
 
 
     @Override
     @Override
     public AjaxResult getLjjwList(CommonParam param) {
     public AjaxResult getLjjwList(CommonParam param) {
-
-        if(StringUtils.isNotEmpty(param.getJh())){
-            Jsba jsba = jsbaMapper.selectJsbaByJh(param.getJh());
-            if(jsba!=null){
-                if(jsba.getJkhzb()!=null && jsba.getJkhzb()!=null){
-                    param.setJkhzb(jsba.getJkhzb());
-                    param.setJkzzb(jsba.getJkzzb());
-                }else {
+        if("jh".equals(param.getSearchType())){
+            if(StringUtils.isNotEmpty(param.getJh())){
+                Jsba jsba = jsbaMapper.selectJsbaByJh(param.getJh());
+                if(jsba!=null){
+                    if(jsba.getJkhzb()!=null && jsba.getJkhzb()!=null){
+                        param.setJkhzb(jsba.getJkhzb());
+                        param.setJkzzb(jsba.getJkzzb());
+                    }else {
+                        if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
+                            param.setJkhzb(jsba.getJdhzb());
+                            param.setJkzzb(jsba.getJdhzb());
+                        }else {
+                            return AjaxResult.error("未查询到井坐标信息");
+                        }
+                    }
                     if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
                     if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
-                        param.setJkhzb(jsba.getJdhzb());
-                        param.setJkzzb(jsba.getJdhzb());
+                        param.setJdhzb(jsba.getJdhzb());
+                        param.setJdzzb(jsba.getJdzzb());
                     }else {
                     }else {
-                        return AjaxResult.error("未查询到井坐标信息");
+                        param.setJdhzb(jsba.getJkhzb());
+                        param.setJdzzb(jsba.getJkzzb());
                     }
                     }
-                }
-                if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
-                    param.setJdhzb(jsba.getJdhzb());
-                    param.setJdzzb(jsba.getJdzzb());
                 }else {
                 }else {
-                    param.setJdhzb(jsba.getJkhzb());
-                    param.setJdzzb(jsba.getJkzzb());
+                    return  AjaxResult.error("未查询到井数据");
                 }
                 }
-
-
-
-
-            }else {
-                return  AjaxResult.error("未查询到井数据");
             }
             }
+
         }
         }
 
 
+
 //        List<Ljjw> ljjwList = djdcInfoMapper.getLjjwList(param);
 //        List<Ljjw> ljjwList = djdcInfoMapper.getLjjwList(param);
         List<Ljjw> ljjwList = djdcInfoMapper.getLjjwListNew(param);
         List<Ljjw> ljjwList = djdcInfoMapper.getLjjwListNew(param);
         return AjaxResult.success(ljjwList);
         return AjaxResult.success(ljjwList);
@@ -2160,6 +2159,15 @@ public class DjdcServiceImpl implements DjdcService {
         return djdcInfoMapper.getJhKcList(ljjh);
         return djdcInfoMapper.getJhKcList(ljjh);
     }
     }
 
 
+    @Override
+    public List<SjLjfzqk> getJsqaListByJh(CommonParam param) {
+        if(StringUtils.isNotEmpty(param.getJh())){
+            String[] jhs = param.getJh().split(",");
+            param.setJhs(jhs);
+        }
+        return djdcInfoMapper.getJsqaListByJh(param);
+    }
+
     /**
     /**
      * 计算斜深
      * 计算斜深
      * @param a 层位垂深
      * @param a 层位垂深

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -142,8 +142,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 	</select>
-	
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+    <select id="selectUserByLoginName" resultType="com.zjsgfa.project.system.domain.SysUser">
+
+		<include refid="selectUserVo"/>
+		where u.user_name = #{userName}
+	</select>
+	<select id="selectUserLoginNamesByRoleKeyDept" resultType="com.zjsgfa.project.system.domain.SysUser">
+		select a.*,r.role_key,role_name from sys_user a
+												 left join  sys_dept d on a.dept_id=d.dept_id
+												 left join  sys_user_role ur on a.user_id=ur.user_id
+												 left join  sys_role r on  ur.role_id=r.role_id
+		where  (d.dept_id=#{deptId} or find_in_set(#{deptId},d.ancestors))
+		  and role_key=#{roleKey}
+	</select>
+	<select id="selectUserListByRoleKey" parameterType="String" resultMap="SysUserResult">
+		select * from sys_user where user_id in ( select user_id from sys_user_role where role_id = ( select role_id from sys_role where role_key = #{roleKey} ) )
+								 and del_flag = '0'
+	</select>
+
+    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>

src/main/resources/mybatis/zjsgfa/BizTodoItemMapper.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.BizTodoItemMapper">
+    
+    <resultMap type="BizTodoItem" id="BizTodoItemResult">
+        <result property="id"    column="id"    />
+        <result property="itemName"    column="item_name"    />
+        <result property="itemContent"    column="item_content"    />
+        <result property="module"    column="module"    />
+        <result property="taskId"    column="task_id"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="taskName"    column="task_name"    />
+        <result property="nodeName"    column="node_name"    />
+        <result property="isView"    column="is_view"    />
+        <result property="isHandle"    column="is_handle"    />
+        <result property="todoUserId"    column="todo_user_id"    />
+        <result property="todoUserName"    column="todo_user_name"    />
+        <result property="handleUserId"    column="handle_user_id"    />
+        <result property="handleUserName"    column="handle_user_name"    />
+        <result property="todoTime"    column="todo_time"    />
+        <result property="handleTime"    column="handle_time"    />
+    </resultMap>
+
+    <sql id="selectBizTodoItemVo">
+        select id, item_name, item_content, module, task_id, instance_id, task_name, node_name, is_view, is_handle, todo_user_id, todo_user_name, handle_user_id, handle_user_name, todo_time, handle_time from biz_todo_item
+    </sql>
+
+    <select id="selectBizTodoItemList" parameterType="BizTodoItem" resultMap="BizTodoItemResult">
+        <include refid="selectBizTodoItemVo"/>
+        <where>  
+            <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
+            <if test="itemContent != null  and itemContent != ''"> and item_content like concat('%', #{itemContent}, '%')</if>
+            <if test="module != null  and module != ''"> and module = #{module}</if>
+            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
+            <if test="instanceId != null  and instanceId != ''"> and instance_id = #{instanceId}</if>
+            <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="isView != null  and isView != ''"> and is_view = #{isView}</if>
+            <if test="isHandle != null  and isHandle != ''"> and is_handle = #{isHandle}</if>
+            <if test="todoUserId != null  and todoUserId != ''"> and todo_user_id = #{todoUserId}</if>
+            <if test="todoUserName != null  and todoUserName != ''"> and todo_user_name like concat('%', #{todoUserName}, '%')</if>
+            <if test="handleUserId != null  and handleUserId != ''"> and handle_user_id = #{handleUserId}</if>
+            <if test="handleUserName != null  and handleUserName != ''"> and handle_user_name like concat('%', #{handleUserName}, '%')</if>
+            <if test="todoTime != null "> and todo_time = #{todoTime}</if>
+            <if test="handleTime != null "> and handle_time = #{handleTime}</if>
+            <if test="searchOtherTodoFlag != null and searchOtherTodoFlag != ''">
+                and instance_id = ( select instance_id from biz_todo_item where task_id = #{searchOtherTodoFlag} )
+                and task_name = ( select task_name from biz_todo_item where task_id = #{searchOtherTodoFlag} )
+                and node_name = ( select node_name from biz_todo_item where task_id = #{searchOtherTodoFlag} )
+            </if>
+        </where>
+    </select>
+    
+    <select id="selectBizTodoItemById" parameterType="Long" resultMap="BizTodoItemResult">
+        <include refid="selectBizTodoItemVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectTodoItemByTaskId" resultType="com.zjsgfa.project.zjsgfa.domain.BizTodoItem">
+
+
+        SELECT * FROM BIZ_TODO_ITEM WHERE TASK_ID = #{taskId}
+    </select>
+    <select id="selectTodoUserListByTaskId" resultType="java.lang.String">
+        SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ = (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})
+    </select>
+    <select id="selectTodoUserByTaskId" resultType="java.lang.String">
+        SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE USER_ID_ = (SELECT USER_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})
+    </select>
+
+    <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
+        insert into biz_todo_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="itemName != null">item_name,</if>
+            <if test="itemContent != null">item_content,</if>
+            <if test="module != null">module,</if>
+            <if test="taskId != null">task_id,</if>
+            <if test="instanceId != null">instance_id,</if>
+            <if test="taskName != null">task_name,</if>
+            <if test="nodeName != null">node_name,</if>
+            <if test="isView != null">is_view,</if>
+            <if test="isHandle != null">is_handle,</if>
+            <if test="todoUserId != null">todo_user_id,</if>
+            <if test="todoUserName != null">todo_user_name,</if>
+            <if test="handleUserId != null">handle_user_id,</if>
+            <if test="handleUserName != null">handle_user_name,</if>
+            <if test="todoTime != null">todo_time,</if>
+            <if test="handleTime != null">handle_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="itemName != null">#{itemName},</if>
+            <if test="itemContent != null">#{itemContent},</if>
+            <if test="module != null">#{module},</if>
+            <if test="taskId != null">#{taskId},</if>
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="taskName != null">#{taskName},</if>
+            <if test="nodeName != null">#{nodeName},</if>
+            <if test="isView != null">#{isView},</if>
+            <if test="isHandle != null">#{isHandle},</if>
+            <if test="todoUserId != null">#{todoUserId},</if>
+            <if test="todoUserName != null">#{todoUserName},</if>
+            <if test="handleUserId != null">#{handleUserId},</if>
+            <if test="handleUserName != null">#{handleUserName},</if>
+            <if test="todoTime != null">#{todoTime},</if>
+            <if test="handleTime != null">#{handleTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBizTodoItem" parameterType="BizTodoItem">
+        update biz_todo_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="itemName != null">item_name = #{itemName},</if>
+            <if test="itemContent != null">item_content = #{itemContent},</if>
+            <if test="module != null">module = #{module},</if>
+            <if test="taskId != null">task_id = #{taskId},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="taskName != null">task_name = #{taskName},</if>
+            <if test="nodeName != null">node_name = #{nodeName},</if>
+            <if test="isView != null">is_view = #{isView},</if>
+            <if test="isHandle != null">is_handle = #{isHandle},</if>
+            <if test="todoUserId != null">todo_user_id = #{todoUserId},</if>
+            <if test="todoUserName != null">todo_user_name = #{todoUserName},</if>
+            <if test="handleUserId != null">handle_user_id = #{handleUserId},</if>
+            <if test="handleUserName != null">handle_user_name = #{handleUserName},</if>
+            <if test="todoTime != null">todo_time = #{todoTime},</if>
+            <if test="handleTime != null">handle_time = #{handleTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBizTodoItemById" parameterType="Long">
+        delete from biz_todo_item where id = #{id}
+    </delete>
+
+    <delete id="deleteBizTodoItemByIds" parameterType="String">
+        delete from biz_todo_item 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/SjDcfxDzfcMapper.xml

@@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yxts"    column="yxts"    />
         <result property="yxts"    column="yxts"    />
         <result property="yqsts"    column="yqsts"    />
         <result property="yqsts"    column="yqsts"    />
         <result property="gzts"    column="gzts"    />
         <result property="gzts"    column="gzts"    />
+        <result property="bz"    column="bz"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjDcfxDzfcVo">
     <sql id="selectSjDcfxDzfcVo">
-        select id, jh, dzfc, cs, xs, yxts, yqsts, gzts from sj_dcfx_dzfc
+        select id, jh, dzfc, cs, xs, yxts, yqsts, gzts,bz from sj_dcfx_dzfc
     </sql>
     </sql>
 
 
     <select id="selectSjDcfxDzfcList" parameterType="SjDcfxDzfc" resultMap="SjDcfxDzfcResult">
     <select id="selectSjDcfxDzfcList" parameterType="SjDcfxDzfc" resultMap="SjDcfxDzfcResult">
@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yxts != null  and yxts != ''"> and yxts = #{yxts}</if>
             <if test="yxts != null  and yxts != ''"> and yxts = #{yxts}</if>
             <if test="yqsts != null  and yqsts != ''"> and yqsts = #{yqsts}</if>
             <if test="yqsts != null  and yqsts != ''"> and yqsts = #{yqsts}</if>
             <if test="gzts != null  and gzts != ''"> and gzts = #{gzts}</if>
             <if test="gzts != null  and gzts != ''"> and gzts = #{gzts}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
         </where>
         </where>
     </select>
     </select>
     
     
@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yxts != null">yxts,</if>
             <if test="yxts != null">yxts,</if>
             <if test="yqsts != null">yqsts,</if>
             <if test="yqsts != null">yqsts,</if>
             <if test="gzts != null">gzts,</if>
             <if test="gzts != null">gzts,</if>
+            <if test="bz != null">bz,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -56,11 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yxts != null">#{yxts},</if>
             <if test="yxts != null">#{yxts},</if>
             <if test="yqsts != null">#{yqsts},</if>
             <if test="yqsts != null">#{yqsts},</if>
             <if test="gzts != null">#{gzts},</if>
             <if test="gzts != null">#{gzts},</if>
+            <if test="bz != null">#{bz},</if>
          </trim>
          </trim>
     </insert>
     </insert>
     <insert id="insertSjDcfxDzfcBatch">
     <insert id="insertSjDcfxDzfcBatch">
         INSERT INTO sj_dcfx_dzfc
         INSERT INTO sj_dcfx_dzfc
-        (jh, dzfc, cs, xs, yxts, yqsts, gzts)
+        (jh, dzfc, cs, xs, yxts, yqsts, gzts, bz)
         VALUES
         VALUES
         <foreach collection="list" item="item" separator=",">
         <foreach collection="list" item="item" separator=",">
             (
             (
@@ -70,7 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.xs},
             #{item.xs},
             #{item.yxts},
             #{item.yxts},
             #{item.yqsts},
             #{item.yqsts},
-            #{item.gzts}
+            #{item.gzts},
+            #{item.bz}
             )
             )
         </foreach>
         </foreach>
 
 
@@ -86,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yxts != null">yxts = #{yxts},</if>
             <if test="yxts != null">yxts = #{yxts},</if>
             <if test="yqsts != null">yqsts = #{yqsts},</if>
             <if test="yqsts != null">yqsts = #{yqsts},</if>
             <if test="gzts != null">gzts = #{gzts},</if>
             <if test="gzts != null">gzts = #{gzts},</if>
+            <if test="bz != null">bz = #{bz},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>

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

@@ -40,6 +40,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="famc"    column="famc"    />
         <result property="famc"    column="famc"    />
         <result property="deptid"    column="deptid"    />
         <result property="deptid"    column="deptid"    />
         <result property="deptName"    column="dept_name"    />
         <result property="deptName"    column="dept_name"    />
+        <result property="jfdw"    column="jfdw"    />
+        <result property="bxg"    column="bxg"    />
+        <result property="yctglrgd"    column="yctglrgd"    />
+        <result property="dlwz"    column="dlwz"    />
+        <result property="gzmc"    column="gzmc"    />
+        <result property="ahzb"    column="ahzb"    />
+        <result property="azzb"    column="azzb"    />
+        <result property="bhzb"    column="bhzb"    />
+        <result property="bzzb"    column="bzzb"    />
+        <result property="instanceId"    column="instance_id"    />
+        <result property="processStatus"    column="process_status"    />
+        <result property="refuseContent"    column="refuse_content"    />
+        <result property="type"    column="type"    />
+        <result property="applyUser"    column="apply_user"    />
+        <result property="applyTime"    column="apply_time"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjDjjcVo">
     <sql id="selectSjDjjcVo">
@@ -75,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hsezt,
         hsezt,
         jhjdzt,
         jhjdzt,
         flzt,
         flzt,
-        faid,famc,u.nick_name as cjrmc,a.deptid,d.dept_name
+        faid,famc,u.nick_name as cjrmc,a.deptid,d.dept_name, jfdw, bxg, yctglrgd, dlwz, gzmc, ahzb, azzb, bhzb, bzzb, instance_id, process_status, refuse_content, type, apply_user, apply_time
         from sj_djjc a left join  jcxx_jdxx b on a.zjd=b.id
         from sj_djjc a left join  jcxx_jdxx b on a.zjd=b.id
         left join sys_user u on a.created_by=u.user_name
         left join sys_user u on a.created_by=u.user_name
         left join  sys_dept d on a.deptid = d.dept_id
         left join  sys_dept d on a.deptid = d.dept_id
@@ -113,6 +128,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jhjdzt != null  and jhjdzt != ''"> and jhjdzt = #{jhjdzt}</if>
             <if test="jhjdzt != null  and jhjdzt != ''"> and jhjdzt = #{jhjdzt}</if>
             <if test="flzt != null  and flzt != ''"> and flzt = #{flzt}</if>
             <if test="flzt != null  and flzt != ''"> and flzt = #{flzt}</if>
             <if test="deptid != null  and deptid != ''"> and a.deptid = #{deptid}</if>
             <if test="deptid != null  and deptid != ''"> and a.deptid = #{deptid}</if>
+            <if test="jfdw != null  and jfdw != ''"> and jfdw = #{jfdw}</if>
+            <if test="bxg != null  and bxg != ''"> and bxg = #{bxg}</if>
+            <if test="yctglrgd != null  and yctglrgd != ''"> and yctglrgd = #{yctglrgd}</if>
+            <if test="dlwz != null  and dlwz != ''"> and dlwz = #{dlwz}</if>
+            <if test="gzmc != null  and gzmc != ''"> and gzmc = #{gzmc}</if>
+            <if test="ahzb != null "> and ahzb = #{ahzb}</if>
+            <if test="azzb != null "> and azzb = #{azzb}</if>
+            <if test="bhzb != null "> and bhzb = #{bhzb}</if>
+            <if test="bzzb != null "> and bzzb = #{bzzb}</if>
+            <if test="instanceId != null  and instanceId != ''"> and instance_id = #{instanceId}</if>
+            <if test="processStatus != null  and processStatus != ''"> and process_status = #{processStatus}</if>
+            <if test="refuseContent != null  and refuseContent != ''"> and refuse_content = #{refuseContent}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="applyUser != null  and applyUser != ''"> and apply_user = #{applyUser}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
             <!-- 数据范围过滤 -->
             <!-- 数据范围过滤 -->
             ${params.dataScope}
             ${params.dataScope}
         </where>
         </where>
@@ -128,6 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSjDjjcVo"/>
         <include refid="selectSjDjjcVo"/>
         where a.jh = #{jh}
         where a.jh = #{jh}
     </select>
     </select>
+    <select id="selectSjDjjcByinstanceId" resultType="com.zjsgfa.project.zjsgfa.domain.SjDjjc">
+        <include refid="selectSjDjjcVo"/>
+        where a.instance_id = #{instanceId}
+    </select>
 
 
     <insert id="insertSjDjjc" parameterType="SjDjjc" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertSjDjjc" parameterType="SjDjjc" useGeneratedKeys="true" keyProperty="id">
         insert into sj_djjc
         insert into sj_djjc
@@ -165,6 +199,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faid != null">faid,</if>
             <if test="faid != null">faid,</if>
             <if test="famc != null">famc,</if>
             <if test="famc != null">famc,</if>
             <if test="deptid != null">deptid,</if>
             <if test="deptid != null">deptid,</if>
+            <if test="jfdw != null">jfdw,</if>
+            <if test="bxg != null">bxg,</if>
+            <if test="yctglrgd != null">yctglrgd,</if>
+            <if test="dlwz != null">dlwz,</if>
+            <if test="gzmc != null">gzmc,</if>
+            <if test="ahzb != null">ahzb,</if>
+            <if test="azzb != null">azzb,</if>
+            <if test="bhzb != null">bhzb,</if>
+            <if test="bzzb != null">bzzb,</if>
+            <if test="instanceId != null">instance_id,</if>
+            <if test="processStatus != null">process_status,</if>
+            <if test="refuseContent != null">refuse_content,</if>
+            <if test="type != null">type,</if>
+            <if test="applyUser != null">apply_user,</if>
+            <if test="applyTime != null">apply_time,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -200,6 +249,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faid != null">#{faid},</if>
             <if test="faid != null">#{faid},</if>
             <if test="famc != null">#{famc},</if>
             <if test="famc != null">#{famc},</if>
             <if test="deptid != null">#{deptid},</if>
             <if test="deptid != null">#{deptid},</if>
+            <if test="jfdw != null">#{jfdw},</if>
+            <if test="bxg != null">#{bxg},</if>
+            <if test="yctglrgd != null">#{yctglrgd},</if>
+            <if test="dlwz != null">#{dlwz},</if>
+            <if test="gzmc != null">#{gzmc},</if>
+            <if test="ahzb != null">#{ahzb},</if>
+            <if test="azzb != null">#{azzb},</if>
+            <if test="bhzb != null">#{bhzb},</if>
+            <if test="bzzb != null">#{bzzb},</if>
+            <if test="instanceId != null">#{instanceId},</if>
+            <if test="processStatus != null">#{processStatus},</if>
+            <if test="refuseContent != null">#{refuseContent},</if>
+            <if test="type != null">#{type},</if>
+            <if test="applyUser != null">#{applyUser},</if>
+            <if test="applyTime != null">#{applyTime},</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -238,6 +302,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faid != null">faid = #{faid},</if>
             <if test="faid != null">faid = #{faid},</if>
             <if test="famc != null">famc = #{famc},</if>
             <if test="famc != null">famc = #{famc},</if>
             <if test="deptid != null">deptid = #{deptid},</if>
             <if test="deptid != null">deptid = #{deptid},</if>
+            <if test="jfdw != null">jfdw = #{jfdw},</if>
+            <if test="bxg != null">bxg = #{bxg},</if>
+            <if test="yctglrgd != null">yctglrgd = #{yctglrgd},</if>
+            <if test="dlwz != null">dlwz = #{dlwz},</if>
+            <if test="gzmc != null">gzmc = #{gzmc},</if>
+            <if test="ahzb != null">ahzb = #{ahzb},</if>
+            <if test="azzb != null">azzb = #{azzb},</if>
+            <if test="bhzb != null">bhzb = #{bhzb},</if>
+            <if test="bzzb != null">bzzb = #{bzzb},</if>
+            <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="processStatus != null">process_status = #{processStatus},</if>
+            <if test="refuseContent != null">refuse_content = #{refuseContent},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="applyUser != null">apply_user = #{applyUser},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
         </trim>
         </trim>
         where jh = #{jh}
         where jh = #{jh}
     </update>
     </update>

src/main/resources/mybatis/zjsgfa/SjGcjbsjMapper.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.SjGcjbsjMapper">
+    
+    <resultMap type="SjGcjbsj" id="SjGcjbsjResult">
+        <result property="id"    column="id"    />
+        <result property="zbid"    column="zbid"    />
+        <result property="sgdw"    column="sgdw"    />
+        <result property="zjdz"    column="zjdz"    />
+        <result property="sjjs"    column="sjjs"    />
+        <result property="bqsj"    column="bqsj"    />
+        <result property="wzjs"    column="wzjs"    />
+        <result property="wzcs"    column="wzcs"    />
+        <result property="yksj"    column="yksj"    />
+        <result property="eksj"    column="eksj"    />
+        <result property="sksj"    column="sksj"    />
+        <result property="siksj"    column="siksj"    />
+        <result property="wzfs"    column="wzfs"    />
+        <result property="zjty"    column="zjty"    />
+        <result property="zjys"    column="zjys"    />
+        <result property="wzsj"    column="wzsj"    />
+        <result property="wjsj"    column="wjsj"    />
+        <result property="pjjxzs"    column="pjjxzs"    />
+        <result property="zjzq1"    column="zjzq1"    />
+        <result property="zjzq2"    column="zjzq2"    />
+        <result property="jjzq1"    column="jjzq1"    />
+        <result property="jjzq2"    column="jjzq2"    />
+        <result property="jszl"    column="jszl"    />
+        <result property="gjzl"    column="gjzl"    />
+        <result property="qxjc"    column="qxjc"    />
+        <result property="yxcd"    column="yxcd"    />
+        <result property="shl1"    column="shl1"    />
+        <result property="zjyjswb"    column="zjyjswb"    />
+    </resultMap>
+
+    <sql id="selectSjGcjbsjVo">
+        select id, zbid, sgdw, zjdz, sjjs, bqsj, wzjs, wzcs, yksj, eksj, sksj, siksj, wzfs, zjty, zjys, wzsj, wjsj, pjjxzs, zjzq1, zjzq2, jjzq1, jjzq2, jszl, gjzl, qxjc, yxcd, shl1, zjyjswb from sj_gcjbsj
+    </sql>
+
+    <select id="selectSjGcjbsjList" parameterType="SjGcjbsj" resultMap="SjGcjbsjResult">
+        <include refid="selectSjGcjbsjVo"/>
+        <where>  
+            <if test="zbid != null "> and zbid = #{zbid}</if>
+            <if test="sgdw != null  and sgdw != ''"> and sgdw = #{sgdw}</if>
+            <if test="zjdz != null  and zjdz != ''"> and zjdz = #{zjdz}</if>
+            <if test="sjjs != null  and sjjs != ''"> and sjjs = #{sjjs}</if>
+            <if test="bqsj != null  and bqsj != ''"> and bqsj = #{bqsj}</if>
+            <if test="wzjs != null  and wzjs != ''"> and wzjs = #{wzjs}</if>
+            <if test="wzcs != null  and wzcs != ''"> and wzcs = #{wzcs}</if>
+            <if test="yksj != null  and yksj != ''"> and yksj = #{yksj}</if>
+            <if test="eksj != null  and eksj != ''"> and eksj = #{eksj}</if>
+            <if test="sksj != null  and sksj != ''"> and sksj = #{sksj}</if>
+            <if test="siksj != null  and siksj != ''"> and siksj = #{siksj}</if>
+            <if test="wzfs != null  and wzfs != ''"> and wzfs = #{wzfs}</if>
+            <if test="zjty != null  and zjty != ''"> and zjty = #{zjty}</if>
+            <if test="zjys != null  and zjys != ''"> and zjys = #{zjys}</if>
+            <if test="wzsj != null  and wzsj != ''"> and wzsj = #{wzsj}</if>
+            <if test="wjsj != null  and wjsj != ''"> and wjsj = #{wjsj}</if>
+            <if test="pjjxzs != null  and pjjxzs != ''"> and pjjxzs = #{pjjxzs}</if>
+            <if test="zjzq1 != null  and zjzq1 != ''"> and zjzq1 = #{zjzq1}</if>
+            <if test="zjzq2 != null  and zjzq2 != ''"> and zjzq2 = #{zjzq2}</if>
+            <if test="jjzq1 != null  and jjzq1 != ''"> and jjzq1 = #{jjzq1}</if>
+            <if test="jjzq2 != null  and jjzq2 != ''"> and jjzq2 = #{jjzq2}</if>
+            <if test="jszl != null  and jszl != ''"> and jszl = #{jszl}</if>
+            <if test="gjzl != null  and gjzl != ''"> and gjzl = #{gjzl}</if>
+            <if test="qxjc != null  and qxjc != ''"> and qxjc = #{qxjc}</if>
+            <if test="yxcd != null  and yxcd != ''"> and yxcd = #{yxcd}</if>
+            <if test="shl1 != null  and shl1 != ''"> and shl1 = #{shl1}</if>
+            <if test="zjyjswb != null  and zjyjswb != ''"> and zjyjswb = #{zjyjswb}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjGcjbsjById" parameterType="Long" resultMap="SjGcjbsjResult">
+        <include refid="selectSjGcjbsjVo"/>
+        where zbid = #{id}
+    </select>
+
+    <insert id="insertSjGcjbsj" parameterType="SjGcjbsj" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_gcjbsj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">zbid,</if>
+            <if test="sgdw != null">sgdw,</if>
+            <if test="zjdz != null">zjdz,</if>
+            <if test="sjjs != null">sjjs,</if>
+            <if test="bqsj != null">bqsj,</if>
+            <if test="wzjs != null">wzjs,</if>
+            <if test="wzcs != null">wzcs,</if>
+            <if test="yksj != null">yksj,</if>
+            <if test="eksj != null">eksj,</if>
+            <if test="sksj != null">sksj,</if>
+            <if test="siksj != null">siksj,</if>
+            <if test="wzfs != null">wzfs,</if>
+            <if test="zjty != null">zjty,</if>
+            <if test="zjys != null">zjys,</if>
+            <if test="wzsj != null">wzsj,</if>
+            <if test="wjsj != null">wjsj,</if>
+            <if test="pjjxzs != null">pjjxzs,</if>
+            <if test="zjzq1 != null">zjzq1,</if>
+            <if test="zjzq2 != null">zjzq2,</if>
+            <if test="jjzq1 != null">jjzq1,</if>
+            <if test="jjzq2 != null">jjzq2,</if>
+            <if test="jszl != null">jszl,</if>
+            <if test="gjzl != null">gjzl,</if>
+            <if test="qxjc != null">qxjc,</if>
+            <if test="yxcd != null">yxcd,</if>
+            <if test="shl1 != null">shl1,</if>
+            <if test="zjyjswb != null">zjyjswb,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">#{zbid},</if>
+            <if test="sgdw != null">#{sgdw},</if>
+            <if test="zjdz != null">#{zjdz},</if>
+            <if test="sjjs != null">#{sjjs},</if>
+            <if test="bqsj != null">#{bqsj},</if>
+            <if test="wzjs != null">#{wzjs},</if>
+            <if test="wzcs != null">#{wzcs},</if>
+            <if test="yksj != null">#{yksj},</if>
+            <if test="eksj != null">#{eksj},</if>
+            <if test="sksj != null">#{sksj},</if>
+            <if test="siksj != null">#{siksj},</if>
+            <if test="wzfs != null">#{wzfs},</if>
+            <if test="zjty != null">#{zjty},</if>
+            <if test="zjys != null">#{zjys},</if>
+            <if test="wzsj != null">#{wzsj},</if>
+            <if test="wjsj != null">#{wjsj},</if>
+            <if test="pjjxzs != null">#{pjjxzs},</if>
+            <if test="zjzq1 != null">#{zjzq1},</if>
+            <if test="zjzq2 != null">#{zjzq2},</if>
+            <if test="jjzq1 != null">#{jjzq1},</if>
+            <if test="jjzq2 != null">#{jjzq2},</if>
+            <if test="jszl != null">#{jszl},</if>
+            <if test="gjzl != null">#{gjzl},</if>
+            <if test="qxjc != null">#{qxjc},</if>
+            <if test="yxcd != null">#{yxcd},</if>
+            <if test="shl1 != null">#{shl1},</if>
+            <if test="zjyjswb != null">#{zjyjswb},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSjGcjbsj" parameterType="SjGcjbsj">
+        update sj_gcjbsj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbid != null">zbid = #{zbid},</if>
+            <if test="sgdw != null">sgdw = #{sgdw},</if>
+            <if test="zjdz != null">zjdz = #{zjdz},</if>
+            <if test="sjjs != null">sjjs = #{sjjs},</if>
+            <if test="bqsj != null">bqsj = #{bqsj},</if>
+            <if test="wzjs != null">wzjs = #{wzjs},</if>
+            <if test="wzcs != null">wzcs = #{wzcs},</if>
+            <if test="yksj != null">yksj = #{yksj},</if>
+            <if test="eksj != null">eksj = #{eksj},</if>
+            <if test="sksj != null">sksj = #{sksj},</if>
+            <if test="siksj != null">siksj = #{siksj},</if>
+            <if test="wzfs != null">wzfs = #{wzfs},</if>
+            <if test="zjty != null">zjty = #{zjty},</if>
+            <if test="zjys != null">zjys = #{zjys},</if>
+            <if test="wzsj != null">wzsj = #{wzsj},</if>
+            <if test="wjsj != null">wjsj = #{wjsj},</if>
+            <if test="pjjxzs != null">pjjxzs = #{pjjxzs},</if>
+            <if test="zjzq1 != null">zjzq1 = #{zjzq1},</if>
+            <if test="zjzq2 != null">zjzq2 = #{zjzq2},</if>
+            <if test="jjzq1 != null">jjzq1 = #{jjzq1},</if>
+            <if test="jjzq2 != null">jjzq2 = #{jjzq2},</if>
+            <if test="jszl != null">jszl = #{jszl},</if>
+            <if test="gjzl != null">gjzl = #{gjzl},</if>
+            <if test="qxjc != null">qxjc = #{qxjc},</if>
+            <if test="yxcd != null">yxcd = #{yxcd},</if>
+            <if test="shl1 != null">shl1 = #{shl1},</if>
+            <if test="zjyjswb != null">zjyjswb = #{zjyjswb},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjGcjbsjById" parameterType="Long">
+        delete from sj_gcjbsj where id = #{id}
+    </delete>
+
+    <delete id="deleteSjGcjbsjByIds" parameterType="String">
+        delete from sj_gcjbsj 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/SjJkzpMapper.xml

@@ -15,10 +15,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdTime"    column="created_time"    />
         <result property="createdTime"    column="created_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="dzfc"    column="dzfc"    />
+        <result property="qjzdts"    column="qjzdts"    />
+        <result property="fjdzdts"    column="fjdzdts"    />
+        <result property="wjzyts"    column="wjzyts"    />
+        <result property="qtzdts"    column="qtzdts"    />
+        <result property="ljzjysyqk"    column="ljzjysyqk"    />
+        <result property="sgzd"    column="sgzd"    />
+        <result property="fjdzjyxn"    column="fjdzjyxn"    />
+        <result property="fjdcljdjl"    column="fjdcljdjl"    />
+        <result property="fjdzjywhycl"    column="fjdzjywhycl"    />
+        <result property="qtyq"    column="qtyq"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjJkzpVo">
     <sql id="selectSjJkzpVo">
-        select id, jh, zjkzz, jlgh, syyq, clcb, created_by, created_time, update_by, update_time from sj_jkzp
+        select id, jh, zjkzz, jlgh, syyq, clcb, created_by, created_time, update_by, update_time, dzfc, qjzdts, fjdzdts, wjzyts, qtzdts, ljzjysyqk, sgzd, fjdzjyxn, fjdcljdjl, fjdzjywhycl, qtyq from sj_jkzp
     </sql>
     </sql>
 
 
     <select id="selectSjJkzpList" parameterType="SjJkzp" resultMap="SjJkzpResult">
     <select id="selectSjJkzpList" parameterType="SjJkzp" resultMap="SjJkzpResult">
@@ -31,6 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="clcb != null  and clcb != ''"> and clcb = #{clcb}</if>
             <if test="clcb != null  and clcb != ''"> and clcb = #{clcb}</if>
             <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
             <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
             <if test="createdTime != null "> and created_time = #{createdTime}</if>
             <if test="createdTime != null "> and created_time = #{createdTime}</if>
+            <if test="dzfc != null  and dzfc != ''"> and dzfc = #{dzfc}</if>
+            <if test="qjzdts != null  and qjzdts != ''"> and qjzdts = #{qjzdts}</if>
+            <if test="fjdzdts != null  and fjdzdts != ''"> and fjdzdts = #{fjdzdts}</if>
+            <if test="wjzyts != null  and wjzyts != ''"> and wjzyts = #{wjzyts}</if>
+            <if test="qtzdts != null  and qtzdts != ''"> and qtzdts = #{qtzdts}</if>
+            <if test="ljzjysyqk != null  and ljzjysyqk != ''"> and ljzjysyqk = #{ljzjysyqk}</if>
+            <if test="sgzd != null  and sgzd != ''"> and sgzd = #{sgzd}</if>
+            <if test="fjdzjyxn != null  and fjdzjyxn != ''"> and fjdzjyxn = #{fjdzjyxn}</if>
+            <if test="fjdcljdjl != null  and fjdcljdjl != ''"> and fjdcljdjl = #{fjdcljdjl}</if>
+            <if test="fjdzjywhycl != null  and fjdzjywhycl != ''"> and fjdzjywhycl = #{fjdzjywhycl}</if>
+            <if test="qtyq != null  and qtyq != ''"> and qtyq = #{qtyq}</if>
         </where>
         </where>
     </select>
     </select>
     
     
@@ -51,6 +73,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="createdTime != null">created_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="dzfc != null">dzfc,</if>
+            <if test="qjzdts != null">qjzdts,</if>
+            <if test="fjdzdts != null">fjdzdts,</if>
+            <if test="wjzyts != null">wjzyts,</if>
+            <if test="qtzdts != null">qtzdts,</if>
+            <if test="ljzjysyqk != null">ljzjysyqk,</if>
+            <if test="sgzd != null">sgzd,</if>
+            <if test="fjdzjyxn != null">fjdzjyxn,</if>
+            <if test="fjdcljdjl != null">fjdcljdjl,</if>
+            <if test="fjdzjywhycl != null">fjdzjywhycl,</if>
+            <if test="qtyq != null">qtyq,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -62,6 +95,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="dzfc != null">#{dzfc},</if>
+            <if test="qjzdts != null">#{qjzdts},</if>
+            <if test="fjdzdts != null">#{fjdzdts},</if>
+            <if test="wjzyts != null">#{wjzyts},</if>
+            <if test="qtzdts != null">#{qtzdts},</if>
+            <if test="ljzjysyqk != null">#{ljzjysyqk},</if>
+            <if test="sgzd != null">#{sgzd},</if>
+            <if test="fjdzjyxn != null">#{fjdzjyxn},</if>
+            <if test="fjdcljdjl != null">#{fjdcljdjl},</if>
+            <if test="fjdzjywhycl != null">#{fjdzjywhycl},</if>
+            <if test="qtyq != null">#{qtyq},</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -77,6 +121,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="dzfc != null">dzfc = #{dzfc},</if>
+            <if test="qjzdts != null">qjzdts = #{qjzdts},</if>
+            <if test="fjdzdts != null">fjdzdts = #{fjdzdts},</if>
+            <if test="wjzyts != null">wjzyts = #{wjzyts},</if>
+            <if test="qtzdts != null">qtzdts = #{qtzdts},</if>
+            <if test="ljzjysyqk != null">ljzjysyqk = #{ljzjysyqk},</if>
+            <if test="sgzd != null">sgzd = #{sgzd},</if>
+            <if test="fjdzjyxn != null">fjdzjyxn = #{fjdzjyxn},</if>
+            <if test="fjdcljdjl != null">fjdcljdjl = #{fjdcljdjl},</if>
+            <if test="fjdzjywhycl != null">fjdzjywhycl = #{fjdzjywhycl},</if>
+            <if test="qtyq != null">qtyq = #{qtyq},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>

src/main/resources/mybatis/zjsgfa/SjLjfzqkMapper.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.SjLjfzqkMapper">
+    
+    <resultMap type="SjLjfzqk" id="SjLjfzqkResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="ljjh"    column="ljjh"    />
+        <result property="jl"    column="jl"    />
+        <result property="sj"    column="sj"    />
+        <result property="wzjs"    column="wzjs"    />
+        <result property="fzqk"    column="fzqk"    />
+        <result property="zbid"    column="zbid"    />
+    </resultMap>
+
+    <sql id="selectSjLjfzqkVo">
+        select id, jh, ljjh, jl, sj, wzjs, fzqk, zbid from sj_ljfzqk
+    </sql>
+
+    <select id="selectSjLjfzqkList" parameterType="SjLjfzqk" resultMap="SjLjfzqkResult">
+        <include refid="selectSjLjfzqkVo"/>
+        <where>  
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="ljjh != null  and ljjh != ''"> and ljjh = #{ljjh}</if>
+            <if test="jl != null  and jl != ''"> and jl = #{jl}</if>
+            <if test="sj != null  and sj != ''"> and sj = #{sj}</if>
+            <if test="wzjs != null  and wzjs != ''"> and wzjs = #{wzjs}</if>
+            <if test="fzqk != null  and fzqk != ''"> and fzqk = #{fzqk}</if>
+            <if test="zbid != null  and zbid != ''"> and zbid = #{zbid}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjLjfzqkById" parameterType="Long" resultMap="SjLjfzqkResult">
+        <include refid="selectSjLjfzqkVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSjLjfzqk" parameterType="SjLjfzqk" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_ljfzqk
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="ljjh != null">ljjh,</if>
+            <if test="jl != null">jl,</if>
+            <if test="sj != null">sj,</if>
+            <if test="wzjs != null">wzjs,</if>
+            <if test="fzqk != null">fzqk,</if>
+            <if test="zbid != null">zbid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jh != null">#{jh},</if>
+            <if test="ljjh != null">#{ljjh},</if>
+            <if test="jl != null">#{jl},</if>
+            <if test="sj != null">#{sj},</if>
+            <if test="wzjs != null">#{wzjs},</if>
+            <if test="fzqk != null">#{fzqk},</if>
+            <if test="zbid != null">#{zbid},</if>
+         </trim>
+    </insert>
+    <insert id="insertSjLjfzqkBatch">
+
+        <foreach collection="list" item="item" separator=";">
+            insert into sj_ljfzqk
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="item.jh != null">jh,</if>
+                <if test="item.ljjh != null">ljjh,</if>
+                <if test="item.jl != null">jl,</if>
+                <if test="item.sj != null">sj,</if>
+                <if test="item.wzjs != null">wzjs,</if>
+                <if test="item.fzqk != null">fzqk,</if>
+                <if test="item.zbid != null">zbid,</if>
+            </trim>
+            <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="item.jh != null">#{item.jh},</if>
+                <if test="item.ljjh != null">#{item.ljjh},</if>
+                <if test="item.jl != null">#{item.jl},</if>
+                <if test="item.sj != null">#{item.sj},</if>
+                <if test="item.wzjs != null">#{item.wzjs},</if>
+                <if test="item.fzqk != null">#{item.fzqk},</if>
+                <if test="item.zbid != null">#{item.zbid},</if>
+            </trim>
+        </foreach>
+    </insert>
+
+    <update id="updateSjLjfzqk" parameterType="SjLjfzqk">
+        update sj_ljfzqk
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="ljjh != null">ljjh = #{ljjh},</if>
+            <if test="jl != null">jl = #{jl},</if>
+            <if test="sj != null">sj = #{sj},</if>
+            <if test="wzjs != null">wzjs = #{wzjs},</if>
+            <if test="fzqk != null">fzqk = #{fzqk},</if>
+            <if test="zbid != null">zbid = #{zbid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjLjfzqkById" parameterType="Long">
+        delete from sj_ljfzqk where id = #{id}
+    </delete>
+
+    <delete id="deleteSjLjfzqkByIds" parameterType="String">
+        delete from sj_ljfzqk where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteSjLjfzqkByJh">
+        delete from sj_ljfzqk where zbid = #{zbid}
+    </delete>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/zjsgfa/SjLjzjysyqkMapper.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.SjLjzjysyqkMapper">
+    
+    <resultMap type="SjLjzjysyqk" id="SjLjzjysyqkResult">
+        <result property="id"    column="id"    />
+        <result property="jh"    column="jh"    />
+        <result property="ljjh"    column="ljjh"    />
+        <result property="wjrq"    column="wjrq"    />
+        <result property="cw"    column="cw"    />
+        <result property="jd"    column="jd"    />
+        <result property="zjyxdmd"    column="zjyxdmd"    />
+        <result property="fzqk"    column="fzqk"    />
+        <result property="jkfw"    column="jkfw"    />
+        <result property="jklj"    column="jklj"    />
+        <result property="bdfw"    column="bdfw"    />
+        <result property="bdlj"    column="bdlj"    />
+    </resultMap>
+
+    <sql id="selectSjLjzjysyqkVo">
+        select id, jh, ljjh, wjrq, cw, jd, zjyxdmd, fzqk, jkfw, jklj, bdfw, bdlj from sj_ljzjysyqk
+    </sql>
+
+    <select id="selectSjLjzjysyqkList" parameterType="SjLjzjysyqk" resultMap="SjLjzjysyqkResult">
+        <include refid="selectSjLjzjysyqkVo"/>
+        <where>  
+            <if test="jh != null  and jh != ''"> and jh = #{jh}</if>
+            <if test="ljjh != null  and ljjh != ''"> and ljjh = #{ljjh}</if>
+            <if test="wjrq != null  and wjrq != ''"> and wjrq = #{wjrq}</if>
+            <if test="cw != null  and cw != ''"> and cw = #{cw}</if>
+            <if test="jd != null  and jd != ''"> and jd = #{jd}</if>
+            <if test="zjyxdmd != null  and zjyxdmd != ''"> and zjyxdmd = #{zjyxdmd}</if>
+            <if test="fzqk != null  and fzqk != ''"> and fzqk = #{fzqk}</if>
+            <if test="jkfw != null  and jkfw != ''"> and jkfw = #{jkfw}</if>
+            <if test="jklj != null  and jklj != ''"> and jklj = #{jklj}</if>
+            <if test="bdfw != null  and bdfw != ''"> and bdfw = #{bdfw}</if>
+            <if test="bdlj != null  and bdlj != ''"> and bdlj = #{bdlj}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjLjzjysyqkById" parameterType="Long" resultMap="SjLjzjysyqkResult">
+        <include refid="selectSjLjzjysyqkVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSjLjzjysyqk" parameterType="SjLjzjysyqk" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_ljzjysyqk
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jh != null">jh,</if>
+            <if test="ljjh != null">ljjh,</if>
+            <if test="wjrq != null">wjrq,</if>
+            <if test="cw != null">cw,</if>
+            <if test="jd != null">jd,</if>
+            <if test="zjyxdmd != null">zjyxdmd,</if>
+            <if test="fzqk != null">fzqk,</if>
+            <if test="jkfw != null">jkfw,</if>
+            <if test="jklj != null">jklj,</if>
+            <if test="bdfw != null">bdfw,</if>
+            <if test="bdlj != null">bdlj,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jh != null">#{jh},</if>
+            <if test="ljjh != null">#{ljjh},</if>
+            <if test="wjrq != null">#{wjrq},</if>
+            <if test="cw != null">#{cw},</if>
+            <if test="jd != null">#{jd},</if>
+            <if test="zjyxdmd != null">#{zjyxdmd},</if>
+            <if test="fzqk != null">#{fzqk},</if>
+            <if test="jkfw != null">#{jkfw},</if>
+            <if test="jklj != null">#{jklj},</if>
+            <if test="bdfw != null">#{bdfw},</if>
+            <if test="bdlj != null">#{bdlj},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSjLjzjysyqk" parameterType="SjLjzjysyqk">
+        update sj_ljzjysyqk
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jh != null">jh = #{jh},</if>
+            <if test="ljjh != null">ljjh = #{ljjh},</if>
+            <if test="wjrq != null">wjrq = #{wjrq},</if>
+            <if test="cw != null">cw = #{cw},</if>
+            <if test="jd != null">jd = #{jd},</if>
+            <if test="zjyxdmd != null">zjyxdmd = #{zjyxdmd},</if>
+            <if test="fzqk != null">fzqk = #{fzqk},</if>
+            <if test="jkfw != null">jkfw = #{jkfw},</if>
+            <if test="jklj != null">jklj = #{jklj},</if>
+            <if test="bdfw != null">bdfw = #{bdfw},</if>
+            <if test="bdlj != null">bdlj = #{bdlj},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjLjzjysyqkById" parameterType="Long">
+        delete from sj_ljzjysyqk where id = #{id}
+    </delete>
+
+    <delete id="deleteSjLjzjysyqkByIds" parameterType="String">
+        delete from sj_ljzjysyqk 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/SjNdxmMapper.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.SjNdxmMapper">
+    
+    <resultMap type="SjNdxm" id="SjNdxmResult">
+        <result property="id"    column="id"    />
+        <result property="zbid"    column="zbid"    />
+        <result property="spwy"    column="spwy"    />
+        <result property="zxdp"    column="zxdp"    />
+        <result property="xjdc"    column="xjdc"    />
+        <result property="lydc"    column="lydc"    />
+        <result property="md"    column="md"    />
+        <result property="md1"    column="md1"    />
+        <result property="jx"    column="jx"    />
+        <result property="wcb"    column="wcb"    />
+        <result property="spjcs"    column="spjcs"    />
+        <result property="kccdc"    column="kccdc"    />
+        <result property="wgsaz"    column="wgsaz"    />
+        <result property="kc"    column="kc"    />
+        <result property="jxtj"    column="jxtj"    />
+        <result property="dztjcz"    column="dztjcz"    />
+        <result property="ndxsjs"    column="ndxsjs"    />
+        <result property="ndxstj"    column="ndxstj"    />
+        <result property="ndxsjg"    column="ndxsjg"    />
+        <result property="tjsm"    column="tjsm"    />
+    </resultMap>
+
+    <sql id="selectSjNdxmVo">
+        select id, zbid, spwy, zxdp, xjdc, lydc, md, md1, jx, wcb, spjcs, kccdc, wgsaz, kc, jxtj, dztjcz, ndxsjs, ndxstj, ndxsjg, tjsm from sj_ndxm
+    </sql>
+
+    <select id="selectSjNdxmList" parameterType="SjNdxm" resultMap="SjNdxmResult">
+        <include refid="selectSjNdxmVo"/>
+        <where>  
+            <if test="zbid != null "> and zbid = #{zbid}</if>
+            <if test="spwy != null  and spwy != ''"> and spwy = #{spwy}</if>
+            <if test="zxdp != null  and zxdp != ''"> and zxdp = #{zxdp}</if>
+            <if test="xjdc != null  and xjdc != ''"> and xjdc = #{xjdc}</if>
+            <if test="lydc != null  and lydc != ''"> and lydc = #{lydc}</if>
+            <if test="md != null  and md != ''"> and md = #{md}</if>
+            <if test="md1 != null  and md1 != ''"> and md1 = #{md1}</if>
+            <if test="jx != null  and jx != ''"> and jx = #{jx}</if>
+            <if test="wcb != null  and wcb != ''"> and wcb = #{wcb}</if>
+            <if test="spjcs != null  and spjcs != ''"> and spjcs = #{spjcs}</if>
+            <if test="kccdc != null  and kccdc != ''"> and kccdc = #{kccdc}</if>
+            <if test="wgsaz != null  and wgsaz != ''"> and wgsaz = #{wgsaz}</if>
+            <if test="kc != null  and kc != ''"> and kc = #{kc}</if>
+            <if test="jxtj != null  and jxtj != ''"> and jxtj = #{jxtj}</if>
+            <if test="dztjcz != null  and dztjcz != ''"> and dztjcz = #{dztjcz}</if>
+            <if test="ndxsjs != null  and ndxsjs != ''"> and ndxsjs = #{ndxsjs}</if>
+            <if test="ndxstj != null  and ndxstj != ''"> and ndxstj = #{ndxstj}</if>
+            <if test="ndxsjg != null  and ndxsjg != ''"> and ndxsjg = #{ndxsjg}</if>
+            <if test="tjsm != null  and tjsm != ''"> and tjsm = #{tjsm}</if>
+        </where>
+    </select>
+    
+    <select id="selectSjNdxmById" parameterType="Long" resultMap="SjNdxmResult">
+        <include refid="selectSjNdxmVo"/>
+        where zbid = #{id}
+    </select>
+
+    <insert id="insertSjNdxm" parameterType="SjNdxm" useGeneratedKeys="true" keyProperty="id">
+        insert into sj_ndxm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">zbid,</if>
+            <if test="spwy != null">spwy,</if>
+            <if test="zxdp != null">zxdp,</if>
+            <if test="xjdc != null">xjdc,</if>
+            <if test="lydc != null">lydc,</if>
+            <if test="md != null">md,</if>
+            <if test="md1 != null">md1,</if>
+            <if test="jx != null">jx,</if>
+            <if test="wcb != null">wcb,</if>
+            <if test="spjcs != null">spjcs,</if>
+            <if test="kccdc != null">kccdc,</if>
+            <if test="wgsaz != null">wgsaz,</if>
+            <if test="kc != null">kc,</if>
+            <if test="jxtj != null">jxtj,</if>
+            <if test="dztjcz != null">dztjcz,</if>
+            <if test="ndxsjs != null">ndxsjs,</if>
+            <if test="ndxstj != null">ndxstj,</if>
+            <if test="ndxsjg != null">ndxsjg,</if>
+            <if test="tjsm != null">tjsm,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="zbid != null">#{zbid},</if>
+            <if test="spwy != null">#{spwy},</if>
+            <if test="zxdp != null">#{zxdp},</if>
+            <if test="xjdc != null">#{xjdc},</if>
+            <if test="lydc != null">#{lydc},</if>
+            <if test="md != null">#{md},</if>
+            <if test="md1 != null">#{md1},</if>
+            <if test="jx != null">#{jx},</if>
+            <if test="wcb != null">#{wcb},</if>
+            <if test="spjcs != null">#{spjcs},</if>
+            <if test="kccdc != null">#{kccdc},</if>
+            <if test="wgsaz != null">#{wgsaz},</if>
+            <if test="kc != null">#{kc},</if>
+            <if test="jxtj != null">#{jxtj},</if>
+            <if test="dztjcz != null">#{dztjcz},</if>
+            <if test="ndxsjs != null">#{ndxsjs},</if>
+            <if test="ndxstj != null">#{ndxstj},</if>
+            <if test="ndxsjg != null">#{ndxsjg},</if>
+            <if test="tjsm != null">#{tjsm},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSjNdxm" parameterType="SjNdxm">
+        update sj_ndxm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="zbid != null">zbid = #{zbid},</if>
+            <if test="spwy != null">spwy = #{spwy},</if>
+            <if test="zxdp != null">zxdp = #{zxdp},</if>
+            <if test="xjdc != null">xjdc = #{xjdc},</if>
+            <if test="lydc != null">lydc = #{lydc},</if>
+            <if test="md != null">md = #{md},</if>
+            <if test="md1 != null">md1 = #{md1},</if>
+            <if test="jx != null">jx = #{jx},</if>
+            <if test="wcb != null">wcb = #{wcb},</if>
+            <if test="spjcs != null">spjcs = #{spjcs},</if>
+            <if test="kccdc != null">kccdc = #{kccdc},</if>
+            <if test="wgsaz != null">wgsaz = #{wgsaz},</if>
+            <if test="kc != null">kc = #{kc},</if>
+            <if test="jxtj != null">jxtj = #{jxtj},</if>
+            <if test="dztjcz != null">dztjcz = #{dztjcz},</if>
+            <if test="ndxsjs != null">ndxsjs = #{ndxsjs},</if>
+            <if test="ndxstj != null">ndxstj = #{ndxstj},</if>
+            <if test="ndxsjg != null">ndxsjg = #{ndxsjg},</if>
+            <if test="tjsm != null">tjsm = #{tjsm},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSjNdxmById" parameterType="Long">
+        delete from sj_ndxm where id = #{id}
+    </delete>
+
+    <delete id="deleteSjNdxmByIds" parameterType="String">
+        delete from sj_ndxm 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/SjSggyZjyFdxnbMapper.xml

@@ -25,10 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="firstNumber"    column="first_number"    />
         <result property="firstNumber"    column="first_number"    />
+        <result property="hthpss"    column="hthpss"    />
+        <result property="hthpnb"    column="hthpnb"    />
+        <result property="mbt"    column="mbt"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjSggyZjyFdxnbVo">
     <sql id="selectSjSggyZjyFdxnbVo">
-        select id, jh, jd, md, msldnd, apilsl, apinb, jql, ph, hsl, zgh, mzxs, dql, sxnd, bz, created_by, created_time, update_by, update_time,
+        select id, jh, jd, md, msldnd, apilsl, apinb, jql, ph, hsl, zgh, mzxs, dql, sxnd, bz, created_by, created_time, update_by, update_time, hthpss, hthpnb, mbt,
                CAST(TRIM(SUBSTRING_INDEX(jd, '～', 1)) AS DECIMAL(10, 2)) AS first_number from sj_sggy_zjy_fdxnb
                CAST(TRIM(SUBSTRING_INDEX(jd, '～', 1)) AS DECIMAL(10, 2)) AS first_number from sj_sggy_zjy_fdxnb
     </sql>
     </sql>
 
 
@@ -81,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="createdTime != null">created_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="hthpss != null">hthpss,</if>
+            <if test="hthpnb != null">hthpnb,</if>
+            <if test="mbt != null">mbt,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -101,12 +107,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="hthpss != null">#{hthpss},</if>
+            <if test="hthpnb != null">#{hthpnb},</if>
+            <if test="mbt != null">#{mbt},</if>
          </trim>
          </trim>
     </insert>
     </insert>
     <insert id="insertSjSggyZjyFdxnbBatch">
     <insert id="insertSjSggyZjyFdxnbBatch">
 
 
         INSERT INTO sj_sggy_zjy_fdxnb
         INSERT INTO sj_sggy_zjy_fdxnb
-        (jh, jd, md, msldnd, apilsl, apinb, jql, ph, hsl, zgh, mzxs, dql, sxnd, bz)
+        (jh, jd, md, msldnd, apilsl, apinb, jql, ph, hsl, zgh, mzxs, dql, sxnd, bz, hthpss, hthpnb, mbt)
         VALUES
         VALUES
         <foreach collection="list" item="item" separator=",">
         <foreach collection="list" item="item" separator=",">
             (
             (
@@ -123,7 +132,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.mzxs},
             #{item.mzxs},
             #{item.dql},
             #{item.dql},
             #{item.sxnd},
             #{item.sxnd},
-            #{item.bz}
+            #{item.bz},
+            #{item.hthpss},
+            #{item.hthpnb},
+            #{item.mbt}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -149,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="hthpss != null">hthpss = #{hthpss},</if>
+            <if test="hthpnb != null">hthpnb = #{hthpnb},</if>
+            <if test="mbt != null">mbt = #{mbt},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zjsgfa.project.zjsgfa.mapper.SjZsjqkMapper">
 <mapper namespace="com.zjsgfa.project.zjsgfa.mapper.SjZsjqkMapper">
     
     
     <resultMap type="SjZsjqk" id="SjZsjqkResult">
     <resultMap type="SjZsjqk" id="SjZsjqkResult">
+        <result property="id"    column="id"    />
         <result property="sjjh"    column="sjjh"    />
         <result property="sjjh"    column="sjjh"    />
         <result property="jh"    column="jh"    />
         <result property="jh"    column="jh"    />
         <result property="jhbm"    column="jhbm"    />
         <result property="jhbm"    column="jhbm"    />
@@ -19,10 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jkjl"    column="jkjl"    />
         <result property="jkjl"    column="jkjl"    />
         <result property="jdjl"    column="jdjl"    />
         <result property="jdjl"    column="jdjl"    />
         <result property="sftz"    column="sftz"    />
         <result property="sftz"    column="sftz"    />
+        <result property="zsjd"    column="zsjd"    />
+        <result property="jkzy"    column="jkzy"    />
+        <result property="jkfw"    column="jkfw"    />
+        <result property="bdfw"    column="bdfw"    />
+        <result property="bdjl"    column="bdjl"    />
+        <result property="cz"    column="cz"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjZsjqkVo">
     <sql id="selectSjZsjqkVo">
-        select sjjh, jh, jhbm, zqlxmc, cwmc, sdfw, jkyl, dcyl, rzl, ljzrl, zrzt, jkjl, jdjl, sftz from sj_zsjqk
+        select id, sjjh, jh, jhbm, zqlxmc, cwmc, sdfw, jkyl, dcyl, rzl, ljzrl, zrzt, jkjl, jdjl, sftz, zsjd, jkzy, jkfw, bdfw, bdjl, cz from sj_zsjqk
     </sql>
     </sql>
 
 
     <select id="selectSjZsjqkList" parameterType="SjZsjqk" resultMap="SjZsjqkResult">
     <select id="selectSjZsjqkList" parameterType="SjZsjqk" resultMap="SjZsjqkResult">
@@ -42,15 +49,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jkjl != null "> and jkjl = #{jkjl}</if>
             <if test="jkjl != null "> and jkjl = #{jkjl}</if>
             <if test="jdjl != null "> and jdjl = #{jdjl}</if>
             <if test="jdjl != null "> and jdjl = #{jdjl}</if>
             <if test="sftz != null  and sftz != ''"> and sftz = #{sftz}</if>
             <if test="sftz != null  and sftz != ''"> and sftz = #{sftz}</if>
+            <if test="zsjd != null  and zsjd != ''"> and zsjd = #{zsjd}</if>
+            <if test="jkzy != null  and jkzy != ''"> and jkzy = #{jkzy}</if>
+            <if test="jkfw != null  and jkfw != ''"> and jkfw = #{jkfw}</if>
+            <if test="bdfw != null  and bdfw != ''"> and bdfw = #{bdfw}</if>
+            <if test="bdjl != null  and bdjl != ''"> and bdjl = #{bdjl}</if>
+            <if test="cz != null  and cz != ''"> and cz = #{cz}</if>
         </where>
         </where>
     </select>
     </select>
     
     
-    <select id="selectSjZsjqkBySjjh" parameterType="String" resultMap="SjZsjqkResult">
+    <select id="selectSjZsjqkById" parameterType="Long" resultMap="SjZsjqkResult">
         <include refid="selectSjZsjqkVo"/>
         <include refid="selectSjZsjqkVo"/>
-        where sjjh = #{sjjh}
+        where id = #{id}
     </select>
     </select>
 
 
-    <insert id="insertSjZsjqk" parameterType="SjZsjqk">
+    <insert id="insertSjZsjqk" parameterType="SjZsjqk" useGeneratedKeys="true" keyProperty="id">
         insert into sj_zsjqk
         insert into sj_zsjqk
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sjjh != null">sjjh,</if>
             <if test="sjjh != null">sjjh,</if>
@@ -67,6 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jkjl != null">jkjl,</if>
             <if test="jkjl != null">jkjl,</if>
             <if test="jdjl != null">jdjl,</if>
             <if test="jdjl != null">jdjl,</if>
             <if test="sftz != null">sftz,</if>
             <if test="sftz != null">sftz,</if>
+            <if test="zsjd != null">zsjd,</if>
+            <if test="jkzy != null">jkzy,</if>
+            <if test="jkfw != null">jkfw,</if>
+            <if test="bdfw != null">bdfw,</if>
+            <if test="bdjl != null">bdjl,</if>
+            <if test="cz != null">cz,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sjjh != null">#{sjjh},</if>
             <if test="sjjh != null">#{sjjh},</if>
@@ -83,40 +102,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jkjl != null">#{jkjl},</if>
             <if test="jkjl != null">#{jkjl},</if>
             <if test="jdjl != null">#{jdjl},</if>
             <if test="jdjl != null">#{jdjl},</if>
             <if test="sftz != null">#{sftz},</if>
             <if test="sftz != null">#{sftz},</if>
+            <if test="zsjd != null">#{zsjd},</if>
+            <if test="jkzy != null">#{jkzy},</if>
+            <if test="jkfw != null">#{jkfw},</if>
+            <if test="bdfw != null">#{bdfw},</if>
+            <if test="bdjl != null">#{bdjl},</if>
+            <if test="cz != null">#{cz},</if>
          </trim>
          </trim>
     </insert>
     </insert>
-    <insert id="insertSjZsjqkBatch">
-        INSERT INTO sj_zsjqk
-        (
-        sjjh, jh, jhbm, zqlxmc, cwmc, sdfw,
-        jkyl, dcyl, rzl, ljzrl, zrzt,
-        jkjl, jdjl, sftz
-        )
-        VALUES
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.sjjh},
-            #{item.jh},
-            #{item.jhbm},
-            #{item.zqlxmc},
-            #{item.cwmc},
-            #{item.sdfw},
-            #{item.jkyl},
-            #{item.dcyl},
-            #{item.rzl},
-            #{item.ljzrl},
-            #{item.zrzt},
-            #{item.jkjl},
-            #{item.jdjl},
-            #{item.sftz}
-            )
-        </foreach>
-
-    </insert>
 
 
     <update id="updateSjZsjqk" parameterType="SjZsjqk">
     <update id="updateSjZsjqk" parameterType="SjZsjqk">
         update sj_zsjqk
         update sj_zsjqk
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
+            <if test="sjjh != null">sjjh = #{sjjh},</if>
             <if test="jh != null">jh = #{jh},</if>
             <if test="jh != null">jh = #{jh},</if>
             <if test="jhbm != null">jhbm = #{jhbm},</if>
             <if test="jhbm != null">jhbm = #{jhbm},</if>
             <if test="zqlxmc != null">zqlxmc = #{zqlxmc},</if>
             <if test="zqlxmc != null">zqlxmc = #{zqlxmc},</if>
@@ -130,18 +128,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jkjl != null">jkjl = #{jkjl},</if>
             <if test="jkjl != null">jkjl = #{jkjl},</if>
             <if test="jdjl != null">jdjl = #{jdjl},</if>
             <if test="jdjl != null">jdjl = #{jdjl},</if>
             <if test="sftz != null">sftz = #{sftz},</if>
             <if test="sftz != null">sftz = #{sftz},</if>
+            <if test="zsjd != null">zsjd = #{zsjd},</if>
+            <if test="jkzy != null">jkzy = #{jkzy},</if>
+            <if test="jkfw != null">jkfw = #{jkfw},</if>
+            <if test="bdfw != null">bdfw = #{bdfw},</if>
+            <if test="bdjl != null">bdjl = #{bdjl},</if>
+            <if test="cz != null">cz = #{cz},</if>
         </trim>
         </trim>
-        where sjjh = #{sjjh}
+        where id = #{id}
     </update>
     </update>
 
 
-    <delete id="deleteSjZsjqkBySjjh" parameterType="String">
-        delete from sj_zsjqk where sjjh = #{sjjh}
+    <delete id="deleteSjZsjqkById" parameterType="Long">
+        delete from sj_zsjqk where id = #{id}
     </delete>
     </delete>
 
 
-    <delete id="deleteSjZsjqkBySjjhs" parameterType="String">
-        delete from sj_zsjqk where sjjh in 
-        <foreach item="sjjh" collection="array" open="(" separator="," close=")">
-            #{sjjh}
+    <delete id="deleteSjZsjqkByIds" parameterType="String">
+        delete from sj_zsjqk where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
 </mapper>
 </mapper>
\ No newline at end of file

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

@@ -22,10 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jc"    column="jc"    />
         <result property="jc"    column="jc"    />
         <result property="jxzs"    column="jxzs"    />
         <result property="jxzs"    column="jxzs"    />
         <result property="zb"    column="zb"    />
         <result property="zb"    column="zb"    />
+        <result property="cj"    column="cj"    />
+        <result property="sy"    column="sy"    />
+        <result property="zxd"    column="zxd"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSjZtgjsjVo">
     <sql id="selectSjZtgjsjVo">
-        select id, jh, ljjh, kc, jd, ztcc, ztxh, pz, mxqk, qzyy, cw, zjymd, pl, lgby, jc, jxzs, zb from sj_ztgjsj
+        select id, jh, ljjh, kc, jd, ztcc, ztxh, pz, mxqk, qzyy, cw, zjymd, pl, lgby, jc, jxzs, zb, cj, sy, zxd from sj_ztgjsj
     </sql>
     </sql>
 
 
     <select id="selectSjZtgjsjList" parameterType="SjZtgjsj" resultMap="SjZtgjsjResult">
     <select id="selectSjZtgjsjList" parameterType="SjZtgjsj" resultMap="SjZtgjsjResult">
@@ -47,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jc != null "> and jc = #{jc}</if>
             <if test="jc != null "> and jc = #{jc}</if>
             <if test="jxzs != null "> and jxzs = #{jxzs}</if>
             <if test="jxzs != null "> and jxzs = #{jxzs}</if>
             <if test="zb != null "> and zb = #{zb}</if>
             <if test="zb != null "> and zb = #{zb}</if>
+            <if test="cj != null  and cj != ''"> and cj = #{cj}</if>
+            <if test="sy != null  and sy != ''"> and sy = #{sy}</if>
+            <if test="zxd != null  and zxd != ''"> and zxd = #{zxd}</if>
         </where>
         </where>
     </select>
     </select>
     
     
@@ -74,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jc != null">jc,</if>
             <if test="jc != null">jc,</if>
             <if test="jxzs != null">jxzs,</if>
             <if test="jxzs != null">jxzs,</if>
             <if test="zb != null">zb,</if>
             <if test="zb != null">zb,</if>
+            <if test="cj != null">cj,</if>
+            <if test="sy != null">sy,</if>
+            <if test="zxd != null">zxd,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jh != null">#{jh},</if>
             <if test="jh != null">#{jh},</if>
@@ -92,6 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jc != null">#{jc},</if>
             <if test="jc != null">#{jc},</if>
             <if test="jxzs != null">#{jxzs},</if>
             <if test="jxzs != null">#{jxzs},</if>
             <if test="zb != null">#{zb},</if>
             <if test="zb != null">#{zb},</if>
+            <if test="cj != null">#{cj},</if>
+            <if test="sy != null">#{sy},</if>
+            <if test="zxd != null">#{zxd},</if>
          </trim>
          </trim>
     </insert>
     </insert>
     <insert id="insertSjZtgjsjBatch">
     <insert id="insertSjZtgjsjBatch">
@@ -99,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INSERT INTO sj_ztgjsj
         INSERT INTO sj_ztgjsj
         (
         (
         jh, ljjh, kc, jd, ztcc, ztxh, pz, mxqk,
         jh, ljjh, kc, jd, ztcc, ztxh, pz, mxqk,
-        qzyy, cw, zjymd, pl, lgby, jc, jxzs, zb
+        qzyy, cw, zjymd, pl, lgby, jc, jxzs, zb, cj, sy, zxd
         )
         )
         VALUES
         VALUES
         <foreach collection="list" item="item" separator=",">
         <foreach collection="list" item="item" separator=",">
@@ -119,7 +131,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.lgby},
             #{item.lgby},
             #{item.jc},
             #{item.jc},
             #{item.jxzs},
             #{item.jxzs},
-            #{item.zb}
+            #{item.zb},
+            #{item.cj},
+            #{item.sy},
+            #{item.zxd}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -143,6 +158,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jc != null">jc = #{jc},</if>
             <if test="jc != null">jc = #{jc},</if>
             <if test="jxzs != null">jxzs = #{jxzs},</if>
             <if test="jxzs != null">jxzs = #{jxzs},</if>
             <if test="zb != null">zb = #{zb},</if>
             <if test="zb != null">zb = #{zb},</if>
+            <if test="cj != null">cj = #{cj},</if>
+            <if test="sy != null">sy = #{sy},</if>
+            <if test="zxd != null">zxd = #{zxd},</if>
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>

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

@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		YCMSQK,
 		YCMSQK,
 		ZCMSQK,
 		ZCMSQK,
 		Qzyy,
 		Qzyy,
-		zb,pl,LGBY,cc ztcc
+		zb,pl,LGBY,cc ztcc,cj
 		from JSBA a
 		from JSBA a
 		left join jsaa b on a.jh = b.jh
 		left join jsaa b on a.jh = b.jh
 		left join (
 		left join (
@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		Qzyy,
 		Qzyy,
 		zzjs,
 		zzjs,
 		ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
 		ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
-		,pl,LGBY,cc,QSJS
+		,pl,LGBY,cc,QSJS,cj
 		from JSHA
 		from JSHA
 
 
 		order by xh
 		order by xh
@@ -595,14 +595,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		kc.kc,
 		kc.kc,
 		zjzq.wjzq,
 		zjzq.wjzq,
 		zjzq.zjzq,
 		zjzq.zjzq,
-		round(power(power(a.jkhzb - ${jkhzb}
-		, 2) + power(a.jkzzb - ${jkzzb}, 2), 0.5), 2) as jkjl,
-		round(power(power(a.jdhzb - ${jdhzb}
-		, 2) + power(a.jdzzb - ${jdzzb}, 2), 0.5), 2) as jdjl,
-		a.jkzzb - ${jkzzb}                                                  as jkzjl,
-		a.jkhzb - ${jkhzb}                                                   as jkhjl,
-		a.jdzzb - ${jdzzb}                                                  as jdzjl,
-		a.jdhzb - ${jdhzb}                                                   as jdhjl,
+		<if test="jkhzb!=null and jkzzb!=null">
+			round(power(power(a.jkhzb - ${jkhzb}
+			, 2) + power(a.jkzzb - ${jkzzb}, 2), 0.5), 2) as jkjl,
+			a.jkzzb - ${jkzzb}                                                  as jkzjl,
+			a.jkhzb - ${jkhzb}                                                   as jkhjl,
+		</if>
+
+		<if test="jdhzb!=null and jdhzb!=null">
+			round(power(power(a.jdhzb - ${jdhzb}
+			, 2) + power(a.jdzzb - ${jdzzb}, 2), 0.5), 2) as jdjl,
+
+			a.jdzzb - ${jdzzb}                                                  as jdzjl,
+			a.jdhzb - ${jdhzb}                                                   as jdhjl,
+		</if>
+
 		to_char(WJRQ,'YYYY-MM-DD')WJRQ,
 		to_char(WJRQ,'YYYY-MM-DD')WJRQ,
 		b.sjjs,
 		b.sjjs,
 		b.wjczjs wzczjs,
 		b.wjczjs wzczjs,
@@ -634,6 +641,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE 1 = 1
 		WHERE 1 = 1
 		and a.jh not like '%侧%'
 		and a.jh not like '%侧%'
 
 
+		<if test="jh!=null and jh!='' and searchType=='jhmm'.toString()">
+			and a.jh  like concat(concat('%',#{jh}),'%')
+		</if>
 		<if test="wjsjks!=null and wjsjks!=''">
 		<if test="wjsjks!=null and wjsjks!=''">
 			and TO_CHAR(b.wjrq, 'YYYY')>=#{wjsjks}
 			and TO_CHAR(b.wjrq, 'YYYY')>=#{wjsjks}
 		</if>
 		</if>
@@ -668,7 +678,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				#{item}
 				#{item}
 			</foreach>
 			</foreach>
 		</if>
 		</if>
-		order by WJRQ desc NULLS LAST) where   jkjl &lt;=#{jl} and ROWNUM &lt;= 100
+		order by WJRQ desc NULLS LAST) where
+
+		                                   1=1
+		<choose>
+			<when test="jkhzb != null and jkzzb != null">
+				and  jkjl &lt;=#{jl}
+			</when>
+			<when test="jdhzb != null and jdzzb != null">
+				and  jdjl &lt;=#{jl}
+			</when>
+		</choose>
+		    and ROWNUM &lt;= 100 order by WJRQ desc  NULLS LAST
+
 	</select>
 	</select>
 <!--	and a.jdhzb - #{jdhzb} &lt; #{jl}-->
 <!--	and a.jdhzb - #{jdhzb} &lt; #{jl}-->
 <!--	AND a.jdzzb - #{jdzzb} &lt; #{jl}-->
 <!--	AND a.jdzzb - #{jdzzb} &lt; #{jl}-->
@@ -1257,5 +1279,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 									   LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
 									   LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
 								   FROM JSDB) ) a where jh=#{jh}
 								   FROM JSDB) ) a where jh=#{jh}
 	</select>
 	</select>
+    <select id="getJsqaListByJh" resultType="com.zjsgfa.project.zjsgfa.domain.SjLjfzqk">
+
+		select a.jh ljjh,FSRQ sj,FZQK fzqk,b.WJCZJS wzjs
+		       <if test="jkhzb!=null and jkzzb !=null">
+				   ,round(power(power(ABS(c.jkhzb - #{jkhzb}
+				   ), 2) + power(ABS(c.jkzzb -#{jkzzb}), 2), 0.5), 2) as jl
+			   </if>
+
+		from  jsqa a
+				  left join  jsaa b on a.jh=b.JH
+				  left join  jsba c on a.jh=c.JH
+		where 1=1
+
+		<if test="jhs!=null">
+			and a.jh in
+			<foreach item="jh" collection="jhs"
+					 open="(" separator="," close=")">
+				#{jh}
+			</foreach>
+		</if>
+	</select>
 
 
 </mapper>
 </mapper>
\ No newline at end of file