Skip to content

Z
zjsgfa_mysql
Commit 194c5fc9 by jiangyun
Options

修改

parent 340985ae
Showing with 1464 additions and 362 deletions
src/main/java/com/zjsgfa/project/zjsgfa/controller/DjjcLcController.java
......@@ -20,10 +20,13 @@ import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.soap.Addressing;
import java.util.*;
import java.util.stream.Collectors;
import static com.zjsgfa.framework.web.domain.AjaxResult.success;
@RestController
@RequestMapping("/sjdjlc")
public class DjjcLcController
......@@ -126,7 +129,7 @@ public class DjjcLcController
public AjaxResult getInfo(@PathVariable("instanceId") String instanceId)
{
SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcByinstanceId(instanceId);
return AjaxResult.success(sjDjjc);
return success(sjDjjc);
}
/**
......@@ -138,7 +141,7 @@ public class DjjcLcController
public AjaxResult getInfoZjy(@PathVariable("instanceId") String instanceId)
{
SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcByinstanceIdZjy(instanceId);
return AjaxResult.success(sjDjjc);
return success(sjDjjc);
}
......@@ -181,7 +184,7 @@ public class DjjcLcController
autoCompleteFirstSubmit(applyUserId, processDefinitionKey, processInstanceId, sjDjjc);
return AjaxResult.success();
return success();
}
......@@ -302,7 +305,7 @@ public class DjjcLcController
return AjaxResult.error("办理失败");
}
return AjaxResult.success();
return success();
}
......@@ -346,7 +349,7 @@ public class DjjcLcController
autoCompleteFirstSubmitZjy(applyUserId, processDefinitionKeyZjy, processInstanceId, sjDjjc);
return AjaxResult.success();
return success();
} catch (Exception e) {
return AjaxResult.error("提交失败");
......@@ -468,7 +471,7 @@ public class DjjcLcController
return AjaxResult.error("办理失败");
}
return AjaxResult.success();
return success();
}
......@@ -488,7 +491,7 @@ public class DjjcLcController
resultMap.put("table", bizTodoItems);
if (bizTodoItems.isEmpty()) {
return AjaxResult.success(resultMap);
return success(resultMap);
}
String type = bizTodoItems.get(0).getItemName();
......@@ -505,8 +508,43 @@ public class DjjcLcController
populateNodeUserInfo(jdList, bizTodoItems, approvalInfo.getSecondaryUnit());
resultMap.put("jdList", jdList);
return AjaxResult.success(resultMap);
return success(resultMap);
}
/**
* 撤回任务
*
* @return
*/
@RequestMapping(value = "/chrw/{taskId}/{ID}", method = {RequestMethod.POST, RequestMethod.GET})
@ResponseBody
public AjaxResult chrw(@PathVariable("taskId") String taskId,@PathVariable("ID") Long ID, HttpServletRequest request) {
SjDjjc entity = sjDjjcMapper.selectSjDjjcById(ID);
entity.setP_B_approved("false");
entity.setP_COM_comment("不同意");
// zyZlNdjhService.chrw(taskId, entity, processDefinitionKey, new HashMap<>(), request);
// 流程的显示标题
String itemName = "工程方案审核";
String itemContent = entity.getJh()+"工程方案审核";
// 审核节点每次提交，需要更新业务表信息
SjDjjc tmpProject = new SjDjjc();
tmpProject.setId(entity.getId());
Map<String,Object> variables =new HashMap<>();
// 获取流程发起人、和所属部门id
String applyUserId = entity.getApplyUser();
variables.put(processTrend, "退修");
// 下一节点任务书编辑 处理人为提交者
variables.put(taskEditParamName, applyUserId); // 设置下一节点审核人 设置userId
processService.ch(taskId, entity.getInstanceId(), itemName, itemContent, Complete_Module, variables, request);
return success("任务已撤回");
}
/**
* 获取审批历史记录
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjBcxxController.java 0 → 100644
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.SjBcxx;
import com.zjsgfa.project.zjsgfa.service.ISjBcxxService;
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-03-05
*/
@RestController
@RequestMapping("/system/sjBcxx")
public class SjBcxxController extends BaseController
{
@Autowired
private ISjBcxxService sjBcxxService;
/**
* 查询方案补充信息列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:list')")
@GetMapping("/list")
public TableDataInfo list(SjBcxx sjBcxx)
{
// startPage();
List<SjBcxx> list = sjBcxxService.selectSjBcxxList(sjBcxx);
return getDataTable(list);
}
/**
* 导出方案补充信息列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:export')")
@Log(title = "方案补充信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SjBcxx sjBcxx)
{
List<SjBcxx> list = sjBcxxService.selectSjBcxxList(sjBcxx);
ExcelUtil<SjBcxx> util = new ExcelUtil<SjBcxx>(SjBcxx.class);
util.exportExcel(response, list, "方案补充信息数据");
}
/**
* 获取方案补充信息详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(sjBcxxService.selectSjBcxxById(id));
}
/**
* 新增方案补充信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:add')")
@Log(title = "方案补充信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SjBcxx sjBcxx)
{
return toAjax(sjBcxxService.insertSjBcxx(sjBcxx));
}
/**
* 修改方案补充信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:edit')")
@Log(title = "方案补充信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SjBcxx sjBcxx)
{
return toAjax(sjBcxxService.updateSjBcxx(sjBcxx));
}
/**
* 删除方案补充信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjBcxx:remove')")
@Log(title = "方案补充信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sjBcxxService.deleteSjBcxxByIds(ids));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjFzqkmsController.java 0 → 100644
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.SjFzqkms;
import com.zjsgfa.project.zjsgfa.service.ISjFzqkmsService;
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-28
*/
@RestController
@RequestMapping("/system/sjFzqkms")
public class SjFzqkmsController extends BaseController
{
@Autowired
private ISjFzqkmsService sjFzqkmsService;
/**
* 查询方案邻井复杂描述列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:list')")
@GetMapping("/list")
public TableDataInfo list(SjFzqkms sjFzqkms)
{
startPage();
List<SjFzqkms> list = sjFzqkmsService.selectSjFzqkmsList(sjFzqkms);
return getDataTable(list);
}
/**
* 导出方案邻井复杂描述列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:export')")
@Log(title = "方案邻井复杂描述", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SjFzqkms sjFzqkms)
{
List<SjFzqkms> list = sjFzqkmsService.selectSjFzqkmsList(sjFzqkms);
ExcelUtil<SjFzqkms> util = new ExcelUtil<SjFzqkms>(SjFzqkms.class);
util.exportExcel(response, list, "方案邻井复杂描述数据");
}
/**
* 获取方案邻井复杂描述详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:query')")
@GetMapping(value = "/{zbid}")
public AjaxResult getInfo(@PathVariable("zbid") Long id)
{
SjFzqkms sjFzqkms = sjFzqkmsService.selectSjFzqkmsById(id);
if(sjFzqkms==null){
sjFzqkms=new SjFzqkms();
}
return success(sjFzqkms);
}
/**
* 新增方案邻井复杂描述
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:add')")
@Log(title = "方案邻井复杂描述", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SjFzqkms sjFzqkms)
{
return toAjax(sjFzqkmsService.insertSjFzqkms(sjFzqkms));
}
/**
* 修改方案邻井复杂描述
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:edit')")
@Log(title = "方案邻井复杂描述", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SjFzqkms sjFzqkms)
{
return toAjax(sjFzqkmsService.updateSjFzqkms(sjFzqkms));
}
/**
* 删除方案邻井复杂描述
*/
//@PreAuthorize("@ss.hasPermi('system:sjFzqkms:remove')")
@Log(title = "方案邻井复杂描述", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sjFzqkmsService.deleteSjFzqkmsByIds(ids));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjLjzjysyqkController.java
......@@ -41,7 +41,7 @@ public class SjLjzjysyqkController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SjLjzjysyqk sjLjzjysyqk)
{
startPage();
// startPage();
List<SjLjzjysyqk> list = sjLjzjysyqkService.selectSjLjzjysyqkList(sjLjzjysyqk);
return getDataTable(list);
}
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjSggyZjyCljlController.java
package com.zjsgfa.project.zjsgfa.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.project.zjsgfa.domain.SjSggyZjyFdsj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -20,6 +22,7 @@ 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;
import org.springframework.web.multipart.MultipartFile;
/**
* 设计信息-施工概要-钻井液材料加量Controller
......@@ -54,7 +57,8 @@ public class SjSggyZjyCljlController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SjSggyZjyCljl sjSggyZjyCljl)
{
List<SjSggyZjyCljl> list = sjSggyZjyCljlService.selectSjSggyZjyCljlList(sjSggyZjyCljl);
// List<SjSggyZjyCljl> list = sjSggyZjyCljlService.selectSjSggyZjyCljlList(sjSggyZjyCljl);
List<SjSggyZjyCljl> list = new ArrayList<>();
ExcelUtil<SjSggyZjyCljl> util = new ExcelUtil<SjSggyZjyCljl>(SjSggyZjyCljl.class);
util.exportExcel(response, list, "设计信息-施工概要-钻井液材料加量数据");
}
......@@ -101,4 +105,17 @@ public class SjSggyZjyCljlController extends BaseController
{
return toAjax(sjSggyZjyCljlService.deleteSjSggyZjyCljlByIds(ids));
}
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, String jh) throws Exception
{
ExcelUtil<SjSggyZjyCljl> util = new ExcelUtil<SjSggyZjyCljl>(SjSggyZjyCljl.class);
List<SjSggyZjyCljl> sjSggyZjyCljlList = util.importExcel(file.getInputStream());
sjSggyZjyCljlList.forEach(sjFdfx -> sjFdfx.setJh(jh));
if(sjSggyZjyCljlList.size()>0){
sjSggyZjyCljlService.insertSjSggyZjyCljlBatch(sjSggyZjyCljlList);
}
return success("导入成功！");
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjSggyZjyFdsjController.java
package com.zjsgfa.project.zjsgfa.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.project.zjsgfa.domain.SjZsjqk;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -20,6 +22,7 @@ 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;
import org.springframework.web.multipart.MultipartFile;
/**
* 设计信息-施工概要-分段钻井液设计Controller
......@@ -54,7 +57,8 @@ public class SjSggyZjyFdsjController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SjSggyZjyFdsj sjSggyZjyFdsj)
{
List<SjSggyZjyFdsj> list = sjSggyZjyFdsjService.selectSjSggyZjyFdsjList(sjSggyZjyFdsj);
// List<SjSggyZjyFdsj> list = sjSggyZjyFdsjService.selectSjSggyZjyFdsjList(sjSggyZjyFdsj);
List<SjSggyZjyFdsj> list = new ArrayList<>();
ExcelUtil<SjSggyZjyFdsj> util = new ExcelUtil<SjSggyZjyFdsj>(SjSggyZjyFdsj.class);
util.exportExcel(response, list, "设计信息-施工概要-分段钻井液设计数据");
}
......@@ -101,4 +105,16 @@ public class SjSggyZjyFdsjController extends BaseController
{
return toAjax(sjSggyZjyFdsjService.deleteSjSggyZjyFdsjByIds(ids));
}
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, String jh) throws Exception
{
ExcelUtil<SjSggyZjyFdsj> util = new ExcelUtil<SjSggyZjyFdsj>(SjSggyZjyFdsj.class);
List<SjSggyZjyFdsj> sjSggyZjyFdsjList = util.importExcel(file.getInputStream());
sjSggyZjyFdsjList.forEach(sjFdfx -> sjFdfx.setJh(jh));
if(sjSggyZjyFdsjList.size()>0){
sjSggyZjyFdsjService.insertSjSggyZjyFdsjBatch(sjSggyZjyFdsjList);
}
return success("导入成功！");
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjSggyZjzhcsController.java
package com.zjsgfa.project.zjsgfa.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.project.zjsgfa.domain.SjFdfx;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -20,6 +22,7 @@ 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;
import org.springframework.web.multipart.MultipartFile;
/**
* 设计-钻具组合参数Controller
......@@ -54,9 +57,9 @@ public class SjSggyZjzhcsController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SjSggyZjzhcs sjSggyZjzhcs)
{
List<SjSggyZjzhcs> list = sjSggyZjzhcsService.selectSjSggyZjzhcsList(sjSggyZjzhcs);
List<SjSggyZjzhcs> list = new ArrayList<>();
ExcelUtil<SjSggyZjzhcs> util = new ExcelUtil<SjSggyZjzhcs>(SjSggyZjzhcs.class);
util.exportExcel(response, list, "设计-钻具组合参数数据");
util.exportExcel(response, list, "分段钻具结构及钻井参数");
}
/**
......@@ -101,4 +104,21 @@ public class SjSggyZjzhcsController extends BaseController
{
return toAjax(sjSggyZjzhcsService.deleteSjSggyZjzhcsByIds(ids));
}
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, String jh) throws Exception
{
ExcelUtil<SjSggyZjzhcs> util = new ExcelUtil<SjSggyZjzhcs>(SjSggyZjzhcs.class);
List<SjSggyZjzhcs> sjSggyZjzhcsList = util.importExcel(file.getInputStream());
sjSggyZjzhcsList.forEach(sjFdfx -> sjFdfx.setJh(jh));
if(sjSggyZjzhcsList.size()>0){
sjSggyZjzhcsService.importData(sjSggyZjzhcsList);
}
return success("导入成功！");
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjZsjqkController.java
package com.zjsgfa.project.zjsgfa.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.project.zjsgfa.domain.SjSggyZjzhcs;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -20,6 +23,7 @@ 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;
import org.springframework.web.multipart.MultipartFile;
/**
* 设计-注水井情况Controller
......@@ -37,7 +41,7 @@ public class SjZsjqkController extends BaseController
/**
* 查询设计-注水井情况列表
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:list')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:list')")
@GetMapping("/list")
public TableDataInfo list(SjZsjqk sjZsjqk)
{
......@@ -49,12 +53,13 @@ public class SjZsjqkController extends BaseController
/**
* 导出设计-注水井情况列表
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:export')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:export')")
@Log(title = "设计-注水井情况", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SjZsjqk sjZsjqk)
{
List<SjZsjqk> list = sjZsjqkService.selectSjZsjqkList(sjZsjqk);
// List<SjZsjqk> list = sjZsjqkService.selectSjZsjqkList(sjZsjqk);
List<SjZsjqk> list = new ArrayList<>();
ExcelUtil<SjZsjqk> util = new ExcelUtil<SjZsjqk>(SjZsjqk.class);
util.exportExcel(response, list, "设计-注水井情况数据");
}
......@@ -62,7 +67,7 @@ public class SjZsjqkController extends BaseController
/**
* 获取设计-注水井情况详细信息
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:query')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +77,7 @@ public class SjZsjqkController extends BaseController
/**
* 新增设计-注水井情况
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:add')")
@Log(title = "设计-注水井情况", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SjZsjqk sjZsjqk)
......@@ -83,7 +88,7 @@ public class SjZsjqkController extends BaseController
/**
* 修改设计-注水井情况
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:edit')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:edit')")
@Log(title = "设计-注水井情况", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SjZsjqk sjZsjqk)
......@@ -94,11 +99,26 @@ public class SjZsjqkController extends BaseController
/**
* 删除设计-注水井情况
*/
@PreAuthorize("@ss.hasPermi('system:sjZsjqk:remove')")
//@PreAuthorize("@ss.hasPermi('system:sjZsjqk:remove')")
@Log(title = "设计-注水井情况", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sjZsjqkService.deleteSjZsjqkByIds(ids));
}
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, String jh) throws Exception
{
ExcelUtil<SjZsjqk> util = new ExcelUtil<SjZsjqk>(SjZsjqk.class);
List<SjZsjqk> sjZsjqkList = util.importExcel(file.getInputStream());
sjZsjqkList.forEach(sjFdfx -> sjFdfx.setJh(jh));
if(sjZsjqkList.size()>0){
sjZsjqkService.insertSjZsjqkBatch(sjZsjqkList);
}
return success("导入成功！");
}
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjBcxx.java 0 → 100644
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_bcxx
*
* @author ruoyi
* @date 2026-03-05
*/
@Data
public class SjBcxx extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 主表id */
@Excel(name = "主表id")
private Long zbid;
/** 标题 */
@Excel(name = "标题")
private String bt;
/** 内容 */
@Excel(name = "内容")
private String nr;
/** 备用1 */
@Excel(name = "备用1")
private String ext1;
/** 备用2 */
@Excel(name = "备用2")
private String ext2;
/** 备用3 */
@Excel(name = "备用3")
private String ext3;
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFzqkms.java 0 → 100644
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_fzqkms
*
* @author ruoyi
* @date 2026-02-28
*/
@Data
public class SjFzqkms extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 主表id */
@Excel(name = "主表id")
private Long zbid;
/** 复杂情况 */
@Excel(name = "复杂情况")
private String gcfzqk;
/** 钻井液复杂情况 */
@Excel(name = "钻井液复杂情况")
private String zjyfzqk;
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjSggyZjyCljl.java
......@@ -21,7 +21,7 @@ public class SjSggyZjyCljl extends BaseEntity
private Long id;
/** 井号 */
@Excel(name = "井号")
// @Excel(name = "井号")
private String jh;
/** 材料名称及代号 */
......@@ -29,36 +29,36 @@ public class SjSggyZjyCljl extends BaseEntity
private String clmc;
/** 一开加量 （kg/m3） */
@Excel(name = "一开加量 ", readConverterExp = "k=g/m3")
@Excel(name = "一开加量")
private String ykjl;
/** 二开加量 （kg/m3） */
@Excel(name = "二开加量 ", readConverterExp = "k=g/m3")
@Excel(name = "二开加量")
private String ekjl;
/** 三开加量 （kg/m3） */
@Excel(name = "三开加量 ", readConverterExp = "k=g/m3")
@Excel(name = "三开加量")
private String skjl;
/** 四开加量 （kg/m3） */
@Excel(name = "四开加量 ", readConverterExp = "k=g/m3")
@Excel(name = "四开加量")
private String sikjl;
/** 五开加量 （kg/m3） */
@Excel(name = "五开加量 ", readConverterExp = "k=g/m3")
@Excel(name = "五开加量")
private String wkjl;
/** 备注 */
@Excel(name = "备注")
// @Excel(name = "备注")
private String bz;
/** 创建人 */
@Excel(name = "创建人")
// @Excel(name = "创建人")
private String createdBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
// @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime;
public void setId(Long id)
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjSggyZjyFdsj.java
......@@ -25,7 +25,7 @@ public class SjSggyZjyFdsj extends BaseEntity
private String jh;
/** 开次 */
@Excel(name = "开次")
// @Excel(name = "开次")
private String kc;
/** 井段 */
......@@ -37,16 +37,16 @@ public class SjSggyZjyFdsj extends BaseEntity
private String zjytx;
/** 备注 */
@Excel(name = "备注")
// @Excel(name = "备注")
private String bz;
/** 创建人 */
@Excel(name = "创建人")
// @Excel(name = "创建人")
private String createdBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
// @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime;
public void setId(Long id)
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjSggyZjzhcs.java
......@@ -63,7 +63,7 @@ public class SjSggyZjzhcs extends BaseEntity
private String zjzs;
/** 批量 */
@Excel(name = "批量")
@Excel(name = "排量")
private String zjpl;
/** 泵压 */
......@@ -78,174 +78,4 @@ public class SjSggyZjzhcs extends BaseEntity
@Excel(name = "钻具结构")
private String zjjg;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
public void setJd(String jd)
{
this.jd = jd;
}
public String getJd()
{
return jd;
}
public void setZtxh(String ztxh)
{
this.ztxh = ztxh;
}
public String getZtxh()
{
return ztxh;
}
public void setCj(String cj)
{
this.cj = cj;
}
public String getCj()
{
return cj;
}
public void setCc(String cc)
{
this.cc = cc;
}
public String getCc()
{
return cc;
}
public void setSy(String sy)
{
this.sy = sy;
}
public String getSy()
{
return sy;
}
public void setYj(String yj)
{
this.yj = yj;
}
public String getYj()
{
return yj;
}
public void setZjymd(String zjymd)
{
this.zjymd = zjymd;
}
public String getZjymd()
{
return zjymd;
}
public void setZjzy(String zjzy)
{
this.zjzy = zjzy;
}
public String getZjzy()
{
return zjzy;
}
public void setZjzs(String zjzs)
{
this.zjzs = zjzs;
}
public String getZjzs()
{
return zjzs;
}
public void setZjpl(String zjpl)
{
this.zjpl = zjpl;
}
public String getZjpl()
{
return zjpl;
}
public void setZjby(String zjby)
{
this.zjby = zjby;
}
public String getZjby()
{
return zjby;
}
public void setGtzj(String gtzj)
{
this.gtzj = gtzj;
}
public String getGtzj()
{
return gtzj;
}
public void setZjjg(String zjjg)
{
this.zjjg = zjjg;
}
public String getZjjg()
{
return zjjg;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jh", getJh())
.append("jd", getJd())
.append("ztxh", getZtxh())
.append("cj", getCj())
.append("cc", getCc())
.append("sy", getSy())
.append("yj", getYj())
.append("zjymd", getZjymd())
.append("zjzy", getZjzy())
.append("zjzs", getZjzs())
.append("zjpl", getZjpl())
.append("zjby", getZjby())
.append("gtzj", getGtzj())
.append("zjjg", getZjjg())
.toString();
}
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjZsjqk.java
......@@ -19,83 +19,93 @@ public class SjZsjqk extends BaseEntity
private Long id;
/** 设计井号 */
@Excel(name = "设计井号")
@Excel(name = "邻井井号")
private String sjjh;
/** 井号 */
@Excel(name = "井号")
// @Excel(name = "井号")
private String jh;
/** 井号编码（中文井号） */
@Excel(name = "井号编码", readConverterExp = "中=文井号")
// @Excel(name = "井号编码", readConverterExp = "中=文井号")
private String jhbm;
/** 注入类型 */
@Excel(name = "注入类型")
// @Excel(name = "注入类型")
private String zqlxmc;
/** 注水层位 */
@Excel(name = "注水层位")
private String cwmc;
/** 注水井段 */
@Excel(name = "注水井段")
private String zsjd;
/** 日注量 */
@Excel(name = "日注水量")
private String rzl;
/** 井口注压 */
@Excel(name = "井口注压")
private String jkzy;
/** 井口方位 */
@Excel(name = "井口方位")
private String jkfw;
/** 井口距离 */
@Excel(name = "井口距离")
private String jkjl;
/** 井底距离 */
// @Excel(name = "井底距离")
private String jdjl;
/** 靶点方位 */
@Excel(name = "靶点方位")
private String bdfw;
/** 靶点距离 */
@Excel(name = "靶点距离")
private String bdjl;
/** 深度范围 */
@Excel(name = "深度范围")
// @Excel(name = "深度范围")
private String sdfw;
/** 井口压力 */
@Excel(name = "井口压力")
// @Excel(name = "井口压力")
private String jkyl;
/** 地层压力 */
@Excel(name = "地层压力")
// @Excel(name = "地层压力")
private String dcyl;
/** 日注量 */
@Excel(name = "日注量")
private String rzl;
/** 累计注入量 */
@Excel(name = "累计注入量")
// @Excel(name = "累计注入量")
private String ljzrl;
/** 注入状态 */
@Excel(name = "注入状态")
// @Excel(name = "注入状态")
private String zrzt;
/** 井口距离 */
@Excel(name = "井口距离")
private String jkjl;
/** 井底距离 */
@Excel(name = "井底距离")
private String jdjl;
/** 是否停驻 */
@Excel(name = "是否停驻")
private String sftz;
/** 注水井段 */
@Excel(name = "注水井段")
private String zsjd;
/** 井口注压 */
@Excel(name = "井口注压")
private String jkzy;
/** 井口方位 */
@Excel(name = "井口方位")
private String jkfw;
/** 是否停驻 */
// @Excel(name = "是否停驻")
private String sftz;
/** 靶点方位 */
@Excel(name = "靶点方位")
private String bdfw;
/** 靶点距离 */
@Excel(name = "靶点距离")
private String bdjl;
/** 操作 */
@Excel(name = "操作")
// @Excel(name = "操作")
private String cz;
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/BizTodoItemMapper.java
......@@ -69,4 +69,5 @@ public interface BizTodoItemMapper
List<BizTodoItem> selectBizTodoItemList2(BizTodoItem bizTodoItem);
List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem bizTodoItem);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjBcxxMapper.java 0 → 100644
package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.SjBcxx;
import io.lettuce.core.dynamic.annotation.Param;
/**
* 方案补充信息Mapper接口
*
* @author ruoyi
* @date 2026-03-05
*/
public interface SjBcxxMapper
{
/**
* 查询方案补充信息
*
* @param id 方案补充信息主键
* @return 方案补充信息
*/
public SjBcxx selectSjBcxxById(Long id);
/**
* 查询方案补充信息列表
*
* @param sjBcxx 方案补充信息
* @return 方案补充信息集合
*/
public List<SjBcxx> selectSjBcxxList(SjBcxx sjBcxx);
/**
* 新增方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
public int insertSjBcxx(SjBcxx sjBcxx);
/**
* 修改方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
public int updateSjBcxx(SjBcxx sjBcxx);
/**
* 删除方案补充信息
*
* @param id 方案补充信息主键
* @return 结果
*/
public int deleteSjBcxxById(Long id);
/**
* 批量删除方案补充信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSjBcxxByIds(Long[] ids);
int insertSjBcxxBatch(@Param("list") List<SjBcxx> sjBcxxList);
int deleteSjBcxxByZbid(Long id);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjFzqkmsMapper.java 0 → 100644
package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.SjFzqkms;
/**
* 方案邻井复杂描述Mapper接口
*
* @author ruoyi
* @date 2026-02-28
*/
public interface SjFzqkmsMapper
{
/**
* 查询方案邻井复杂描述
*
* @param id 方案邻井复杂描述主键
* @return 方案邻井复杂描述
*/
public SjFzqkms selectSjFzqkmsById(Long id);
/**
* 查询方案邻井复杂描述列表
*
* @param sjFzqkms 方案邻井复杂描述
* @return 方案邻井复杂描述集合
*/
public List<SjFzqkms> selectSjFzqkmsList(SjFzqkms sjFzqkms);
/**
* 新增方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
public int insertSjFzqkms(SjFzqkms sjFzqkms);
/**
* 修改方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
public int updateSjFzqkms(SjFzqkms sjFzqkms);
/**
* 删除方案邻井复杂描述
*
* @param id 方案邻井复杂描述主键
* @return 结果
*/
public int deleteSjFzqkmsById(Long id);
/**
* 批量删除方案邻井复杂描述
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSjFzqkmsByIds(Long[] ids);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjLjzjysyqkMapper.java
......@@ -58,4 +58,9 @@ public interface SjLjzjysyqkMapper
* @return 结果
*/
public int deleteSjLjzjysyqkByIds(Long[] ids);
int insertSjLjzjysyqkBatch(List<SjLjzjysyqk> sjLjzjysyqkList);
int deleteSjLjzjysyqkByJh(String jh);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjSggyZjzhcsMapper.java
......@@ -63,4 +63,7 @@ public interface SjSggyZjzhcsMapper
SjSggyZjzhcs selectSjSggyZjzhcsByZjzhcs(SjSggyZjzhcs sjSggyZjzhcs);
int importData(List<SjSggyZjzhcs> sjFdfxList);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjZsjqkMapper.java
......@@ -58,4 +58,7 @@ public interface SjZsjqkMapper
* @return 结果
*/
public int deleteSjZsjqkByIds(Long[] ids);
int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/IBizTodoItemService.java
......@@ -65,4 +65,6 @@ public interface IBizTodoItemService
List<BizTodoItem> selectBizTodoItemList2(BizTodoItem bizTodoItem);
List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjBcxxService.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.SjBcxx;
/**
* 方案补充信息Service接口
*
* @author ruoyi
* @date 2026-03-05
*/
public interface ISjBcxxService
{
/**
* 查询方案补充信息
*
* @param id 方案补充信息主键
* @return 方案补充信息
*/
public SjBcxx selectSjBcxxById(Long id);
/**
* 查询方案补充信息列表
*
* @param sjBcxx 方案补充信息
* @return 方案补充信息集合
*/
public List<SjBcxx> selectSjBcxxList(SjBcxx sjBcxx);
/**
* 新增方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
public int insertSjBcxx(SjBcxx sjBcxx);
/**
* 修改方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
public int updateSjBcxx(SjBcxx sjBcxx);
/**
* 批量删除方案补充信息
*
* @param ids 需要删除的方案补充信息主键集合
* @return 结果
*/
public int deleteSjBcxxByIds(Long[] ids);
/**
* 删除方案补充信息信息
*
* @param id 方案补充信息主键
* @return 结果
*/
public int deleteSjBcxxById(Long id);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjFzqkmsService.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.SjFzqkms;
/**
* 方案邻井复杂描述Service接口
*
* @author ruoyi
* @date 2026-02-28
*/
public interface ISjFzqkmsService
{
/**
* 查询方案邻井复杂描述
*
* @param id 方案邻井复杂描述主键
* @return 方案邻井复杂描述
*/
public SjFzqkms selectSjFzqkmsById(Long id);
/**
* 查询方案邻井复杂描述列表
*
* @param sjFzqkms 方案邻井复杂描述
* @return 方案邻井复杂描述集合
*/
public List<SjFzqkms> selectSjFzqkmsList(SjFzqkms sjFzqkms);
/**
* 新增方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
public int insertSjFzqkms(SjFzqkms sjFzqkms);
/**
* 修改方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
public int updateSjFzqkms(SjFzqkms sjFzqkms);
/**
* 批量删除方案邻井复杂描述
*
* @param ids 需要删除的方案邻井复杂描述主键集合
* @return 结果
*/
public int deleteSjFzqkmsByIds(Long[] ids);
/**
* 删除方案邻井复杂描述信息
*
* @param id 方案邻井复杂描述主键
* @return 结果
*/
public int deleteSjFzqkmsById(Long id);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjSggyZjyCljlService.java
......@@ -58,4 +58,7 @@ public interface ISjSggyZjyCljlService
* @return 结果
*/
public int deleteSjSggyZjyCljlById(Long id);
int insertSjSggyZjyCljlBatch(List<SjSggyZjyCljl> sjSggyZjyCljlList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjSggyZjyFdsjService.java
......@@ -58,4 +58,7 @@ public interface ISjSggyZjyFdsjService
* @return 结果
*/
public int deleteSjSggyZjyFdsjById(Long id);
int insertSjSggyZjyFdsjBatch(List<SjSggyZjyFdsj> sjSggyZjyFdsjList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjSggyZjzhcsService.java
......@@ -58,4 +58,6 @@ public interface ISjSggyZjzhcsService
* @return 结果
*/
public int deleteSjSggyZjzhcsById(Long id);
int importData(List<SjSggyZjzhcs> sjFdfxList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjZsjqkService.java
......@@ -58,4 +58,7 @@ public interface ISjZsjqkService
* @return 结果
*/
public int deleteSjZsjqkById(Long id);
int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ProcessService.java
......@@ -7,4 +7,5 @@ public interface ProcessService {
void complete(String taskId, String processInstanceId, String itemName, String itemContent, String complete_module, Map<String, Object> variables, HttpServletRequest request,String comment);
void ch(String taskId, String instanceId, String itemName, String itemContent, String completeModule, Map<String, Object> variables, HttpServletRequest request);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/BizTodoItemServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.Collections;
import java.util.List;
import com.zjsgfa.common.utils.DateUtils;
......@@ -168,4 +169,9 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService
public List<BizTodoItem> selectBizTodoItemList2(BizTodoItem bizTodoItem) {
return bizTodoItemMapper.selectBizTodoItemList2(bizTodoItem);
}
@Override
public List<BizTodoItem> selectBizTodoItemListbyinstanceId(BizTodoItem query) {
return bizTodoItemMapper.selectBizTodoItemListbyinstanceId(query);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/ProcessServiceImpl.java
......@@ -86,4 +86,52 @@ public class ProcessServiceImpl implements ProcessService {
bizTodoItemService.insertTodoItem(instanceId, itemName, itemContent, module,null);
}
@Override
public void ch(String taskId, String instanceId, String itemName, String itemContent, String completeModule, Map<String, Object> variables, HttpServletRequest request) {
String comment = null; // 批注
boolean agree = true;
try {
// edit by wj
// identityService.setAuthenticatedUserId(ShiroUtils.getUserId().toString());
comment = "【撤回】";
taskService.addComment(taskId, instanceId, comment);
// 被委派人处理完成任务
// p.s. 被委托的流程需要先 resolved 这个任务再提交。
// 所以在 complete 之前需要先 resolved
// resolveTask() 要在 claim() 之前，不然 act_hi_taskinst 表的 assignee 字段会为 null
taskService.resolveTask(taskId, variables);
// 只有签收任务，act_hi_taskinst 表的 assignee 字段才不为 null
taskService.claim(taskId, SecurityUtils.getUsername());
taskService.complete(taskId, variables);
// 更新待办事项状态
BizTodoItem query = new BizTodoItem();
query.setTaskId(taskId);
query.setInstanceId(instanceId);
// 考虑到候选用户组，会有多个 todoitem 办理同个 task
List<BizTodoItem> updateList = CollectionUtils.isEmpty(bizTodoItemService.selectBizTodoItemListbyinstanceId(query)) ? null : bizTodoItemService.selectBizTodoItemListbyinstanceId(query);
for (BizTodoItem update: updateList) {
// 找到当前登录用户的 todoitem，置为已办
if (update.getTodoUserId().equals(SecurityUtils.getUsername())) {
update.setIsView("1");
update.setIsHandle("1");
update.setHandleUserId(SecurityUtils.getUsername());
update.setHandleUserName(SecurityUtils.getLoginUser().getUser().getNickName());
update.setHandleTime(DateUtils.getNowDate());
bizTodoItemService.updateBizTodoItem(update);
} else {
if(update.getIsHandle().equals("1")){
}else{
bizTodoItemService.deleteBizTodoItemById(update.getId()); // 删除候选用户组其他 todoitem
}
}
}
// 下一节点处理人待办事项
bizTodoItemService.insertTodoItem(instanceId, itemName, itemContent, "system/sjdjlc",null);
} catch (Exception e) {
logger.error("error on complete task {}, variables={}", new Object[]{taskId, variables, e});
}
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjBcxxServiceImpl.java 0 → 100644
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.SjBcxxMapper;
import com.zjsgfa.project.zjsgfa.domain.SjBcxx;
import com.zjsgfa.project.zjsgfa.service.ISjBcxxService;
/**
* 方案补充信息Service业务层处理
*
* @author ruoyi
* @date 2026-03-05
*/
@Service
public class SjBcxxServiceImpl implements ISjBcxxService
{
@Autowired
private SjBcxxMapper sjBcxxMapper;
/**
* 查询方案补充信息
*
* @param id 方案补充信息主键
* @return 方案补充信息
*/
@Override
public SjBcxx selectSjBcxxById(Long id)
{
return sjBcxxMapper.selectSjBcxxById(id);
}
/**
* 查询方案补充信息列表
*
* @param sjBcxx 方案补充信息
* @return 方案补充信息
*/
@Override
public List<SjBcxx> selectSjBcxxList(SjBcxx sjBcxx)
{
return sjBcxxMapper.selectSjBcxxList(sjBcxx);
}
/**
* 新增方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
@Override
public int insertSjBcxx(SjBcxx sjBcxx)
{
return sjBcxxMapper.insertSjBcxx(sjBcxx);
}
/**
* 修改方案补充信息
*
* @param sjBcxx 方案补充信息
* @return 结果
*/
@Override
public int updateSjBcxx(SjBcxx sjBcxx)
{
return sjBcxxMapper.updateSjBcxx(sjBcxx);
}
/**
* 批量删除方案补充信息
*
* @param ids 需要删除的方案补充信息主键
* @return 结果
*/
@Override
public int deleteSjBcxxByIds(Long[] ids)
{
return sjBcxxMapper.deleteSjBcxxByIds(ids);
}
/**
* 删除方案补充信息信息
*
* @param id 方案补充信息主键
* @return 结果
*/
@Override
public int deleteSjBcxxById(Long id)
{
return sjBcxxMapper.deleteSjBcxxById(id);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
......@@ -1323,28 +1323,28 @@ public class SjDjjcServiceImpl implements ISjDjjcService
List<SjLjjw> sjLjjwList=new ArrayList<>();
//大范围选井
List<String> listdfw = new ArrayList<>();
for (Map.Entry<String, List<DjZqsjfx>> entry : result3.entrySet()) {
List<DjZqsjfx> value = entry.getValue();
listdfw.addAll(value.stream().map(DjZqsjfx::getJh).collect(Collectors.toList()));
}
if(listdfw.size()>0){
//保存邻井
String[] collect2Array = listdfw.stream().distinct().toArray(String[]::new);
param.setJhs(collect2Array);
param.setJdhzb(sjDjjc1.getJkhzb());
param.setJdzzb(sjDjjc1.getJkzzb());
List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
ljjwList2.forEach(item->{
SjLjjw sjLjjw=new SjLjjw();
BeanUtils.copyProperties(item,sjLjjw);
sjLjjw.setJh(jh);
sjLjjw.setLjjh(item.getJh());
sjLjjw.setLb1("大范围邻井");
sjLjjw.setLb2("推荐");
sjLjjwList.add(sjLjjw);
});
}
// List<String> listdfw = new ArrayList<>();
// for (Map.Entry<String, List<DjZqsjfx>> entry : result3.entrySet()) {
// List<DjZqsjfx> value = entry.getValue();
// listdfw.addAll(value.stream().map(DjZqsjfx::getJh).collect(Collectors.toList()));
// }
// if(listdfw.size()>0){
// //保存邻井
// String[] collect2Array = listdfw.stream().distinct().toArray(String[]::new);
// param.setJhs(collect2Array);
// param.setJdhzb(sjDjjc1.getJkhzb());
// param.setJdzzb(sjDjjc1.getJkzzb());
// List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
// ljjwList2.forEach(item->{
// SjLjjw sjLjjw=new SjLjjw();
// BeanUtils.copyProperties(item,sjLjjw);
// sjLjjw.setJh(jh);
// sjLjjw.setLjjh(item.getJh());
// sjLjjw.setLb1("大范围邻井");
// sjLjjw.setLb2("推荐");
// sjLjjwList.add(sjLjjw);
// });
// }
//附近高指标井
......@@ -1376,93 +1376,93 @@ public class SjDjjcServiceImpl implements ISjDjjcService
commonParam.setJh(String.join(",",list2));
saveLjzl(commonParam);
}
//大范围高指标
List<String> list3 = new ArrayList<>();
for (Map.Entry<String, List<DjZqsjfx>> entry : result2.entrySet()) {
List<DjZqsjfx> value = entry.getValue();
list3.addAll(value.stream().map(DjZqsjfx::getJh).collect(Collectors.toList()));
}
if(list3.size()>0){
//保存邻井
String[] collect2Array = list3.stream().distinct().toArray(String[]::new);
param.setJhs(collect2Array);
param.setJdhzb(sjDjjc1.getJkhzb());
param.setJdzzb(sjDjjc1.getJkzzb());
List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
ljjwList2.forEach(item->{
SjLjjw sjLjjw=new SjLjjw();
BeanUtils.copyProperties(item,sjLjjw);
sjLjjw.setJh(jh);
sjLjjw.setLjjh(item.getJh());
sjLjjw.setLb1("高指标井");
sjLjjw.setLb2("推荐");
sjLjjwList.add(sjLjjw);
});
}
//附近复杂事故井
Jsqa jsqa=new Jsqa();
jsqa.setJhs(collect);
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
if(jsqaList.size()>0){
String[] collect2Array = jsqaList.stream().map(Jsqa::getJh).limit(5).toArray(String[]::new);
param.setJhs(collect2Array);
List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
ljjwList2.forEach(item->{
SjLjjw sjLjjw=new SjLjjw();
BeanUtils.copyProperties(item,sjLjjw);
sjLjjw.setJh(jh);
sjLjjw.setLjjh(item.getJh());
sjLjjw.setLb1("附近复杂故障井");
sjLjjw.setLb2("推荐");
sjLjjwList.add(sjLjjw);
});
}
//大范围复杂事故
if(jsqaList.size()>0){
String[] collect2Array = jsqaList.stream().map(Jsqa::getJh).limit(10).toArray(String[]::new);
param.setJhs(collect2Array);
List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
ljjwList2.forEach(item->{
SjLjjw sjLjjw=new SjLjjw();
BeanUtils.copyProperties(item,sjLjjw);
sjLjjw.setJh(jh);
sjLjjw.setLjjh(item.getJh());
sjLjjw.setLb1("低效问题井");
sjLjjw.setLb2("推荐");
sjLjjwList.add(sjLjjw);
});
}
//附近方位井
String[] strings = ljjwList.stream().map(Ljjw::getJh).toArray(String[]::new);
CommonParam commonParam = new CommonParam();
commonParam.setJhs(strings);
commonParam.setFw(sjJygjGdsjgdcsList.get(0).getFw());
List<DjZqsjfx> djZqsjfxList = djdcInfoMapper.getjskd(commonParam);
List<DjZqsjfx> collect1 = djZqsjfxList.stream().filter(it -> it.getFw() != null).limit(10).collect(Collectors.toList());
if(collect1.size()>0){
String[] collect2Array = collect1.stream().map(DjZqsjfx::getJh).toArray(String[]::new);
param.setJhs(collect2Array);
param.setJdhzb(sjDjjc1.getJkhzb());
param.setJdzzb(sjDjjc1.getJkzzb());
List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
ljjwList2.forEach(item->{
SjLjjw sjLjjw=new SjLjjw();
BeanUtils.copyProperties(item,sjLjjw);
sjLjjw.setJh(jh);
sjLjjw.setLjjh(item.getJh());
sjLjjw.setLb1("附近方位井");
sjLjjw.setLb2("推荐");
sjLjjwList.add(sjLjjw);
});
}
//
// //大范围高指标
// List<String> list3 = new ArrayList<>();
// for (Map.Entry<String, List<DjZqsjfx>> entry : result2.entrySet()) {
// List<DjZqsjfx> value = entry.getValue();
// list3.addAll(value.stream().map(DjZqsjfx::getJh).collect(Collectors.toList()));
// }
// if(list3.size()>0){
// //保存邻井
// String[] collect2Array = list3.stream().distinct().toArray(String[]::new);
// param.setJhs(collect2Array);
// param.setJdhzb(sjDjjc1.getJkhzb());
// param.setJdzzb(sjDjjc1.getJkzzb());
// List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
// ljjwList2.forEach(item->{
// SjLjjw sjLjjw=new SjLjjw();
// BeanUtils.copyProperties(item,sjLjjw);
// sjLjjw.setJh(jh);
// sjLjjw.setLjjh(item.getJh());
// sjLjjw.setLb1("高指标井");
// sjLjjw.setLb2("推荐");
// sjLjjwList.add(sjLjjw);
// });
// }
//
//
//
//
// //附近复杂事故井
// Jsqa jsqa=new Jsqa();
// jsqa.setJhs(collect);
// List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
// if(jsqaList.size()>0){
// String[] collect2Array = jsqaList.stream().map(Jsqa::getJh).limit(5).toArray(String[]::new);
// param.setJhs(collect2Array);
// List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
// ljjwList2.forEach(item->{
// SjLjjw sjLjjw=new SjLjjw();
// BeanUtils.copyProperties(item,sjLjjw);
// sjLjjw.setJh(jh);
// sjLjjw.setLjjh(item.getJh());
// sjLjjw.setLb1("附近复杂故障井");
// sjLjjw.setLb2("推荐");
// sjLjjwList.add(sjLjjw);
// });
// }
//
// //大范围复杂事故
// if(jsqaList.size()>0){
// String[] collect2Array = jsqaList.stream().map(Jsqa::getJh).limit(10).toArray(String[]::new);
// param.setJhs(collect2Array);
// List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
// ljjwList2.forEach(item->{
// SjLjjw sjLjjw=new SjLjjw();
// BeanUtils.copyProperties(item,sjLjjw);
// sjLjjw.setJh(jh);
// sjLjjw.setLjjh(item.getJh());
// sjLjjw.setLb1("低效问题井");
// sjLjjw.setLb2("推荐");
// sjLjjwList.add(sjLjjw);
// });
// }
//
//
// //附近方位井
// String[] strings = ljjwList.stream().map(Ljjw::getJh).toArray(String[]::new);
// CommonParam commonParam = new CommonParam();
// commonParam.setJhs(strings);
// commonParam.setFw(sjJygjGdsjgdcsList.get(0).getFw());
// List<DjZqsjfx> djZqsjfxList = djdcInfoMapper.getjskd(commonParam);
// List<DjZqsjfx> collect1 = djZqsjfxList.stream().filter(it -> it.getFw() != null).limit(10).collect(Collectors.toList());
// if(collect1.size()>0){
// String[] collect2Array = collect1.stream().map(DjZqsjfx::getJh).toArray(String[]::new);
// param.setJhs(collect2Array);
// param.setJdhzb(sjDjjc1.getJkhzb());
// param.setJdzzb(sjDjjc1.getJkzzb());
// List<Ljjw> ljjwList2=djdcService.getLjjwList3(param);
// ljjwList2.forEach(item->{
// SjLjjw sjLjjw=new SjLjjw();
// BeanUtils.copyProperties(item,sjLjjw);
// sjLjjw.setJh(jh);
// sjLjjw.setLjjh(item.getJh());
// sjLjjw.setLb1("附近方位井");
// sjLjjw.setLb2("推荐");
// sjLjjwList.add(sjLjjw);
// });
// }
//保存
if(sjLjjwList.size()>0){
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFzqkmsServiceImpl.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import cn.hutool.core.codec.Base64;
import com.zjsgfa.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.SjFzqkmsMapper;
import com.zjsgfa.project.zjsgfa.domain.SjFzqkms;
import com.zjsgfa.project.zjsgfa.service.ISjFzqkmsService;
/**
* 方案邻井复杂描述Service业务层处理
*
* @author ruoyi
* @date 2026-02-28
*/
@Service
public class SjFzqkmsServiceImpl implements ISjFzqkmsService
{
@Autowired
private SjFzqkmsMapper sjFzqkmsMapper;
/**
* 查询方案邻井复杂描述
*
* @param id 方案邻井复杂描述主键
* @return 方案邻井复杂描述
*/
@Override
public SjFzqkms selectSjFzqkmsById(Long id)
{
return sjFzqkmsMapper.selectSjFzqkmsById(id);
}
/**
* 查询方案邻井复杂描述列表
*
* @param sjFzqkms 方案邻井复杂描述
* @return 方案邻井复杂描述
*/
@Override
public List<SjFzqkms> selectSjFzqkmsList(SjFzqkms sjFzqkms)
{
return sjFzqkmsMapper.selectSjFzqkmsList(sjFzqkms);
}
/**
* 新增方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
@Override
public int insertSjFzqkms(SjFzqkms sjFzqkms)
{
if(StringUtils.isNotEmpty(sjFzqkms.getGcfzqk())){
String s = new String(Base64.decode(sjFzqkms.getGcfzqk()), StandardCharsets.UTF_8);
sjFzqkms.setGcfzqk(s);
}
if(StringUtils.isNotEmpty(sjFzqkms.getZjyfzqk())){
String s = new String(Base64.decode(sjFzqkms.getZjyfzqk()), StandardCharsets.UTF_8);
sjFzqkms.setZjyfzqk(s);
}
return sjFzqkmsMapper.insertSjFzqkms(sjFzqkms);
}
/**
* 修改方案邻井复杂描述
*
* @param sjFzqkms 方案邻井复杂描述
* @return 结果
*/
@Override
public int updateSjFzqkms(SjFzqkms sjFzqkms)
{
if(StringUtils.isNotEmpty(sjFzqkms.getGcfzqk())){
String s = new String(Base64.decode(sjFzqkms.getGcfzqk()), StandardCharsets.UTF_8);
sjFzqkms.setGcfzqk(s);
}
if(StringUtils.isNotEmpty(sjFzqkms.getZjyfzqk())){
String s = new String(Base64.decode(sjFzqkms.getZjyfzqk()), StandardCharsets.UTF_8);
sjFzqkms.setZjyfzqk(s);
}
return sjFzqkmsMapper.updateSjFzqkms(sjFzqkms);
}
/**
* 批量删除方案邻井复杂描述
*
* @param ids 需要删除的方案邻井复杂描述主键
* @return 结果
*/
@Override
public int deleteSjFzqkmsByIds(Long[] ids)
{
return sjFzqkmsMapper.deleteSjFzqkmsByIds(ids);
}
/**
* 删除方案邻井复杂描述信息
*
* @param id 方案邻井复杂描述主键
* @return 结果
*/
@Override
public int deleteSjFzqkmsById(Long id)
{
return sjFzqkmsMapper.deleteSjFzqkmsById(id);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjLjjwServiceImpl.java
......@@ -164,14 +164,14 @@ public class SjLjjwServiceImpl implements ISjLjjwService
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());
// 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();
......@@ -217,8 +217,10 @@ public class SjLjjwServiceImpl implements ISjLjjwService
if(difference.size()>0){
int i = sjLjjwMapper.insertSjLjjwBatch(difference);
if(list.size()>0){
//删除
sjLjjwMapper.deleteSjLjjwByJh(jh);
int i = sjLjjwMapper.insertSjLjjwBatch(list);
return i;
}else {
return 1;
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjSggyZjyCljlServiceImpl.java
......@@ -92,4 +92,9 @@ public class SjSggyZjyCljlServiceImpl implements ISjSggyZjyCljlService
{
return sjSggyZjyCljlMapper.deleteSjSggyZjyCljlById(id);
}
@Override
public int insertSjSggyZjyCljlBatch(List<SjSggyZjyCljl> sjSggyZjyCljlList) {
return sjSggyZjyCljlMapper.insertSjSggyZjyCljlBatch(sjSggyZjyCljlList);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjSggyZjyFdsjServiceImpl.java
......@@ -92,4 +92,9 @@ public class SjSggyZjyFdsjServiceImpl implements ISjSggyZjyFdsjService
{
return sjSggyZjyFdsjMapper.deleteSjSggyZjyFdsjById(id);
}
@Override
public int insertSjSggyZjyFdsjBatch(List<SjSggyZjyFdsj> sjSggyZjyFdsjList) {
return sjSggyZjyFdsjMapper.insertSjSggyZjyFdsjBatch(sjSggyZjyFdsjList);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjSggyZjzhcsServiceImpl.java
......@@ -90,4 +90,9 @@ public class SjSggyZjzhcsServiceImpl implements ISjSggyZjzhcsService
{
return sjSggyZjzhcsMapper.deleteSjSggyZjzhcsById(id);
}
@Override
public int importData(List<SjSggyZjzhcs> sjFdfxList) {
return sjSggyZjzhcsMapper.importData(sjFdfxList);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZsjqkServiceImpl.java
......@@ -90,4 +90,9 @@ public class SjZsjqkServiceImpl implements ISjZsjqkService
{
return sjZsjqkMapper.deleteSjZsjqkById(id);
}
@Override
public int insertSjZsjqkBatch(List<SjZsjqk> sjZsjqkList) {
return sjZsjqkMapper.insertSjZsjqkBatch(sjZsjqkList);
}
}
src/main/resources/mybatis/system/SysUserMapper.xml
......@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectUserByLoginName" resultType="com.zjsgfa.project.system.domain.SysUser">
<include refid="selectUserVo"/>
select * from sys_user u
where u.user_name = #{userName}
</select>
<select id="selectUserLoginNamesByRoleKeyDept" resultType="com.zjsgfa.project.system.domain.SysUser">
......
src/main/resources/mybatis/zjsgfa/BizTodoItemMapper.xml
......@@ -98,6 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
ORDER BY handle_time IS NULL DESC, handle_time DESC
</select>
<select id="selectBizTodoItemListbyinstanceId" resultType="com.zjsgfa.project.zjsgfa.domain.BizTodoItem">
select id, item_name, item_content, module, instance_id, task_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
where instance_id=#{instanceId} and task_name =(select task_name from biz_todo_item where task_id =#{taskId})
</select>
<insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
insert into biz_todo_item
......
src/main/resources/mybatis/zjsgfa/SjBcxxMapper.xml 0 → 100644
<?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.SjBcxxMapper">
<resultMap type="SjBcxx" id="SjBcxxResult">
<result property="id" column="id" />
<result property="zbid" column="zbid" />
<result property="bt" column="bt" />
<result property="nr" column="nr" />
<result property="ext1" column="ext1" />
<result property="ext2" column="ext2" />
<result property="ext3" column="ext3" />
</resultMap>
<sql id="selectSjBcxxVo">
select id, zbid, bt, nr, ext1, ext2, ext3 from sj_bcxx
</sql>
<select id="selectSjBcxxList" parameterType="SjBcxx" resultMap="SjBcxxResult">
<include refid="selectSjBcxxVo"/>
<where>
<if test="zbid != null "> and zbid = #{zbid}</if>
<if test="bt != null and bt != ''"> and bt = #{bt}</if>
<if test="nr != null and nr != ''"> and nr = #{nr}</if>
<if test="ext1 != null and ext1 != ''"> and ext1 = #{ext1}</if>
<if test="ext2 != null and ext2 != ''"> and ext2 = #{ext2}</if>
<if test="ext3 != null and ext3 != ''"> and ext3 = #{ext3}</if>
</where>
</select>
<select id="selectSjBcxxById" parameterType="Long" resultMap="SjBcxxResult">
<include refid="selectSjBcxxVo"/>
where id = #{id}
</select>
<insert id="insertSjBcxx" parameterType="SjBcxx" useGeneratedKeys="true" keyProperty="id">
insert into sj_bcxx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="zbid != null">zbid,</if>
<if test="bt != null">bt,</if>
<if test="nr != null">nr,</if>
<if test="ext1 != null">ext1,</if>
<if test="ext2 != null">ext2,</if>
<if test="ext3 != null">ext3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
<if test="bt != null">#{bt},</if>
<if test="nr != null">#{nr},</if>
<if test="ext1 != null">#{ext1},</if>
<if test="ext2 != null">#{ext2},</if>
<if test="ext3 != null">#{ext3},</if>
</trim>
</insert>
<insert id="insertSjBcxxBatch">
<foreach collection="list" item="item" separator=";">
insert into sj_bcxx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.zbid != null">zbid,</if>
<if test="item.bt != null">bt,</if>
<if test="item.nr != null">nr,</if>
<if test="item.ext1 != null">ext1,</if>
<if test="item.ext2 != null">ext2,</if>
<if test="item.ext3 != null">ext3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="item.zbid != null">#{item.zbid},</if>
<if test="item.bt != null">#{item.bt},</if>
<if test="item.nr != null">#{item.nr},</if>
<if test="item.ext1 != null">#{item.ext1},</if>
<if test="item.ext2 != null">#{item.ext2},</if>
<if test="item.ext3 != null">#{item.ext3},</if>
</trim>
</foreach>
</insert>
<update id="updateSjBcxx" parameterType="SjBcxx">
update sj_bcxx
<trim prefix="SET" suffixOverrides=",">
<if test="zbid != null">zbid = #{zbid},</if>
<if test="bt != null">bt = #{bt},</if>
<if test="nr != null">nr = #{nr},</if>
<if test="ext1 != null">ext1 = #{ext1},</if>
<if test="ext2 != null">ext2 = #{ext2},</if>
<if test="ext3 != null">ext3 = #{ext3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSjBcxxById" parameterType="Long">
delete from sj_bcxx where id = #{id}
</delete>
<delete id="deleteSjBcxxByIds" parameterType="String">
delete from sj_bcxx where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteSjBcxxByZbid">
delete from sj_bcxx where zbid = #{zbid}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjFzqkmsMapper.xml 0 → 100644
<?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.SjFzqkmsMapper">
<resultMap type="SjFzqkms" id="SjFzqkmsResult">
<result property="id" column="id" />
<result property="zbid" column="zbid" />
<result property="gcfzqk" column="gcfzqk" />
<result property="zjyfzqk" column="zjyfzqk" />
</resultMap>
<sql id="selectSjFzqkmsVo">
select id, zbid, gcfzqk, zjyfzqk from sj_fzqkms
</sql>
<select id="selectSjFzqkmsList" parameterType="SjFzqkms" resultMap="SjFzqkmsResult">
<include refid="selectSjFzqkmsVo"/>
<where>
<if test="zbid != null "> and zbid = #{zbid}</if>
<if test="gcfzqk != null and gcfzqk != ''"> and gcfzqk = #{gcfzqk}</if>
<if test="zjyfzqk != null and zjyfzqk != ''"> and zjyfzqk = #{zjyfzqk}</if>
</where>
</select>
<select id="selectSjFzqkmsById" parameterType="Long" resultMap="SjFzqkmsResult">
<include refid="selectSjFzqkmsVo"/>
where zbid = #{id}
</select>
<insert id="insertSjFzqkms" parameterType="SjFzqkms" useGeneratedKeys="true" keyProperty="id">
insert into sj_fzqkms
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="zbid != null">zbid,</if>
<if test="gcfzqk != null">gcfzqk,</if>
<if test="zjyfzqk != null">zjyfzqk,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
<if test="gcfzqk != null">#{gcfzqk},</if>
<if test="zjyfzqk != null">#{zjyfzqk},</if>
</trim>
</insert>
<update id="updateSjFzqkms" parameterType="SjFzqkms">
update sj_fzqkms
<trim prefix="SET" suffixOverrides=",">
<if test="zbid != null">zbid = #{zbid},</if>
<if test="gcfzqk != null">gcfzqk = #{gcfzqk},</if>
<if test="zjyfzqk != null">zjyfzqk = #{zjyfzqk},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSjFzqkmsById" parameterType="Long">
delete from sj_fzqkms where id = #{id}
</delete>
<delete id="deleteSjFzqkmsByIds" parameterType="String">
delete from sj_fzqkms 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/SjLjzjysyqkMapper.xml
......@@ -74,6 +74,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bdlj != null">#{bdlj},</if>
</trim>
</insert>
<insert id="insertSjLjzjysyqkBatch">
<foreach collection="list" item="item" separator=";">
insert into sj_ljzjysyqk
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.jh != null">jh,</if>
<if test="item.ljjh != null">ljjh,</if>
<if test="item.wjrq != null">wjrq,</if>
<if test="item.cw != null">cw,</if>
<if test="item.jd != null">jd,</if>
<if test="item.zjyxdmd != null">zjyxdmd,</if>
<if test="item.fzqk != null">fzqk,</if>
<if test="item.jkfw != null">jkfw,</if>
<if test="item.jklj != null">jklj,</if>
<if test="item.bdfw != null">bdfw,</if>
<if test="item.bdlj != null">bdlj,</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.wjrq != null">#{item.wjrq},</if>
<if test="item.cw != null">#{item.cw},</if>
<if test="item.jd != null">#{item.jd},</if>
<if test="item.zjyxdmd != null">#{item.zjyxdmd},</if>
<if test="item.fzqk != null">#{item.fzqk},</if>
<if test="item.jkfw != null">#{item.jkfw},</if>
<if test="item.jklj != null">#{item.jklj},</if>
<if test="item.bdfw != null">#{item.bdfw},</if>
<if test="item.bdlj != null">#{item.bdlj},</if>
</trim>
</foreach>
</insert>
<update id="updateSjLjzjysyqk" parameterType="SjLjzjysyqk">
update sj_ljzjysyqk
......@@ -103,4 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjLjzjysyqkByJh">
delete from sj_ljzjysyqk where jh = #{jh}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjSggyZjzhcsMapper.xml
......@@ -94,6 +94,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="kc != null">#{kc},</if>
</trim>
</insert>
<insert id="importData">
<foreach collection="list" item="item" separator=";">
insert into sj_sggy_zjzhcs
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.jh != null">jh,</if>
<if test="item.jd != null">jd,</if>
<if test="item.ztxh != null">ztxh,</if>
<if test="item.cj != null">cj,</if>
<if test="item.cc != null">cc,</if>
<if test="item.sy != null">sy,</if>
<if test="item.yj != null">yj,</if>
<if test="item.zjymd != null">zjymd,</if>
<if test="item.zjzy != null">zjzy,</if>
<if test="item.zjzs != null">zjzs,</if>
<if test="item.zjpl != null">zjpl,</if>
<if test="item.zjby != null">zjby,</if>
<if test="item.gtzj != null">gtzj,</if>
<if test="item.zjjg != null">zjjg,</if>
<if test="item.kc != null">kc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="item.jh != null">#{item.jh},</if>
<if test="item.jd != null">#{item.jd},</if>
<if test="item.ztxh != null">#{item.ztxh},</if>
<if test="item.cj != null">#{item.cj},</if>
<if test="item.cc != null">#{item.cc},</if>
<if test="item.sy != null">#{item.sy},</if>
<if test="item.yj != null">#{item.yj},</if>
<if test="item.zjymd != null">#{item.zjymd},</if>
<if test="item.zjzy != null">#{item.zjzy},</if>
<if test="item.zjzs != null">#{item.zjzs},</if>
<if test="item.zjpl != null">#{item.zjpl},</if>
<if test="item.zjby != null">#{item.zjby},</if>
<if test="item.gtzj != null">#{item.gtzj},</if>
<if test="item.zjjg != null">#{item.zjjg},</if>
<if test="item.kc != null">#{item.kc},</if>
</trim>
</foreach>
</insert>
<update id="updateSjSggyZjzhcs" parameterType="SjSggyZjzhcs">
update sj_sggy_zjzhcs
......
src/main/resources/mybatis/zjsgfa/SjZsjqkMapper.xml
......@@ -110,6 +110,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cz != null">#{cz},</if>
</trim>
</insert>
<insert id="insertSjZsjqkBatch">
<foreach collection="list" item="item" separator=";">
insert into sj_zsjqk
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.sjjh != null">sjjh,</if>
<if test="item.jh != null">jh,</if>
<if test="item.jhbm != null">jhbm,</if>
<if test="item.zqlxmc != null">zqlxmc,</if>
<if test="item.cwmc != null">cwmc,</if>
<if test="item.sdfw != null">sdfw,</if>
<if test="item.jkyl != null">jkyl,</if>
<if test="item.dcyl != null">dcyl,</if>
<if test="item.rzl != null">rzl,</if>
<if test="item.ljzrl != null">ljzrl,</if>
<if test="item.zrzt != null">zrzt,</if>
<if test="item.jkjl != null">jkjl,</if>
<if test="item.jdjl != null">jdjl,</if>
<if test="item.sftz != null">sftz,</if>
<if test="item.zsjd != null">zsjd,</if>
<if test="item.jkzy != null">jkzy,</if>
<if test="item.jkfw != null">jkfw,</if>
<if test="item.bdfw != null">bdfw,</if>
<if test="item.bdjl != null">bdjl,</if>
<if test="item.cz != null">cz,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="item.sjjh != null">#{item.sjjh},</if>
<if test="item.jh != null">#{item.jh},</if>
<if test="item.jhbm != null">#{item.jhbm},</if>
<if test="item.zqlxmc != null">#{item.zqlxmc},</if>
<if test="item.cwmc != null">#{item.cwmc},</if>
<if test="item.sdfw != null">#{item.sdfw},</if>
<if test="item.jkyl != null">#{item.jkyl},</if>
<if test="item.dcyl != null">#{item.dcyl},</if>
<if test="item.rzl != null">#{item.rzl},</if>
<if test="item.ljzrl != null">#{item.ljzrl},</if>
<if test="item.zrzt != null">#{item.zrzt},</if>
<if test="item.jkjl != null">#{item.jkjl},</if>
<if test="item.jdjl != null">#{item.jdjl},</if>
<if test="item.sftz != null">#{item.sftz},</if>
<if test="item.zsjd != null">#{item.zsjd},</if>
<if test="item.jkzy != null">#{item.jkzy},</if>
<if test="item.jkfw != null">#{item.jkfw},</if>
<if test="item.bdfw != null">#{item.bdfw},</if>
<if test="item.bdjl != null">#{item.bdjl},</if>
<if test="item.cz != null">#{item.cz},</if>
</trim>
</foreach>
</insert>
<update id="updateSjZsjqk" parameterType="SjZsjqk">
update sj_zsjqk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment