Skip to content

Q
qianhe-ydsj
Commit 724f862c by jiang'yun
Options

修改问题

parent 3447092e
Showing with 2185 additions and 2897 deletions
pom.xml
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<module>qianhe-quartz</module> <module>qianhe-quartz</module>
<module>qianhe-generator</module> <module>qianhe-generator</module>
<module>qianhe-common</module> <module>qianhe-common</module>
<module>qianhe-gzpt</module> <module>qianhe-ydsj</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>
......
qianhe-admin/pom.xml
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<!-- 工作平台--> <!-- 工作平台-->
<dependency> <dependency>
<groupId>com.qianhe</groupId> <groupId>com.qianhe</groupId>
<artifactId>qianhe-gzpt</artifactId> <artifactId>qianhe-ydsj</artifactId>
<version>3.8.5</version> <version>3.8.5</version>
</dependency> </dependency>
......
qianhe-common/src/main/java/com/qianhe/common/core/domain/entity/SysDept.java
...@@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull; ...@@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import com.qianhe.common.core.domain.BaseEntity; import com.qianhe.common.core.domain.BaseEntity;
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.qianhe.common.core.domain.BaseEntity; import com.qianhe.common.core.domain.BaseEntity;
...@@ -17,6 +18,7 @@ import com.qianhe.common.core.domain.BaseEntity; ...@@ -17,6 +18,7 @@ import com.qianhe.common.core.domain.BaseEntity;
* *
* @author qinahe * @author qinahe
*/ */
@Data
public class SysDept extends BaseEntity public class SysDept extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -54,6 +56,8 @@ public class SysDept extends BaseEntity ...@@ -54,6 +56,8 @@ public class SysDept extends BaseEntity
/** 父部门名称 */ /** 父部门名称 */
private String parentName; private String parentName;
private String dwjb;
/** 子部门 */ /** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>(); private List<SysDept> children = new ArrayList<SysDept>();
......
qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmController.java deleted 100644 → 0
package com.qianhe.controller;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.service.IWorkXmcbService;
import com.qianhe.vo.WorkXmTjVo;
import com.qianhe.vo.WorkXmVo;
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.qianhe.common.annotation.Log;
import com.qianhe.common.core.controller.BaseController;
import com.qianhe.common.core.domain.AjaxResult;
import com.qianhe.common.enums.BusinessType;
import com.qianhe.domain.WorkXm;
import com.qianhe.service.IWorkXmService;
import com.qianhe.common.utils.poi.ExcelUtil;
import com.qianhe.common.core.page.TableDataInfo;
/**
* 项目Controller
*
* @author qianhe
* @date 2024-01-17
*/
@RestController
@RequestMapping("/work/xm")
public class WorkXmController extends BaseController
{
@Autowired
private IWorkXmService workXmService;
@Autowired
private IWorkXmcbService workXmcbService;
/**
* 查询项目列表
*/
@GetMapping("/list")
public TableDataInfo list(WorkXm workXm)
{
startPage();
List<WorkXm> list = workXmService.selectWorkXmList(workXm);
return getDataTable(list);
}
/**
* 导出项目列表
*/
@Log(title = "项目", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WorkXm workXm)
{
List<WorkXm> list = workXmService.selectWorkXmList(workXm);
ExcelUtil<WorkXm> util = new ExcelUtil<WorkXm>(WorkXm.class);
util.exportExcel(response, list, "项目数据");
}
/**
* 获取项目详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(workXmService.selectWorkXmById(id));
}
/**
* 新增项目
*/
@Log(title = "项目", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WorkXm workXm)
{
return toAjax(workXmService.insertWorkXm(workXm));
}
/**
* 修改项目
*/
@Log(title = "项目", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WorkXm workXm)
{
return toAjax(workXmService.updateWorkXm(workXm));
}
/**
* 删除项目
*/
@Log(title = "项目", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(workXmService.deleteWorkXmByIds(ids));
}
/**
* 提交
*/
@PutMapping("/submit/{id}")
public AjaxResult submit(@PathVariable Long id){
WorkXm workXm = new WorkXm();
workXm.setId(id);
return toAjax(workXmService.submit(workXm));
}
/**
* 项目进度查询列表
*/
@GetMapping("/getXmJdList")
public TableDataInfo getXmJdList(WorkXm workXm){
//查询已提交的项目
workXm.setTjzt("1");
startPage();
List<WorkXm> list = workXmService.selectWorkXmList(workXm);
return getDataTable(list);
}
/**
* 查询进度（分为三块，一块为项目信息，一块为审批历史，一块为进度查看）
*/
@GetMapping("/xmjd/{id}")
public AjaxResult getXmInfo(@PathVariable("id") Long id){
AjaxResult ajaxResult = AjaxResult.success();
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//查询项目详情
WorkXmVo workXmVo = workXmService.getXmInfo(id);
//查询审批历史
List<WorkXmcb> workXmcbs = workXmcbService.getspls(id);
ajaxResult.put("spls",workXmcbs);
//根究审核人类型去重
ArrayList<WorkXmcb> collect = workXmcbs.stream().collect(Collectors
.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator
.comparing(WorkXmcb::getShrlx))), ArrayList::new));
List<Map<String,Object>> list = new ArrayList<>();
for (WorkXmcb workXmcb : collect) {
Map<String,Object> map = new HashMap<>();
switch (workXmcb.getShrlx()){
case "0":
map.put("jd","压裂通知");
break;
case "1":
map.put("jd","采集设计");
break;
case "2":
if (workXmcb.getShzt().equals("同意")){
map.put("jd","设计审核");
break;
}
break;
case "3":
if (workXmcb.getShzt().equals("符合条件")){
map.put("jd","现场勘查");
break;
}
break;
default:
map.put("jd","");
break;
}
map.put("shsj",dateFormat.format(workXmcb.getShsj()));
list.add(map);
}
ajaxResult.put("workXm",workXmVo);
// ajaxResult.put("spls",workXmcbs);
ajaxResult.put("jdck",list);
return ajaxResult;
}
/**
* 工作量统计
*/
@GetMapping("/getGzlTjList")
public TableDataInfo getGzlTjList(WorkXmVo workXmVo){
//查询所有已提交的项目
workXmVo.setTjzt("1");
startPage();
List<WorkXm> workXms = workXmService.selectWorkXmGzlList(workXmVo);
//查询所有审批历史
List<WorkXmcb> workXmcbs = workXmcbService.selectWorkXmcbList(new WorkXmcb());
List<WorkXmTjVo> list = new ArrayList<>();
for (WorkXm xm : workXms) {
WorkXmTjVo workXmTjVo1 = new WorkXmTjVo();
workXmTjVo1.setJh(xm.getJh());
for (WorkXmcb workXmcb : workXmcbs) {
if (xm.getId().equals(workXmcb.getYltzId())){
switch (workXmcb.getShrlx()){
case "0":
workXmTjVo1.setYltz(workXmcb.getShr());
break;
case "1":
workXmTjVo1.setCjsj(workXmcb.getShr());
break;
case "2":
workXmTjVo1.setSjsh(workXmcb.getShr());
break;
case "3":
workXmTjVo1.setXckc(workXmcb.getShr());
break;
default:break;
}
}
}
list.add(workXmTjVo1);
}
return getDataTable(list);
// startPage();
// List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo);
// return getDataTable(list);
}
/**
* 导出工作量统计
*/
@Log(title = "工作量", businessType = BusinessType.EXPORT)
@PostMapping("/exportGzl")
public void exportGzl(HttpServletResponse response, WorkXmVo workXmVo)
{
List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo);
ExcelUtil<WorkXmTjVo> util = new ExcelUtil<WorkXmTjVo>(WorkXmTjVo.class);
util.exportExcel(response, list, "工作量统计");
}
/**
* 查询采集设计列表
*/
@GetMapping("/getCjsjList")
public TableDataInfo getCjsjList(WorkXm workXm){
//查询压裂通知已提交的项目
workXm.setTjzt("1");
startPage();
List<WorkXm> workXms = workXmService.selectWorkXmList(workXm);
return getDataTable(workXms);
}
/**
* 上传采集设计附件
*/
@Log(title = "项目", businessType = BusinessType.UPDATE)
@PutMapping("/updateFile")
public AjaxResult updateFile(@RequestBody WorkXmVo workXmVo)
{
return toAjax(workXmService.updateFile(workXmVo));
}
/**
* 提交采集设计
*/
@PostMapping("/submitCjsj/{id}")
public AjaxResult submitCjsj(@PathVariable Long id){
WorkXm workXm = new WorkXm();
workXm.setId(id);
return toAjax(workXmService.submitCjsj(workXm));
}
}
qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmcbController.java deleted 100644 → 0
package com.qianhe.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.qianhe.common.utils.SecurityUtils;
import com.qianhe.service.IWorkJdService;
import com.qianhe.service.IWorkXmService;
import com.qianhe.vo.WorkXmVo;
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.qianhe.common.annotation.Log;
import com.qianhe.common.core.controller.BaseController;
import com.qianhe.common.core.domain.AjaxResult;
import com.qianhe.common.enums.BusinessType;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.service.IWorkXmcbService;
import com.qianhe.common.utils.poi.ExcelUtil;
import com.qianhe.common.core.page.TableDataInfo;
/**
* 项目从表Controller
*
* @author qianhe
* @date 2024-01-17
*/
@RestController
@RequestMapping("/work/xmcb")
public class WorkXmcbController extends BaseController
{
@Autowired
private IWorkXmcbService workXmcbService;
@Autowired
private IWorkXmService workXmService;
@Autowired
private IWorkJdService workJdService;
/**
* 首页-待办已办
*/
@GetMapping("/taskList/{state}")
public TableDataInfo taskList(@PathVariable("state") String state, WorkXmVo workXmVo){
//当前登录用户id
Long userId = SecurityUtils.getUserId();
//查询当前登录用户属于哪个节点的审批人
List<String> jds = workJdService.selectJdmcByUserId(userId);
if (jds.size() > 0){
//根据节点名称和用户id查询待办已办列表
//查询当前登陆人待办任务
if (state.equals("0")){
userId = null;
startPage();
return getDataTable(workXmcbService.taskList(userId, state, jds,workXmVo.getJh()));
}else {
jds = null;
startPage();
return getDataTable(workXmcbService.taskList(userId, state, jds,workXmVo.getJh()));
}
}
return getDataTable(new ArrayList<>());
// startPage();
// List<WorkXmVo> list = workXmcbService.taskList(state,workXmVo);
// return getDataTable(list);
}
/**
* 查询详情（分为两块，一块为项目信息，一块为审批历史）
*/
@GetMapping("/xm/{id}")
public AjaxResult getXmInfo(@PathVariable("id") Long id){
AjaxResult ajaxResult = AjaxResult.success();
//查询项目详情
WorkXmVo workXmVo = workXmService.getXmInfo(id);
//查询审批历史
List<WorkXmcb> workXmcbs = workXmcbService.getspls(id);
ajaxResult.put("workXm",workXmVo);
ajaxResult.put("spls",workXmcbs);
return ajaxResult;
}
/**
* 办理审核按钮
*/
@PostMapping("/handle")
public AjaxResult handle(@RequestBody WorkXmVo workXmVo){
return toAjax(workXmcbService.handle(workXmVo));
}
/**
* 查询项目从表列表
*/
@GetMapping("/list")
public TableDataInfo list(WorkXmcb workXmcb)
{
startPage();
List<WorkXmcb> list = workXmcbService.selectWorkXmcbList(workXmcb);
return getDataTable(list);
}
/**
* 导出项目从表列表
*/
@Log(title = "项目从表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WorkXmcb workXmcb)
{
List<WorkXmcb> list = workXmcbService.selectWorkXmcbList(workXmcb);
ExcelUtil<WorkXmcb> util = new ExcelUtil<WorkXmcb>(WorkXmcb.class);
util.exportExcel(response, list, "项目从表数据");
}
/**
* 获取项目从表详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(workXmcbService.selectWorkXmcbById(id));
}
/**
* 新增项目从表
*/
@Log(title = "项目从表", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WorkXmcb workXmcb)
{
return toAjax(workXmcbService.insertWorkXmcb(workXmcb));
}
/**
* 修改项目从表
*/
@Log(title = "项目从表", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WorkXmcb workXmcb)
{
return toAjax(workXmcbService.updateWorkXmcb(workXmcb));
}
/**
* 删除项目从表
*/
@Log(title = "项目从表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(workXmcbService.deleteWorkXmcbByIds(ids));
}
}
qianhe-gzpt/src/main/java/com/qianhe/domain/WorkAccessory.java deleted 100644 → 0
package com.qianhe.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.qianhe.common.annotation.Excel;
import com.qianhe.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 附件信息对象 work_accessory
*
* @author qianhe
* @date 2024-01-17
*/
@Data
public class WorkAccessory extends BaseEntity
{
private static final long serialVersionUID = 1L;
private int index;
/** 主键id */
private Long id;
/** 业务id */
@Excel(name = "业务id")
private Long businessId;
/** 模块名称 */
@Excel(name = "模块名称")
private String moduleName;
/** 附件类型 */
@Excel(name = "附件类型")
private String accessoryType;
/** 附件路径 */
@Excel(name = "附件路径")
private String accessoryUrl;
/** 附件名称(无时间戳) */
@Excel(name = "附件名称（无时间戳）")
private String fileName;
/** 附件名称 */
private String accessoryName;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
}
qianhe-gzpt/src/main/java/com/qianhe/domain/WorkJd.java deleted 100644 → 0
package com.qianhe.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.qianhe.common.annotation.Excel;
import java.util.Date;
/**
* 节点对象 work_jd
*
* @author qianhe
* @date 2024-01-18
*/
@Data
public class WorkJd
{
/** 主键id */
private Long id;
/** 节点名称 */
@Excel(name = "节点名称")
private String jdmc;
/** 负责人id */
@Excel(name = "负责人id")
private Long fzrId;
/** 负责人 */
@Excel(name = "负责人")
private String fzr;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
}
qianhe-gzpt/src/main/java/com/qianhe/domain/WorkXm.java deleted 100644 → 0
package com.qianhe.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.qianhe.common.annotation.Excel;
/**
* 项目对象 work_xm
*
* @author qianhe
* @date 2024-01-17
*/
@Data
public class WorkXm
{
/** 主键id */
private Long id;
/** 井号 */
@Excel(name = "井号")
private String jh;
/** 负责人id */
private Long tbrId;
/** 负责人 */
@Excel(name = "负责人")
private String tbr;
/** 填写时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "填写时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date tbsj;
/** 流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察) */
private String lczt;
/** 提交状态（0未提交，1已提交） */
@Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
private String tjzt;
/** 采集设计提交状态（0未填报，1已填报，2未提交，3已提交） */
private String cjtjzt;
/** 当前节点id */
private Long dqjdId;
/** 当前节点名称 */
private String dqjdmc;
/** 备注 */
private String bz;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
}
qianhe-gzpt/src/main/java/com/qianhe/domain/WorkXmcb.java deleted 100644 → 0
package com.qianhe.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.qianhe.common.annotation.Excel;
import com.qianhe.common.core.domain.BaseEntity;
/**
* 项目从表对象 work_xmcb
*
* @author qianhe
* @date 2024-01-17
*/
@Data
public class WorkXmcb
{
/** 主键id */
private Long id;
/** 项目主键id */
private Long yltzId;
/** 审核人id */
@Excel(name = "审核人id")
private Long shrId;
/** 审核人 */
@Excel(name = "审核人")
private String shr;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date shsj;
/** 审核人类型(0压裂通知，1采集设计，2设计审核，3现场勘察) */
@Excel(name = "审核人类型(0压裂通知，1采集设计，2设计审核，3现场勘察)")
private String shrlx;
/** 审核状态（1同意，2退回） */
@Excel(name = "审核状态", readConverterExp = "1=同意，2退回")
private String shzt;
/** 意见 */
@Excel(name = "意见")
private String yj;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 完成状态（0未完成，1已完成） */
@Excel(name = "完成状态", readConverterExp = "0=未完成，1已完成")
private String wczt;
/** 是否首次提交 */
private String sfsctj;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
}
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkAccessoryMapper.java deleted 100644 → 0
package com.qianhe.mapper;
import java.util.List;
import com.qianhe.domain.WorkAccessory;
/**
* 附件信息Mapper接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface WorkAccessoryMapper
{
/**
* 查询附件信息
*
* @param id 附件信息主键
* @return 附件信息
*/
public WorkAccessory selectWorkAccessoryById(Long id);
/**
* 查询附件信息列表
*
* @param workAccessory 附件信息
* @return 附件信息集合
*/
public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory);
/**
* 新增附件信息
*
* @param workAccessory 附件信息
* @return 结果
*/
public int insertWorkAccessory(WorkAccessory workAccessory);
/**
* 修改附件信息
*
* @param workAccessory 附件信息
* @return 结果
*/
public int updateWorkAccessory(WorkAccessory workAccessory);
/**
* 删除附件信息
*
* @param id 附件信息主键
* @return 结果
*/
public int deleteWorkAccessoryById(Long id);
/**
* 批量删除附件信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWorkAccessoryByIds(Long[] ids);
}
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkJdMapper.java deleted 100644 → 0
package com.qianhe.mapper;
import java.util.List;
import java.util.Map;
import com.qianhe.domain.WorkJd;
import org.apache.ibatis.annotations.Param;
/**
* 节点Mapper接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface WorkJdMapper
{
/**
* 查询节点
*
* @param id 节点主键
* @return 节点
*/
public WorkJd selectWorkJdById(Long id);
/**
* 查询节点列表
*
* @param workJd 节点
* @return 节点集合
*/
public List<WorkJd> selectWorkJdList(WorkJd workJd);
/**
* 新增节点
*
* @param workJd 节点
* @return 结果
*/
public int insertWorkJd(WorkJd workJd);
/**
* 修改节点
*
* @param workJd 节点
* @return 结果
*/
public int updateWorkJd(WorkJd workJd);
/**
* 删除节点
*
* @param id 节点主键
* @return 结果
*/
public int deleteWorkJdById(Long id);
/**
* 批量删除节点
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWorkJdByIds(Long[] ids);
/**
* 根据用户id查询节点名称
*/
List<String> selectJdmcByUserId(@Param("userId") Long userId);
/**
* 获取用户下拉框
* @return
*/
List<Map<String, Object>> getUserList();
}
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmMapper.java deleted 100644 → 0
package com.qianhe.mapper;
import java.util.List;
import com.qianhe.domain.WorkAccessory;
import com.qianhe.domain.WorkXm;
import com.qianhe.vo.WorkXmVo;
import org.apache.ibatis.annotations.Param;
/**
* 项目Mapper接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface WorkXmMapper
{
/**
* 查询项目
*
* @param id 项目主键
* @return 项目
*/
public WorkXm selectWorkXmById(Long id);
/**
* 查询项目列表
*
* @param workXm 项目
* @return 项目集合
*/
public List<WorkXm> selectWorkXmList(WorkXm workXm);
/**
* 查询项目工作量列表
*
* @param workXmVo 项目
* @return 项目集合
*/
public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo);
/**
* 新增项目
*
* @param workXm 项目
* @return 结果
*/
public int insertWorkXm(WorkXm workXm);
/**
* 修改项目
*
* @param workXm 项目
* @return 结果
*/
public int updateWorkXm(WorkXm workXm);
/**
* 删除项目
*
* @param id 项目主键
* @return 结果
*/
public int deleteWorkXmById(Long id);
/**
* 批量删除项目
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWorkXmByIds(Long[] ids);
/**
* 批量删除项目从表信息
*
* @return 结果
*/
public int deleteWorkXmCbByYltzIds(Long[] ids);
/**
* 查询附件
* @param businessId
* @param moduleName
* @return
*/
List<WorkAccessory> selectFile(@Param("businessId") Long businessId, @Param("moduleName") String moduleName);
}
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmcbMapper.java deleted 100644 → 0
package com.qianhe.mapper;
import java.util.List;
import com.qianhe.domain.WorkAccessory;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.vo.WorkXmVo;
import org.apache.ibatis.annotations.Param;
/**
* 项目从表Mapper接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface WorkXmcbMapper
{
/**
* 查询项目从表
*
* @param id 项目从表主键
* @return 项目从表
*/
public WorkXmcb selectWorkXmcbById(Long id);
/**
* 查询项目从表列表
*
* @param workXmcb 项目从表
* @return 项目从表集合
*/
public List<WorkXmcb> selectWorkXmcbList(WorkXmcb workXmcb);
/**
* 新增项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
public int insertWorkXmcb(WorkXmcb workXmcb);
/**
* 修改项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
public int updateWorkXmcb(WorkXmcb workXmcb);
/**
* 删除项目从表
*
* @param id 项目从表主键
* @return 结果
*/
public int deleteWorkXmcbById(Long id);
/**
* 批量删除项目从表
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWorkXmcbByIds(Long[] ids);
/**
* 查询待办已办任务
* @param jdmc
* @param userId
* @param state
* @return
*/
List<WorkXmVo> taskList(@Param("userId") Long userId,@Param("state") String state,@Param("jdmc") List<String> jdmc, @Param("jh") String jh);
/**
* 查询当前登录用户待办任务
* @param userId
* @return
*/
List<WorkXmVo> userTaskList(@Param("userId") Long userId);
/**
* 批量新增附件
*/
int insertFile(List<WorkAccessory> list);
/**
* 根据业务id删除附件信息
* @param businessId
*/
void deleteFileByBusinessId(@Param("businessId") Long businessId, @Param("moduleName") String moduleName);
}
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkAccessoryService.java deleted 100644 → 0
package com.qianhe.service;
import java.util.List;
import com.qianhe.domain.WorkAccessory;
/**
* 附件信息Service接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface IWorkAccessoryService
{
/**
* 查询附件信息
*
* @param id 附件信息主键
* @return 附件信息
*/
public WorkAccessory selectWorkAccessoryById(Long id);
/**
* 查询附件信息列表
*
* @param workAccessory 附件信息
* @return 附件信息集合
*/
public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory);
/**
* 新增附件信息
*
* @param workAccessory 附件信息
* @return 结果
*/
public int insertWorkAccessory(WorkAccessory workAccessory);
/**
* 修改附件信息
*
* @param workAccessory 附件信息
* @return 结果
*/
public int updateWorkAccessory(WorkAccessory workAccessory);
/**
* 批量删除附件信息
*
* @param ids 需要删除的附件信息主键集合
* @return 结果
*/
public int deleteWorkAccessoryByIds(Long[] ids);
/**
* 删除附件信息信息
*
* @param id 附件信息主键
* @return 结果
*/
public int deleteWorkAccessoryById(Long id);
}
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkJdService.java deleted 100644 → 0
package com.qianhe.service;
import java.util.List;
import java.util.Map;
import com.qianhe.domain.WorkJd;
/**
* 节点Service接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface IWorkJdService
{
/**
* 查询节点
*
* @param id 节点主键
* @return 节点
*/
public WorkJd selectWorkJdById(Long id);
/**
* 查询节点列表
*
* @param workJd 节点
* @return 节点集合
*/
public List<WorkJd> selectWorkJdList(WorkJd workJd);
/**
* 新增节点
*
* @param workJd 节点
* @return 结果
*/
public int insertWorkJd(WorkJd workJd);
/**
* 修改节点
*
* @param workJd 节点
* @return 结果
*/
public int updateWorkJd(WorkJd workJd);
/**
* 批量删除节点
*
* @param ids 需要删除的节点主键集合
* @return 结果
*/
public int deleteWorkJdByIds(Long[] ids);
/**
* 删除节点信息
*
* @param id 节点主键
* @return 结果
*/
public int deleteWorkJdById(Long id);
/**
* 获取用户下拉框
* @return
*/
List<Map<String,Object>> getUserList();
/**
* 根据用户id查询节点名称
*/
List<String> selectJdmcByUserId(Long userId);
}
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmService.java deleted 100644 → 0
package com.qianhe.service;
import java.util.List;
import com.qianhe.domain.WorkXm;
import com.qianhe.vo.WorkXmTjVo;
import com.qianhe.vo.WorkXmVo;
/**
* 项目Service接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface IWorkXmService
{
/**
* 查询项目
*
* @param id 项目主键
* @return 项目
*/
public WorkXm selectWorkXmById(Long id);
/**
* 查询项目列表
*
* @param workXm 项目
* @return 项目集合
*/
public List<WorkXm> selectWorkXmList(WorkXm workXm);
/**
* 新增项目
*
* @param workXm 项目
* @return 结果
*/
public int insertWorkXm(WorkXm workXm);
/**
* 修改项目
*
* @param workXm 项目
* @return 结果
*/
public int updateWorkXm(WorkXm workXm);
/**
* 批量删除项目
*
* @param ids 需要删除的项目主键集合
* @return 结果
*/
public int deleteWorkXmByIds(Long[] ids);
/**
* 删除项目信息
*
* @param id 项目主键
* @return 结果
*/
public int deleteWorkXmById(Long id);
/**
* 提交
* @param workXm
* @return
*/
int submit(WorkXm workXm);
/**
* 查询项目详情
* @param id
* @return
*/
WorkXmVo getXmInfo(Long id);
/**
* 工作量统计(仅导出功能使用)
* @param workXmVo
* @return
*/
List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo);
/**
* 查询项目工作量列表
*
* @param workXmVo 项目
* @return 项目集合
*/
public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo);
/**
* 提交采集设计
* @param workXm
* @return
*/
int submitCjsj(WorkXm workXm);
/**
* 上传采集设计附件
* @param workXmVo
* @return
*/
int updateFile(WorkXmVo workXmVo);
}
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmcbService.java deleted 100644 → 0
package com.qianhe.service;
import java.util.List;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.vo.WorkXmVo;
/**
* 项目从表Service接口
*
* @author qianhe
* @date 2024-01-17
*/
public interface IWorkXmcbService
{
/**
* 查询项目从表
*
* @param id 项目从表主键
* @return 项目从表
*/
public WorkXmcb selectWorkXmcbById(Long id);
/**
* 查询项目从表列表
*
* @param workXmcb 项目从表
* @return 项目从表集合
*/
public List<WorkXmcb> selectWorkXmcbList(WorkXmcb workXmcb);
/**
* 新增项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
public int insertWorkXmcb(WorkXmcb workXmcb);
/**
* 修改项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
public int updateWorkXmcb(WorkXmcb workXmcb);
/**
* 批量删除项目从表
*
* @param ids 需要删除的项目从表主键集合
* @return 结果
*/
public int deleteWorkXmcbByIds(Long[] ids);
/**
* 删除项目从表信息
*
* @param id 项目从表主键
* @return 结果
*/
public int deleteWorkXmcbById(Long id);
// /**
// * 首页-待办已办
// * @param state
// * @param workXmVo
// * @return
// */
// List<WorkXmVo> taskList(String state, WorkXmVo workXmVo);
/**
* 查询待办已办任务
* @param jdmc
* @param userId
* @param state
* @return
*/
List<WorkXmVo> taskList(Long userId, String state, List<String> jdmc,String jh);
/**
* 查询审批历史
* @param id
* @return
*/
List<WorkXmcb> getspls(Long id);
/**
* 办理审核按钮
* @param workXmVo
* @return
*/
int handle(WorkXmVo workXmVo);
}
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmServiceImpl.java deleted 100644 → 0
package com.qianhe.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.qianhe.common.exception.ServiceException;
import com.qianhe.common.utils.DateUtils;
import com.qianhe.common.utils.SecurityUtils;
import com.qianhe.common.utils.StringUtils;
import com.qianhe.domain.WorkAccessory;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.mapper.WorkXmcbMapper;
import com.qianhe.service.IWorkXmcbService;
import com.qianhe.vo.WorkXmTjVo;
import com.qianhe.vo.WorkXmVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.qianhe.mapper.WorkXmMapper;
import com.qianhe.domain.WorkXm;
import com.qianhe.service.IWorkXmService;
import org.springframework.transaction.annotation.Transactional;
/**
* 项目Service业务层处理
*
* @author qianhe
* @date 2024-01-17
*/
@Service
public class WorkXmServiceImpl implements IWorkXmService
{
@Autowired
private WorkXmMapper workXmMapper;
@Autowired
private WorkXmcbMapper workXmcbMapper;
/**
* 查询项目
*
* @param id 项目主键
* @return 项目
*/
@Override
public WorkXm selectWorkXmById(Long id)
{
return workXmMapper.selectWorkXmById(id);
}
/**
* 查询项目列表
*
* @param workXm 项目
* @return 项目
*/
@Override
public List<WorkXm> selectWorkXmList(WorkXm workXm)
{
return workXmMapper.selectWorkXmList(workXm);
}
/**
* 新增项目
*
* @param workXm 项目
* @return 结果
*/
@Override
public int insertWorkXm(WorkXm workXm)
{
workXm.setTbrId(SecurityUtils.getUserId());
workXm.setTbsj(DateUtils.getNowDate());
workXm.setDqjdmc("压裂通知");
workXm.setCreateBy(SecurityUtils.getUsername());
workXm.setCreateTime(DateUtils.getNowDate());
if (StringUtils.isNotEmpty(workXm.getTjzt())){
if (workXm.getTjzt().equals("1")){
workXm.setLczt("1");
workXm.setTjzt("1");
workXm.setDqjdmc("采集设计");
int i = workXmMapper.insertWorkXm(workXm);
//新增操作历史表
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(workXm.getId());
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShrlx("0");
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setWczt("1");
workXmcb.setSfsctj("1");
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return i;
}
}
return workXmMapper.insertWorkXm(workXm);
}
/**
* 修改项目
*
* @param workXm 项目
* @return 结果
*/
@Override
public int updateWorkXm(WorkXm workXm)
{
workXm.setUpdateBy(SecurityUtils.getUsername());
workXm.setUpdateTime(DateUtils.getNowDate());
return workXmMapper.updateWorkXm(workXm);
}
/**
* 批量删除项目
*
* @param ids 需要删除的项目主键
* @return 结果
*/
@Override
public int deleteWorkXmByIds(Long[] ids)
{
//批量删除项目从表信息
workXmMapper.deleteWorkXmCbByYltzIds(ids);
return workXmMapper.deleteWorkXmByIds(ids);
}
/**
* 删除项目信息
*
* @param id 项目主键
* @return 结果
*/
@Override
public int deleteWorkXmById(Long id)
{
return workXmMapper.deleteWorkXmById(id);
}
/**
* 提交
* @param workXm
* @return
*/
@Override
@Transactional
public int submit(WorkXm workXm) {
workXm.setLczt("1");
workXm.setTjzt("1");
workXm.setDqjdmc("采集设计");
int i = workXmMapper.updateWorkXm(workXm);
//新增操作历史表
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(workXm.getId());
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShrlx("0");
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setWczt("1");
workXmcb.setSfsctj("1");
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return i;
}
/**
* 查询项目详情
* @param id
* @return
*/
@Override
public WorkXmVo getXmInfo(Long id) {
WorkXm workXm = workXmMapper.selectWorkXmById(id);
//转vo
WorkXmVo workXmVo = new WorkXmVo();
BeanUtils.copyProperties(workXm,workXmVo);
//查询监测设计图集合
List<WorkAccessory> workAccessories = workXmMapper.selectFile(id, "项目-监测设计图");
int a = 0;
for (WorkAccessory workAccessory : workAccessories) {
workAccessory.setIndex(a);
a ++;
}
workXmVo.setJcsjtList(workAccessories);
//查询布设坐标集合
List<WorkAccessory> workAccessories1 = workXmMapper.selectFile(id, "项目-布设坐标");
int b = 0;
for (WorkAccessory workAccessory : workAccessories1) {
workAccessory.setIndex(b);
b ++;
}
workXmVo.setBszbList(workAccessories1);
//查询试油工程设计集合
List<WorkAccessory> workAccessories2 = workXmMapper.selectFile(id, "项目-试油工程设计");
int c = 0;
for (WorkAccessory workAccessory : workAccessories2) {
workAccessory.setIndex(c);
c ++;
}
workXmVo.setSygcsjList(workAccessories2);
//查询其他附件集合
List<WorkAccessory> workAccessories3 = workXmMapper.selectFile(id, "项目-其他附件");
int d = 0;
for (WorkAccessory workAccessory : workAccessories3) {
workAccessory.setIndex(d);
d ++;
}
workXmVo.setQtList(workAccessories3);
return workXmVo;
}
/**
* 工作量统计(仅导出功能使用)
* @param workXmVo
* @return
*/
@Override
public List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo) {
//查询所有已提交的项目
workXmVo.setTjzt("1");
List<WorkXm> workXms = workXmMapper.selectWorkXmGzlList(workXmVo);
//查询所有审批历史
List<WorkXmcb> workXmcbs = workXmcbMapper.selectWorkXmcbList(new WorkXmcb());
List<WorkXmTjVo> list = new ArrayList<>();
for (WorkXm xm : workXms) {
WorkXmTjVo workXmTjVo1 = new WorkXmTjVo();
workXmTjVo1.setJh(xm.getJh());
for (WorkXmcb workXmcb : workXmcbs) {
if (xm.getId().equals(workXmcb.getYltzId())){
switch (workXmcb.getShrlx()){
case "0":
workXmTjVo1.setYltz(workXmcb.getShr());
break;
case "1":
workXmTjVo1.setCjsj(workXmcb.getShr());
break;
case "2":
workXmTjVo1.setSjsh(workXmcb.getShr());
break;
case "3":
workXmTjVo1.setXckc(workXmcb.getShr());
break;
default:break;
}
}
}
list.add(workXmTjVo1);
}
return list;
}
/**
* 查看项目工作量列表
* @param workXmVo 项目
* @return
*/
@Override
public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo) {
return workXmMapper.selectWorkXmGzlList(workXmVo);
}
/**
* 提交采集设计
* @param workXm
* @return
*/
@Override
public int submitCjsj(WorkXm workXm) {
//查询项目详情
WorkXm workXm1 = workXmMapper.selectWorkXmById(workXm.getId());
if (workXm1.getCjtjzt().equals("0")){
throw new ServiceException("请先填报后上传！");
}
//修改该项目为第三节点
workXm.setCjtjzt("3");
workXm.setLczt("2");
workXm.setDqjdmc("设计审核");
int num = workXmMapper.updateWorkXm(workXm);
//增加审批历史
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(workXm.getId());
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("1");
workXmcb.setWczt("1");
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return num;
}
/**
* 上传采集设计附件
* @param workXmVo
* @return
*/
@Override
public int updateFile(WorkXmVo workXmVo) {
//项目id
Long id = workXmVo.getId();
if (StringUtils.isNull(workXmVo.getJcsjtList()) && StringUtils.isNull(workXmVo.getBszbList()) && StringUtils.isNull(workXmVo.getSygcsjList()) && StringUtils.isNull(workXmVo.getQtList())){
throw new ServiceException("请上传附件!");
}
if (workXmVo.getJcsjtList().size() <= 0 && workXmVo.getBszbList().size() <= 0 &&workXmVo.getSygcsjList().size() <= 0 && workXmVo.getQtList().size() <= 0){
throw new ServiceException("请上传附件!");
}
//将之前上传附件删除,重新上传
workXmcbMapper.deleteFileByBusinessId(id,"项目-监测设计图");
workXmcbMapper.deleteFileByBusinessId(id,"项目-布设坐标");
workXmcbMapper.deleteFileByBusinessId(id,"项目-试油工程设计");
workXmcbMapper.deleteFileByBusinessId(id,"项目-其他附件");
//监测设计图集合
List<WorkAccessory> jcsjtList = workXmVo.getJcsjtList();
//布设坐标集合
List<WorkAccessory> bszbList = workXmVo.getBszbList();
//试油工程设计集合
List<WorkAccessory> sygcsjList = workXmVo.getSygcsjList();
//其他附件集合
List<WorkAccessory> qtList = workXmVo.getQtList();
if (jcsjtList.size() > 0){
jcsjtList.forEach(list -> {
list.setModuleName("项目-监测设计图");
});
insertFileList(id,jcsjtList);
}
if (bszbList.size() > 0){
bszbList.forEach(list -> {
list.setModuleName("项目-布设坐标");
});
insertFileList(id,bszbList);
}
if (sygcsjList.size() > 0){
sygcsjList.forEach(list -> {
list.setModuleName("项目-试油工程设计");
});
insertFileList(id,sygcsjList);
}
if (qtList.size() > 0){
qtList.forEach(list -> {
list.setBusinessId(id);
list.setModuleName("项目-其他附件");
});
insertFileList(id,qtList);
}
//转实体对象
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setCjtjzt("1");
workXm.setUpdateBy(SecurityUtils.getUsername());
workXm.setUpdateTime(DateUtils.getNowDate());
return workXmMapper.updateWorkXm(workXm);
}
/**
* 批量新增附件
* @param id
* @param list
*/
public void insertFileList(Long id, List<WorkAccessory> list){
list.forEach(list1 -> {
list1.setBusinessId(id);
list1.setCreateBy(SecurityUtils.getUsername());
list1.setCreateTime(DateUtils.getNowDate());
});
workXmcbMapper.insertFile(list);
}
}
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmcbServiceImpl.java deleted 100644 → 0
package com.qianhe.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.qianhe.common.core.domain.entity.SysDictData;
import com.qianhe.common.core.domain.entity.SysDictType;
import com.qianhe.common.exception.ServiceException;
import com.qianhe.common.utils.DateUtils;
import com.qianhe.common.utils.SecurityUtils;
import com.qianhe.common.utils.StringUtils;
import com.qianhe.domain.WorkAccessory;
import com.qianhe.domain.WorkXm;
import com.qianhe.mapper.WorkJdMapper;
import com.qianhe.mapper.WorkXmMapper;
import com.qianhe.system.mapper.SysDictDataMapper;
import com.qianhe.system.mapper.SysDictTypeMapper;
import com.qianhe.vo.WorkXmVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.qianhe.mapper.WorkXmcbMapper;
import com.qianhe.domain.WorkXmcb;
import com.qianhe.service.IWorkXmcbService;
/**
* 项目从表Service业务层处理
*
* @author qianhe
* @date 2024-01-17
*/
@Service
public class WorkXmcbServiceImpl implements IWorkXmcbService
{
@Autowired
private WorkXmcbMapper workXmcbMapper;
@Autowired
private WorkJdMapper workJdMapper;
@Autowired
private WorkXmMapper workXmMapper;
@Autowired
private SysDictDataMapper sysDictDataMapper;
/**
* 查询项目从表
*
* @param id 项目从表主键
* @return 项目从表
*/
@Override
public WorkXmcb selectWorkXmcbById(Long id)
{
return workXmcbMapper.selectWorkXmcbById(id);
}
/**
* 查询项目从表列表
*
* @param workXmcb 项目从表
* @return 项目从表
*/
@Override
public List<WorkXmcb> selectWorkXmcbList(WorkXmcb workXmcb)
{
return workXmcbMapper.selectWorkXmcbList(workXmcb);
}
/**
* 新增项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
@Override
public int insertWorkXmcb(WorkXmcb workXmcb)
{
workXmcb.setCreateTime(DateUtils.getNowDate());
return workXmcbMapper.insertWorkXmcb(workXmcb);
}
/**
* 修改项目从表
*
* @param workXmcb 项目从表
* @return 结果
*/
@Override
public int updateWorkXmcb(WorkXmcb workXmcb)
{
workXmcb.setUpdateTime(DateUtils.getNowDate());
return workXmcbMapper.updateWorkXmcb(workXmcb);
}
/**
* 批量删除项目从表
*
* @param ids 需要删除的项目从表主键
* @return 结果
*/
@Override
public int deleteWorkXmcbByIds(Long[] ids)
{
return workXmcbMapper.deleteWorkXmcbByIds(ids);
}
/**
* 删除项目从表信息
*
* @param id 项目从表主键
* @return 结果
*/
@Override
public int deleteWorkXmcbById(Long id)
{
return workXmcbMapper.deleteWorkXmcbById(id);
}
// /**
// * 首页-待办已办
// * @param state
// * @param workXmVo
// * @return
// */
// @Override
// public List<WorkXmVo> taskList(String state, WorkXmVo workXmVo) {
// //当前登录用户id
// Long userId = SecurityUtils.getUserId();
// //查询当前登录用户属于哪个节点的审批人
// List<String> jds = workJdMapper.selectJdmcByUserId(userId);
// if (jds.size() > 0){
// //根据节点名称和用户id查询待办已办列表
// //查询当前登陆人待办任务
// if (state.equals("0")){
// userId = null;
// return workXmcbMapper.taskList(userId, state, jds,workXmVo.getJh());
// }else {
// jds = null;
// return workXmcbMapper.taskList(userId, state, jds,workXmVo.getJh());
// }
// }
// return new ArrayList<>();
// }
@Override
public List<WorkXmVo> taskList(Long userId, String state, List<String> jdmc, String jh) {
return workXmcbMapper.taskList(userId,state,jdmc,jh);
}
/**
* 根据项目id查询项目审批历史
* @param id
* @return
*/
@Override
public List<WorkXmcb> getspls(Long id) {
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id);
List<WorkXmcb> workXmcbs = workXmcbMapper.selectWorkXmcbList(workXmcb);
return workXmcbs;
}
/**
* 办理审核按钮
* @param workXmVo
* @return
*/
@Override
public int handle(WorkXmVo workXmVo) {
int i = 0;
//判断当前节点
switch (workXmVo.getLczt()){
//当前节点为压裂通知
case "0":
i = yltz(workXmVo);
break;
//当前节点为采集设计
case "1":
i = cjsj(workXmVo);
break;
//当前节点为设计审核
case "2":
i = sjsh(workXmVo);
break;
//当前节点为现场勘察
case "3":
i = xckc(workXmVo);
break;
default:
throw new ServiceException("系统错误，请联系管理员!");
}
return i;
}
/**
* 压裂通知人操作
*/
public int yltz(WorkXmVo workXmVo){
WorkXm workXm = new WorkXm();
workXm.setId(workXmVo.getId());
workXm.setLczt("1");
workXm.setDqjdmc("采集设计");
int i = workXmMapper.updateWorkXm(workXm);
//修改审批历史
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setId(workXmVo.getSplsId());
workXmcb.setWczt("1");
workXmcb.setShsj(DateUtils.getNowDate());
workXmcbMapper.updateWorkXmcb(workXmcb);
return i;
}
/**
* 采集设计人操作
* @param workXmVo
* @return
*/
public int cjsj(WorkXmVo workXmVo) {
//项目id
Long id = workXmVo.getId();
if (StringUtils.isNull(workXmVo.getJcsjtList()) && StringUtils.isNull(workXmVo.getBszbList()) && StringUtils.isNull(workXmVo.getSygcsjList()) && StringUtils.isNull(workXmVo.getQtList())){
throw new ServiceException("请上传附件!");
}
if (workXmVo.getJcsjtList().size() <= 0 && workXmVo.getBszbList().size() <= 0 &&workXmVo.getSygcsjList().size() <= 0 && workXmVo.getQtList().size() <= 0){
throw new ServiceException("请上传附件!");
}
//将之前上传附件删除,重新上传
workXmcbMapper.deleteFileByBusinessId(id,"项目-监测设计图");
workXmcbMapper.deleteFileByBusinessId(id,"项目-布设坐标");
workXmcbMapper.deleteFileByBusinessId(id,"项目-试油工程设计");
workXmcbMapper.deleteFileByBusinessId(id,"项目-其他附件");
//监测设计图集合
List<WorkAccessory> jcsjtList = workXmVo.getJcsjtList();
//布设坐标集合
List<WorkAccessory> bszbList = workXmVo.getBszbList();
//试油工程设计集合
List<WorkAccessory> sygcsjList = workXmVo.getSygcsjList();
//其他附件集合
List<WorkAccessory> qtList = workXmVo.getQtList();
if (jcsjtList.size() > 0){
jcsjtList.forEach(list -> {
list.setModuleName("项目-监测设计图");
});
insertFileList(id,jcsjtList);
}
if (bszbList.size() > 0){
bszbList.forEach(list -> {
list.setModuleName("项目-布设坐标");
});
insertFileList(id,bszbList);
}
if (sygcsjList.size() > 0){
sygcsjList.forEach(list -> {
list.setModuleName("项目-试油工程设计");
});
insertFileList(id,sygcsjList);
}
if (qtList.size() > 0){
qtList.forEach(list -> {
list.setBusinessId(id);
list.setModuleName("项目-其他附件");
});
insertFileList(id,qtList);
}
//修改该项目为第三节点
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setLczt("2");
workXm.setDqjdmc("设计审核");
if (StringUtils.isNotEmpty(workXmVo.getBz())){
workXm.setBz(workXmVo.getBz());
}
int num = workXmMapper.updateWorkXm(workXm);
//增加审批历史
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id);
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("1");
workXmcb.setWczt("1");
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return num;
}
/**
* 批量新增附件
* @param id
* @param list
*/
public void insertFileList(Long id, List<WorkAccessory> list){
list.forEach(list1 -> {
list1.setBusinessId(id);
list1.setCreateBy(SecurityUtils.getUsername());
list1.setCreateTime(DateUtils.getNowDate());
});
workXmcbMapper.insertFile(list);
}
/**
* 设计审核人操作
*/
public int sjsh(WorkXmVo workXmVo){
int num = 0;
Long id = workXmVo.getId();
if (StringUtils.isEmpty(workXmVo.getShzt())){
throw new ServiceException("请选择您的审批意见!");
}
//查询字典键值
// String shzt = sysDictDataMapper.selectDictLabel("shzt", workXmVo.getShzt());
//判断审核人审核状态是否为退回
if (workXmVo.getShzt().equals("退回")){
//修改该项目为第2节点
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setLczt("1");
workXm.setDqjdmc("采集设计");
workXm.setCjtjzt("4");
num = workXmMapper.updateWorkXm(workXm);
//查询项目详情
// WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
// //增加审批历史
// WorkXmcb workXmcb = new WorkXmcb();
// workXmcb.setYltzId(id);
// workXmcb.setShrId(workXm1.getTbrId());
// workXmcb.setShrlx("0");
// workXmcb.setWczt("0");
// workXmcb.setSfsctj("0");
// workXmcb.setCreateBy(SecurityUtils.getUsername());
// workXmcb.setCreateTime(DateUtils.getNowDate());
// workXmcbMapper.insertWorkXmcb(workXmcb);
}else {
//修改该项目为第四节点
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setLczt("3");
workXm.setDqjdmc("现场勘查");
num = workXmMapper.updateWorkXm(workXm);
}
//增加审批历史
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id);
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("2");
workXmcb.setShzt(workXmVo.getShzt());
workXmcb.setWczt("1");
if (StringUtils.isNotEmpty(workXmVo.getYj())){
workXmcb.setYj(workXmVo.getYj());
}
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return num;
}
/**
* 现场勘查人操作
*/
public int xckc(WorkXmVo workXmVo){
int num = 0;
Long id = workXmVo.getId();
if (StringUtils.isEmpty(workXmVo.getShzt())){
throw new ServiceException("请选择您的审批意见!");
}
//查询字典键值
// String shzt1 = sysDictDataMapper.selectDictLabel("shzt1", workXmVo.getShzt());
//判断审核人审核状态是否为退回
if (workXmVo.getShzt().equals("不符合优化施工设计")){
//修改该项目为第1节点
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setLczt("1");
workXm.setDqjdmc("采集设计");
workXm.setCjtjzt("4");
num = workXmMapper.updateWorkXm(workXm);
// //查询项目详情
// WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
// //增加审批历史
// WorkXmcb workXmcb = new WorkXmcb();
// workXmcb.setYltzId(id);
// workXmcb.setShrId(workXm1.getTbrId());
// workXmcb.setShrlx("0");
// workXmcb.setWczt("0");
// workXmcb.setSfsctj("0");
// workXmcb.setCreateBy(SecurityUtils.getUsername());
// workXmcb.setCreateTime(DateUtils.getNowDate());
// workXmcbMapper.insertWorkXmcb(workXmcb);
}else {
//修改该项目为第五节点（暂定为已完工）
WorkXm workXm = new WorkXm();
workXm.setId(id);
workXm.setLczt("4");
workXm.setDqjdmc("已完工");
num = workXmMapper.updateWorkXm(workXm);
}
//增加审批历史
WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id);
workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("3");
workXmcb.setShzt(workXmVo.getShzt());
workXmcb.setWczt("1");
if (StringUtils.isNotEmpty(workXmVo.getYj())){
workXmcb.setYj(workXmVo.getYj());
}
workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb);
return num;
}
}
qianhe-gzpt/src/main/java/com/qianhe/vo/WorkXmTjVo.java deleted 100644 → 0
package com.qianhe.vo;
import com.qianhe.common.annotation.Excel;
import lombok.Data;
/**
* 统计vo
*/
@Data
public class WorkXmTjVo {
private Long id;
/** 井号 */
@Excel(name = "井号")
private String jh;
/** 压裂通知 */
@Excel(name = "压裂通知")
private String yltz;
/** 采集设计 */
@Excel(name = "采集设计")
private String cjsj;
/** 设计审核 */
@Excel(name = "设计审核")
private String sjsh;
/** 现场勘查 */
@Excel(name = "现场勘查")
private String xckc;
/** 设备充电 */
@Excel(name = "设备充电")
private String sbcd;
/** 设备部署 */
@Excel(name = "设备部署")
private String sbbs;
}
qianhe-gzpt/src/main/java/com/qianhe/vo/WorkXmVo.java deleted 100644 → 0
package com.qianhe.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.qianhe.common.annotation.Excel;
import com.qianhe.domain.WorkAccessory;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 项目对象 work_xm
*
* @author qianhe
* @date 2024-01-17
*/
@Data
public class WorkXmVo {
/** 主键id */
private Long id;
/** 井号 */
@Excel(name = "井号")
private String jh;
/** 负责人id */
private Long tbrId;
/** 负责人 */
@Excel(name = "负责人")
private String tbr;
/** 填写时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "填写时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date tbsj;
/** 流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察) */
@Excel(name = "流程状态(0压裂通知，1采集设计，2设计审核，3现场勘察)")
private String lczt;
/** 提交状态（0未提交，1已提交） */
@Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
private String tjzt;
/** 采集设计提交状态（0未填报，1已填报，2未提交，3已提交） */
private String cjtjzt;
/** 当前节点id */
private Long dqjdId;
/** 当前节点名称 */
@Excel(name = "当前节点名称")
private String dqjdmc;
/** 备注 */
private String bz;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
/** 监测设计图集合 */
private List<WorkAccessory> jcsjtList;
/** 布设坐标集合 */
private List<WorkAccessory> bszbList;
/** 试油工程设计集合 */
private List<WorkAccessory> sygcsjList;
/** 其他附件集合 */
private List<WorkAccessory> qtList;
/** 审核状态（1同意，2退回） */
private String shzt;
/** 意见 */
private String yj;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
//当前审批历史id
private Long splsId;
}
qianhe-gzpt/src/main/resources/mapper/WorkAccessoryMapper.xml deleted 100644 → 0
<?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.qianhe.mapper.WorkAccessoryMapper">
<resultMap type="WorkAccessory" id="WorkAccessoryResult">
<result property="id" column="id" />
<result property="businessId" column="business_id" />
<result property="moduleName" column="module_name" />
<result property="accessoryType" column="accessory_type" />
<result property="accessoryUrl" column="accessory_url" />
<result property="fileName" column="file_name" />
<result property="accessoryName" column="accessory_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectWorkAccessoryVo">
select id, business_id, module_name, accessory_type, accessory_url, file_name, accessory_name, create_by, create_time, update_by, update_time, del_flag from work_accessory
</sql>
<select id="selectWorkAccessoryList" parameterType="WorkAccessory" resultMap="WorkAccessoryResult">
<include refid="selectWorkAccessoryVo"/>
<where>
del_flag = '0'
<if test="businessId != null "> and business_id = #{businessId}</if>
<if test="moduleName != null and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
<if test="accessoryType != null and accessoryType != ''"> and accessory_type = #{accessoryType}</if>
<if test="accessoryUrl != null and accessoryUrl != ''"> and accessory_url = #{accessoryUrl}</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="accessoryName != null and accessoryName != ''"> and accessory_name like concat('%', #{accessoryName}, '%')</if>
</where>
order by create_time DESC
</select>
<select id="selectWorkAccessoryById" parameterType="Long" resultMap="WorkAccessoryResult">
<include refid="selectWorkAccessoryVo"/>
where id = #{id}
</select>
<insert id="insertWorkAccessory" parameterType="WorkAccessory" useGeneratedKeys="true" keyProperty="id">
insert into work_accessory
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="businessId != null">business_id,</if>
<if test="moduleName != null and moduleName != ''">module_name,</if>
<if test="accessoryType != null and accessoryType != ''">accessory_type,</if>
<if test="accessoryUrl != null and accessoryUrl != ''">accessory_url,</if>
<if test="fileName != null and fileName != ''">file_name,</if>
<if test="accessoryName != null and accessoryName != ''">accessory_name,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="businessId != null">#{businessId},</if>
<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
<if test="accessoryType != null and accessoryType != ''">#{accessoryType},</if>
<if test="accessoryUrl != null and accessoryUrl != ''">#{accessoryUrl},</if>
<if test="fileName != null and fileName != ''">#{fileName},</if>
<if test="accessoryName != null and accessoryName != ''">#{accessoryName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateWorkAccessory" parameterType="WorkAccessory">
update work_accessory
<trim prefix="SET" suffixOverrides=",">
<if test="businessId != null">business_id = #{businessId},</if>
<if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
<if test="accessoryType != null and accessoryType != ''">accessory_type = #{accessoryType},</if>
<if test="accessoryUrl != null and accessoryUrl != ''">accessory_url = #{accessoryUrl},</if>
<if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
<if test="accessoryName != null and accessoryName != ''">accessory_name = #{accessoryName},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<update id="deleteWorkAccessoryById" parameterType="Long">
update work_accessory set del_flag = '1' where id = #{id}
</update>
<update id="deleteWorkAccessoryByIds" parameterType="String">
update work_accessory set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>
qianhe-gzpt/src/main/resources/mapper/WorkJdMapper.xml deleted 100644 → 0
<?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.qianhe.mapper.WorkJdMapper">
<resultMap type="WorkJd" id="WorkJdResult">
<result property="id" column="id" />
<result property="jdmc" column="jdmc" />
<result property="fzrId" column="fzr_id" />
<result property="fzr" column="fzr" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectWorkJdVo">
select id, jdmc, fzr_id, fzr, create_by, create_time, update_by, update_time, del_flag from work_jd
</sql>
<select id="selectWorkJdList" parameterType="WorkJd" resultMap="WorkJdResult">
<include refid="selectWorkJdVo"/>
<where>
del_flag = '0'
<if test="jdmc != null and jdmc != ''"> and jdmc = #{jdmc}</if>
<if test="fzrId != null "> and fzr_id = #{fzrId}</if>
<if test="fzr != null and fzr != ''"> and fzr = #{fzr}</if>
</where>
order by create_time DESC
</select>
<select id="selectWorkJdById" parameterType="Long" resultMap="WorkJdResult">
<include refid="selectWorkJdVo"/>
where id = #{id}
</select>
<insert id="insertWorkJd" parameterType="WorkJd" useGeneratedKeys="true" keyProperty="id">
insert into work_jd
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jdmc != null">jdmc,</if>
<if test="fzrId != null">fzr_id,fzr,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jdmc != null">#{jdmc},</if>
<if test="fzrId != null">#{fzrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{fzrId}),</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateWorkJd" parameterType="WorkJd">
update work_jd
<trim prefix="SET" suffixOverrides=",">
<if test="jdmc != null">jdmc = #{jdmc},</if>
<if test="fzrId != null">fzr_id = #{fzrId},</if>
<if test="fzr != null">fzr = #{fzr},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<update id="deleteWorkJdById" parameterType="Long">
update work_jd set del_flag = '1' where id = #{id}
</update>
<update id="deleteWorkJdByIds" parameterType="String">
update work_jd set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="selectJdmcByUserId" parameterType="Long" resultType="String">
SELECT DISTINCT jdmc FROM work_jd WHERE del_flag = '0' and fzr_id = #{userId}
</select>
<select id="getUserList" resultType="Map">
select user_id as userId, nick_name as nickName from sys_user where del_flag = '0'
</select>
</mapper>
qianhe-gzpt/src/main/resources/mapper/WorkXmMapper.xml deleted 100644 → 0
<?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.qianhe.mapper.WorkXmMapper">
<resultMap type="WorkXm" id="WorkXmResult">
<result property="id" column="id" />
<result property="jh" column="jh" />
<result property="tbrId" column="tbr_id" />
<result property="tbr" column="tbr" />
<result property="tbsj" column="tbsj" />
<result property="lczt" column="lczt" />
<result property="tjzt" column="tjzt" />
<result property="cjtjzt" column="cjtjzt" />
<result property="dqjdId" column="dqjd_id" />
<result property="dqjdmc" column="dqjdmc" />
<result property="bz" column="bz" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectWorkXmVo">
select id, jh, tbr_id, tbr, tbsj, lczt, tjzt, cjtjzt, dqjd_id, dqjdmc, bz, create_by, create_time, update_by, update_time, del_flag from work_xm
</sql>
<select id="selectWorkXmList" parameterType="WorkXm" resultMap="WorkXmResult">
<include refid="selectWorkXmVo"/>
<where>
del_flag = '0'
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="tbrId != null "> and tbr_id = #{tbrId}</if>
<if test="tbr != null and tbr != ''"> and tbr = #{tbr}</if>
<if test="tbsj != null "> and tbsj = #{tbsj}</if>
<if test="lczt != null and lczt != ''"> and lczt = #{lczt}</if>
<if test="tjzt != null and tjzt != ''"> and tjzt = #{tjzt}</if>
<if test="cjtjzt != null and cjtjzt != ''"> and cjtjzt = #{cjtjzt}</if>
<if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
<if test="dqjdmc != null and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
</where>
order by create_time DESC
</select>
<select id="selectWorkXmGzlList" parameterType="com.qianhe.vo.WorkXmVo" resultMap="WorkXmResult">
<include refid="selectWorkXmVo"/>
<where>
del_flag = '0'
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="tbrId != null "> and tbr_id = #{tbrId}</if>
<if test="tbr != null and tbr != ''"> and tbr = #{tbr}</if>
<if test="tbsj != null "> and tbsj = #{tbsj}</if>
<if test="lczt != null and lczt != ''"> and lczt = #{lczt}</if>
<if test="tjzt != null and tjzt != ''"> and tjzt = #{tjzt}</if>
<if test="cjtjzt != null and cjtjzt != ''"> and cjtjzt = #{cjtjzt}</if>
<if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
<if test="dqjdmc != null and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
<if test="startTime != null and endTime != null">and DATE_FORMAT(tbsj,'%Y-%m-%d') between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d')</if>
</where>
order by create_time DESC
</select>
<select id="selectWorkXmById" parameterType="Long" resultMap="WorkXmResult">
<include refid="selectWorkXmVo"/>
where id = #{id}
</select>
<insert id="insertWorkXm" parameterType="WorkXm" useGeneratedKeys="true" keyProperty="id">
insert into work_xm
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jh != null">jh,</if>
<if test="tbrId != null">tbr_id,tbr,</if>
<if test="tbsj != null">tbsj,</if>
<if test="lczt != null">lczt,</if>
<if test="tjzt != null">tjzt,</if>
<if test="cjtjzt != null">cjtjzt,</if>
<if test="dqjdId != null">dqjd_id,</if>
<if test="dqjdmc != null">dqjdmc,</if>
<if test="bz != null">bz,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
<if test="tbrId != null">#{tbrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{tbrId}),</if>
<if test="tbsj != null">#{tbsj},</if>
<if test="lczt != null">#{lczt},</if>
<if test="tjzt != null">#{tjzt},</if>
<if test="cjtjzt != null">#{cjtjzt},</if>
<if test="dqjdId != null">#{dqjdId},</if>
<if test="dqjdmc != null">#{dqjdmc},</if>
<if test="bz != null">#{bz},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateWorkXm" parameterType="WorkXm">
update work_xm
<trim prefix="SET" suffixOverrides=",">
<if test="jh != null">jh = #{jh},</if>
<if test="tbrId != null">tbr_id = #{tbrId},tbr = (select nick_name from sys_user where del_flag = '0' and user_id = #{tbrId}),</if>
<if test="tbsj != null">tbsj = #{tbsj},</if>
<if test="lczt != null">lczt = #{lczt},</if>
<if test="tjzt != null">tjzt = #{tjzt},</if>
<if test="cjtjzt != null">cjtjzt = #{cjtjzt},</if>
<if test="dqjdId != null">dqjd_id = #{dqjdId},</if>
<if test="dqjdmc != null">dqjdmc = #{dqjdmc},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<update id="deleteWorkXmById" parameterType="Long">
update work_xm set del_flag = '1' where id = #{id}
</update>
<update id="deleteWorkXmByIds" parameterType="String">
update work_xm set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<update id="deleteWorkXmCbByYltzIds" parameterType="String">
update work_xmcb set del_flag = '1' where yltz_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="selectFile" resultType="com.qianhe.domain.WorkAccessory">
select id, business_id, module_name, accessory_type, accessory_url, file_name, accessory_name, create_by, create_time, update_by, update_time, del_flag
from work_accessory where del_flag = '0' and business_id = #{businessId} and module_name = #{moduleName}
</select>
</mapper>
qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml deleted 100644 → 0
<?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.qianhe.mapper.WorkXmcbMapper">
<resultMap type="WorkXmcb" id="WorkXmcbResult">
<result property="id" column="id" />
<result property="yltzId" column="yltz_id" />
<result property="shrId" column="shr_id" />
<result property="shr" column="shr" />
<result property="shsj" column="shsj" />
<result property="shrlx" column="shrlx" />
<result property="shzt" column="shzt" />
<result property="yj" column="yj" />
<result property="bz" column="bz" />
<result property="wczt" column="wczt" />
<result property="sfsctj" column="sfsctj" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectWorkXmcbVo">
select id, yltz_id, shr_id, shr, shsj, shrlx, shzt, yj, bz, wczt, sfsctj, create_by, create_time, update_by, update_time, del_flag from work_xmcb
</sql>
<select id="selectWorkXmcbList" parameterType="com.qianhe.domain.WorkXmcb" resultMap="WorkXmcbResult">
<include refid="selectWorkXmcbVo"/>
<where>
del_flag = '0'
<if test="yltzId != null "> and yltz_id = #{yltzId}</if>
<if test="shrId != null "> and shr_id = #{shrId}</if>
<if test="shsj != null "> and shsj = #{shsj}</if>
<if test="shrlx != null and shrlx != ''"> and shrlx = #{shrlx}</if>
<if test="shzt != null and shzt != ''"> and shzt = #{shzt}</if>
<if test="yj != null and yj != ''"> and yj = #{yj}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if>
<if test="wczt != null and wczt != ''"> and wczt = #{wczt}</if>
</where>
order by create_time DESC
</select>
<select id="selectWorkXmcbById" parameterType="Long" resultMap="WorkXmcbResult">
<include refid="selectWorkXmcbVo"/>
where id = #{id}
</select>
<insert id="insertWorkXmcb" parameterType="WorkXmcb" useGeneratedKeys="true" keyProperty="id">
insert into work_xmcb
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="yltzId != null">yltz_id,</if>
<if test="shrId != null">shr_id,shr,</if>
<if test="shsj != null">shsj,</if>
<if test="shrlx != null">shrlx,</if>
<if test="shzt != null">shzt,</if>
<if test="yj != null">yj,</if>
<if test="bz != null">bz,</if>
<if test="wczt != null">wczt,</if>
<if test="sfsctj != null">sfsctj,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="yltzId != null">#{yltzId},</if>
<if test="shrId != null">#{shrId},(select nick_name from sys_user where del_flag = '0' and user_id = #{shrId}),</if>
<if test="shsj != null">#{shsj},</if>
<if test="shrlx != null">#{shrlx},</if>
<if test="shzt != null">#{shzt},</if>
<if test="yj != null">#{yj},</if>
<if test="bz != null">#{bz},</if>
<if test="wczt != null">#{wczt},</if>
<if test="sfsctj != null">#{sfsctj},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateWorkXmcb" parameterType="WorkXmcb">
update work_xmcb
<trim prefix="SET" suffixOverrides=",">
<if test="yltzId != null">yltz_id = #{yltzId},</if>
<if test="shrId != null">shr_id = #{shrId},shr = (select nick_name from sys_user where del_flag = '0' and user_id = #{shrId}),</if>
<if test="shsj != null">shsj = #{shsj},</if>
<if test="shrlx != null">shrlx = #{shrlx},</if>
<if test="shzt != null">shzt = #{shzt},</if>
<if test="yj != null">yj = #{yj},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="wczt != null">wczt = #{wczt},</if>
<if test="sfsctj != null">sfsctj = #{sfsctj},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<update id="deleteWorkXmcbById" parameterType="Long">
update work_xmcb set del_flag = '1' where id = #{id}
</update>
<update id="deleteWorkXmcbByIds" parameterType="String">
update work_xmcb set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="taskList" resultType="com.qianhe.vo.WorkXmVo">
SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.cjtjzt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag
FROM work_xm x
LEFT JOIN work_xmcb w ON w.yltz_id = x.id
<where>
x.del_flag = '0' AND w.del_flag = '0' and x.tjzt = '1'
<if test="userId != null"> and w.shr_id = #{userId}</if>
<if test="state != null and state != '' and state == 1"> and w.wczt = #{state} and w.sfsctj = '0'</if>
<if test="jh != null and jh != ''">and x.jh = #{jh}</if>
<if test="jdmc != null">
and x.lczt in
<foreach item="jdmc" collection="jdmc" open="(" separator="," close=")">
#{jdmc}
</foreach>
and cjtjzt = '3'
</if>
</where>
GROUP BY x.id
</select>
<select id="userTaskList" resultType="com.qianhe.vo.WorkXmVo" parameterType="Long">
SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.cjtjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag, w.id as splsId
FROM work_xm x
LEFT JOIN work_xmcb w ON w.yltz_id = x.id
where x.del_flag = '0' AND w.del_flag = '0' and w.sfsctj = '0' and w.wczt = '0' and w.shr_id = #{userId}
</select>
<insert id="insertFile" parameterType="com.qianhe.domain.WorkAccessory">
insert into work_accessory(id, business_id, module_name, accessory_url, file_name, accessory_name, create_by, create_time) values
<foreach item="item" index="index" collection="list" separator=",">
(0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.fileName}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
<delete id="deleteFileByBusinessId">
delete from work_accessory where business_id = #{businessId} and module_name = #{moduleName}
</delete>
</mapper>
qianhe-system/src/main/resources/mapper/system/SysDeptMapper.xml
...@@ -20,10 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -20,10 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" /> <result property="createTime" column="create_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="dwjb" column="dwjb" />
</resultMap> </resultMap>
<sql id="selectDeptVo"> <sql id="selectDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time select d.dept_id, d.parent_id,
d.ancestors, d.dept_name,
d.order_num, d.leader, d.phone,
d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb
from sys_dept d from sys_dept d
</sql> </sql>
...@@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null and email != ''">email,</if> <if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="dwjb != null and dwjb != ''">dwjb,</if>
create_time create_time
)values( )values(
<if test="deptId != null and deptId != 0">#{deptId},</if> <if test="deptId != null and deptId != 0">#{deptId},</if>
...@@ -111,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -111,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null and email != ''">#{email},</if> <if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="dwjb != null and dwjb != ''">#{dwjb},</if>
sysdate() sysdate()
) )
</insert> </insert>
...@@ -127,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -127,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="email != null">email = #{email},</if> <if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if> <if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="dwjb != null and dwjb != ''">dwjb = #{dwjb},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where dept_id = #{deptId} where dept_id = #{deptId}
......
qianhe-gzpt/pom.xml → qianhe-ydsj/pom.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>qianhe-gzpt</artifactId> <artifactId>qianhe-ydsj</artifactId>
<description> <description>
工作平台模块 工作平台模块
......
qianhe-ydsj/src/main/java/com/qianhe/controller/WdLxwhController.java 0 → 100644
package com.qianhe.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.qianhe.common.annotation.Log;
import com.qianhe.common.core.controller.BaseController;
import com.qianhe.common.core.domain.AjaxResult;
import com.qianhe.common.enums.BusinessType;
import com.qianhe.domain.WdLxwh;
import com.qianhe.service.IWdLxwhService;
import com.qianhe.common.utils.poi.ExcelUtil;
import com.qianhe.common.core.page.TableDataInfo;
/**
* 文档-类型维护Controller
*
* @author qianhe
* @date 2024-02-28
*/
@RestController
@RequestMapping("/system/WdLxwh")
public class WdLxwhController extends BaseController
{
@Autowired
private IWdLxwhService wdLxwhService;
/**
* 查询文档-类型维护列表
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:list')")
@GetMapping("/list")
public TableDataInfo list(WdLxwh wdLxwh)
{
startPage();
List<WdLxwh> list = wdLxwhService.selectWdLxwhList(wdLxwh);
return getDataTable(list);
}
/**
* 导出文档-类型维护列表
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:export')")
@Log(title = "文档-类型维护", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WdLxwh wdLxwh)
{
List<WdLxwh> list = wdLxwhService.selectWdLxwhList(wdLxwh);
ExcelUtil<WdLxwh> util = new ExcelUtil<WdLxwh>(WdLxwh.class);
util.exportExcel(response, list, "文档-类型维护数据");
}
/**
* 获取文档-类型维护详细信息
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(wdLxwhService.selectWdLxwhById(id));
}
/**
* 新增文档-类型维护
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:add')")
@Log(title = "文档-类型维护", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody WdLxwh wdLxwh)
{
return toAjax(wdLxwhService.insertWdLxwh(wdLxwh));
}
/**
* 修改文档-类型维护
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:edit')")
@Log(title = "文档-类型维护", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody WdLxwh wdLxwh)
{
return toAjax(wdLxwhService.updateWdLxwh(wdLxwh));
}
/**
* 删除文档-类型维护
*/
@PreAuthorize("@ss.hasPermi('system:WdLxwh:remove')")
@Log(title = "文档-类型维护", businessType = BusinessType.DELETE)
@PostMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(wdLxwhService.deleteWdLxwhByIds(ids));
}
}
qianhe-ydsj/src/main/java/com/qianhe/controller/WdWdwhController.java 0 → 100644
package com.qianhe.controller;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageInfo;
import com.qianhe.common.core.page.PageDomain;
import com.qianhe.common.core.page.TableSupport;
import com.qianhe.common.utils.StringUtils;
import com.qianhe.domain.WdWdxx;
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.qianhe.common.annotation.Log;
import com.qianhe.common.core.controller.BaseController;
import com.qianhe.common.core.domain.AjaxResult;
import com.qianhe.common.enums.BusinessType;
import com.qianhe.domain.WdWdwh;
import com.qianhe.service.IWdWdwhService;
import com.qianhe.common.utils.poi.ExcelUtil;
import com.qianhe.common.core.page.TableDataInfo;
/**
* 文档-文档维护Controller
*
* @author qianhe
* @date 2024-02-28
*/
@RestController
@RequestMapping("/system/wdWdwh")
public class WdWdwhController extends BaseController
{
@Autowired
private IWdWdwhService wdWdwhService;
/**
* 查询文档-文档维护列表
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:list')")
@GetMapping("/list")
public TableDataInfo list(WdWdwh wdWdwh)
{
startPage();
List<WdWdwh> list = wdWdwhService.selectWdWdwhList(wdWdwh);
return getDataTable(list);
}
/**
* 导出文档-文档维护列表
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:export')")
@Log(title = "文档-文档维护", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WdWdwh wdWdwh)
{
List<WdWdwh> list = wdWdwhService.selectWdWdwhList(wdWdwh);
ExcelUtil<WdWdwh> util = new ExcelUtil<WdWdwh>(WdWdwh.class);
util.exportExcel(response, list, "文档-文档维护数据");
}
/**
* 获取文档-文档维护详细信息
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(wdWdwhService.selectWdWdwhById(id));
}
/**
* 新增文档-文档维护
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:add')")
@Log(title = "文档-文档维护", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody WdWdwh wdWdwh)
{
return toAjax(wdWdwhService.insertWdWdwh(wdWdwh));
}
/**
* 修改文档-文档维护
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:edit')")
@Log(title = "文档-文档维护", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody WdWdwh wdWdwh)
{
return toAjax(wdWdwhService.updateWdWdwh(wdWdwh));
}
/**
* 删除文档-文档维护
*/
@PreAuthorize("@ss.hasPermi('system:wdWdwh:remove')")
@Log(title = "文档-文档维护", businessType = BusinessType.DELETE)
@PostMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(wdWdwhService.deleteWdWdwhByIds(ids));
}
/**
* 根据三级单位统计---行转列
*/
// @PreAuthorize("@ss.hasPermi('system:wdWdwh:list')")
@GetMapping("/getListBySjDw")
public TableDataInfo getListBySjDw(WdWdwh wdWdwh)
{
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
// startPage();
List<WdWdwh> list = wdWdwhService.getListBySjDw(wdWdwh);
List<Map> typeList = wdWdwhService.getListBySjDwByType(wdWdwh);
// 结果
List<Map> mapList = new ArrayList<>();
// 二重循环 实体转map 并匹配zbcs 设置到map中
for (WdWdwh wdWdwh1 : list) {
String deptId = wdWdwh1.getDeptId();
String year = wdWdwh1.getYear();
// 1将 实体类 转换为 Map
Map<String,Object> map = JSON.parseObject(JSON.toJSONString(wdWdwh1), Map.class);
System.out.println(map);
// 2取出当期装备编码对应的参数列表
List<Map> nowZbcsList = typeList.stream().filter(data -> deptId.equals(data.get("deptId")) && year.equals(data.get("year"))).collect(Collectors.toList());
map = setZbcsTomMap(map, nowZbcsList);
map = toLowerKey(map);//键key 转小写
mapList.add(map);
}
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
List<Map> maps = startPage(mapList, pageNum, pageSize);
rspData.setRows(maps);
rspData.setTotal(new PageInfo(list).getTotal());
return rspData;
}
/**
* 根据二级单位统计---行转列
*/
// @PreAuthorize("@ss.hasPermi('system:wdWdwh:list')")
@GetMapping("/getListByEjDw")
public TableDataInfo getListByEjDw(WdWdwh wdWdwh)
{
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
// startPage();
List<WdWdwh> list = wdWdwhService.getListByEjDw(wdWdwh);
List<Map> typeList = wdWdwhService.getListByEjDwByType(wdWdwh);
// 结果
List<Map> mapList = new ArrayList<>();
// 二重循环 实体转map 并匹配zbcs 设置到map中
for (WdWdwh wdWdwh1 : list) {
String deptId = wdWdwh1.getEjdeptId();
String year = wdWdwh1.getYear();
// 1将 实体类 转换为 Map
Map<String,Object> map = JSON.parseObject(JSON.toJSONString(wdWdwh1), Map.class);
System.out.println(map);
// 2取出当期装备编码对应的参数列表
List<Map> nowZbcsList = typeList.stream().filter(data -> deptId.equals(data.get("ejdeptId")) && year.equals(data.get("year"))).collect(Collectors.toList());
map = setZbcsTomMap(map, nowZbcsList);
map = toLowerKey(map);//键key 转小写
mapList.add(map);
}
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
List<Map> maps = startPage(mapList, pageNum, pageSize);
rspData.setRows(maps);
rspData.setTotal(new PageInfo(list).getTotal());
return rspData;
}
/**
* 查询文件集合
*/
// @PreAuthorize("@ss.hasPermi('system:wdWdwh:list')")
@GetMapping("/getFileList")
public List<WdWdxx> getFileList(WdWdwh wdWdwh)
{
List<WdWdxx> list =wdWdwhService.getFileList(wdWdwh);
return list;
}
/**
* 开始分页
*
* @param list
* @param pageNum 页码
* @param pageSize 每页多少条数据
* @return
*/
public List<Map> startPage( List<Map> list, Integer pageNum, Integer pageSize) {
if(list == null){
return null;
}
if(list.size() == 0){
return null;
}
Integer count = list.size(); //记录总数
Integer pageCount = 0; //页数
if (count % pageSize == 0) {
pageCount = count / pageSize;
} else {
pageCount = count / pageSize + 1;
}
int fromIndex = 0; //开始索引
int toIndex = 0; //结束索引
if(pageNum > pageCount){
pageNum = pageCount;
}
if (!pageNum.equals(pageCount)) {
fromIndex = (pageNum - 1) * pageSize;
toIndex = fromIndex + pageSize;
} else {
fromIndex = (pageNum - 1) * pageSize;
toIndex = count;
}
List<Map> pageList = list.subList(fromIndex, toIndex);
return pageList;
}
/**
* 设置装备参数到 装备基础信息Map中
*/
private Map<String,Object> setZbcsTomMap(Map<String,Object> zb, List<Map> zbcsMapList) {
for (Map t : zbcsMapList) {
String csmc = String.valueOf(t.get("typeName"));
String csz = String.valueOf(t.get("num"));
String setValue = validateIsNull(csz) ? "" : csz;
zb.put(csmc, setValue);
}
return zb;
}
/**
* @Description 将map中的所有key转化为小写
*/
public static Map<String,Object> toLowerKey(Map<String, Object> map) {
Map<String,Object> resultMap = new HashMap<>();
Set<String> sets = map.keySet();
for (String key : sets) {
resultMap.put(key.toLowerCase(), map.get(key).toString());
}
return resultMap;
}
/**
* 重新校验空 需要特殊过滤 null 字符串
* 空值或者null 则返回 true
*/
private boolean validateIsNull(String v) {
if (StringUtils.isNotEmpty(v) && !"null".equals(v) && !"".equals(v)) {
return false;
}
return true;
}
}
qianhe-gzpt/src/main/java/com/qianhe/controller/WorkJdController.java → qianhe-ydsj/src/main/java/com/qianhe/controller/WdWdxxController.java
...@@ -2,6 +2,7 @@ package com.qianhe.controller; ...@@ -2,6 +2,7 @@ package com.qianhe.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;
...@@ -15,92 +16,89 @@ import com.qianhe.common.annotation.Log; ...@@ -15,92 +16,89 @@ import com.qianhe.common.annotation.Log;
import com.qianhe.common.core.controller.BaseController; import com.qianhe.common.core.controller.BaseController;
import com.qianhe.common.core.domain.AjaxResult; import com.qianhe.common.core.domain.AjaxResult;
import com.qianhe.common.enums.BusinessType; import com.qianhe.common.enums.BusinessType;
import com.qianhe.domain.WorkJd; import com.qianhe.domain.WdWdxx;
import com.qianhe.service.IWorkJdService; import com.qianhe.service.IWdWdxxService;
import com.qianhe.common.utils.poi.ExcelUtil; import com.qianhe.common.utils.poi.ExcelUtil;
import com.qianhe.common.core.page.TableDataInfo; import com.qianhe.common.core.page.TableDataInfo;
/** /**
* 节点Controller * 文档-文档信息Controller
* *
* @author qianhe * @author qianhe
* @date 2024-01-17 * @date 2024-02-28
*/ */
@RestController @RestController
@RequestMapping("/work/jd") @RequestMapping("/system/wdWdxx")
public class WorkJdController extends BaseController public class WdWdxxController extends BaseController
{ {
@Autowired @Autowired
private IWorkJdService workJdService; private IWdWdxxService wdWdxxService;
/** /**
* 查询节点列表 * 查询文档-文档信息列表
*/ */
@PreAuthorize("@ss.hasPermi('system:wdWdxx:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(WorkJd workJd) public TableDataInfo list(WdWdxx wdWdxx)
{ {
startPage(); startPage();
List<WorkJd> list = workJdService.selectWorkJdList(workJd); List<WdWdxx> list = wdWdxxService.selectWdWdxxList(wdWdxx);
return getDataTable(list); return getDataTable(list);
} }
/** /**
* 导出节点列表 * 导出文档-文档信息列表
*/ */
@Log(title = "节点", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:wdWdxx:export')")
@Log(title = "文档-文档信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, WorkJd workJd) public void export(HttpServletResponse response, WdWdxx wdWdxx)
{ {
List<WorkJd> list = workJdService.selectWorkJdList(workJd); List<WdWdxx> list = wdWdxxService.selectWdWdxxList(wdWdxx);
ExcelUtil<WorkJd> util = new ExcelUtil<WorkJd>(WorkJd.class); ExcelUtil<WdWdxx> util = new ExcelUtil<WdWdxx>(WdWdxx.class);
util.exportExcel(response, list, "节点数据"); util.exportExcel(response, list, "文档-文档信息数据");
} }
/** /**
* 获取节点详细信息 * 获取文档-文档信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('system:wdWdxx:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
return success(workJdService.selectWorkJdById(id)); return success(wdWdxxService.selectWdWdxxById(id));
} }
/** /**
* 新增节点 * 新增文档-文档信息
*/ */
@Log(title = "节点", businessType = BusinessType.INSERT) @PreAuthorize("@ss.hasPermi('system:wdWdxx:add')")
@Log(title = "文档-文档信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody WorkJd workJd) public AjaxResult add(@RequestBody WdWdxx wdWdxx)
{ {
return toAjax(workJdService.insertWorkJd(workJd)); return toAjax(wdWdxxService.insertWdWdxx(wdWdxx));
} }
/** /**
* 修改节点 * 修改文档-文档信息
*/ */
@Log(title = "节点", businessType = BusinessType.UPDATE) @PreAuthorize("@ss.hasPermi('system:wdWdxx:edit')")
@Log(title = "文档-文档信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody WorkJd workJd) public AjaxResult edit(@RequestBody WdWdxx wdWdxx)
{ {
return toAjax(workJdService.updateWorkJd(workJd)); return toAjax(wdWdxxService.updateWdWdxx(wdWdxx));
} }
/** /**
* 删除节点 * 删除文档-文档信息
*/ */
@Log(title = "节点", businessType = BusinessType.DELETE) @PreAuthorize("@ss.hasPermi('system:wdWdxx:remove')")
@Log(title = "文档-文档信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(workJdService.deleteWorkJdByIds(ids)); return toAjax(wdWdxxService.deleteWdWdxxByIds(ids));
} }
/**
* 用户下拉框
*/
@GetMapping("/getUserList")
public AjaxResult getUserList(){
return AjaxResult.success(workJdService.getUserList());
}
} }
qianhe-ydsj/src/main/java/com/qianhe/domain/WdLxwh.java 0 → 100644
package com.qianhe.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.qianhe.common.annotation.Excel;
import com.qianhe.common.core.domain.BaseEntity;
/**
* 文档-类型维护对象 wd_lxwh
*
* @author qianhe
* @date 2024-02-28
*/
public class WdLxwh extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 类型名称 */
@Excel(name = "类型名称")
private String name;
/** 录入人 */
@Excel(name = "录入人")
private String lrr;
/** 录入时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date lrsj;
/** 修改人 */
@Excel(name = "修改人")
private String xgr;
/** 修改时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date xgsj;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 预留1 */
@Excel(name = "预留1")
private String yl1;
/** 预留2 */
@Excel(name = "预留2")
private String yl2;
/** 预留3 */
@Excel(name = "预留3")
private String yl3;
/** 预留4 */
@Excel(name = "预留4")
private String yl4;
/** 预留5 */
@Excel(name = "预留5")
private String yl5;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setLrr(String lrr)
{
this.lrr = lrr;
}
public String getLrr()
{
return lrr;
}
public void setLrsj(Date lrsj)
{
this.lrsj = lrsj;
}
public Date getLrsj()
{
return lrsj;
}
public void setXgr(String xgr)
{
this.xgr = xgr;
}
public String getXgr()
{
return xgr;
}
public void setXgsj(Date xgsj)
{
this.xgsj = xgsj;
}
public Date getXgsj()
{
return xgsj;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
public void setYl1(String yl1)
{
this.yl1 = yl1;
}
public String getYl1()
{
return yl1;
}
public void setYl2(String yl2)
{
this.yl2 = yl2;
}
public String getYl2()
{
return yl2;
}
public void setYl3(String yl3)
{
this.yl3 = yl3;
}
public String getYl3()
{
return yl3;
}
public void setYl4(String yl4)
{
this.yl4 = yl4;
}
public String getYl4()
{
return yl4;
}
public void setYl5(String yl5)
{
this.yl5 = yl5;
}
public String getYl5()
{
return yl5;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("lrr", getLrr())
.append("lrsj", getLrsj())
.append("xgr", getXgr())
.append("xgsj", getXgsj())
.append("bz", getBz())
.append("yl1", getYl1())
.append("yl2", getYl2())
.append("yl3", getYl3())
.append("yl4", getYl4())
.append("yl5", getYl5())
.toString();
}
}
qianhe-ydsj/src/main/java/com/qianhe/domain/WdWdwh.java 0 → 100644
package com.qianhe.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.qianhe.common.annotation.Excel;
import com.qianhe.common.core.domain.BaseEntity;
/**
* 文档-文档维护对象 wd_wdwh
*
* @author qianhe
* @date 2024-02-28
*/
@Data
public class WdWdwh extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 年度 */
@Excel(name = "年度")
private String year;
/** 类型 */
@Excel(name = "类型")
private String typeId;
/** 类型 */
@Excel(name = "类型")
private String typeName;
/** 单位id */
@Excel(name = "单位id")
private String deptId;
/** 单位名称 */
@Excel(name = "单位名称")
private String deptName;
/** 二级单位 */
@Excel(name = "二级单位")
private String ejdeptId;
/** 二级单位名称 */
@Excel(name = "二级单位名称")
private String ejdeptName;
/** 文件关联id */
@Excel(name = "文件关联id")
private String fjId;
/** 录入人 */
@Excel(name = "录入人")
private String lrr;
/** 录入时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date lrsj;
/** 修改人 */
@Excel(name = "修改人")
private String xgr;
/** 修改时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date xgsj;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 预留1 */
@Excel(name = "预留1")
private String yl1;
/** 预留2 */
@Excel(name = "预留2")
private String yl2;
/** 预留3 */
@Excel(name = "预留3")
private String yl3;
/** 预留4 */
@Excel(name = "预留4")
private String yl4;
/** 预留5 */
@Excel(name = "预留5")
private String yl5;
//附件名称
private String fjmc;
//附件地址
private String fjdz;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date scsj;
/** 上传人 */
private String scr;
private String num;
private List<WdWdxx> fileList;
}
qianhe-ydsj/src/main/java/com/qianhe/domain/WdWdxx.java 0 → 100644
package com.qianhe.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.qianhe.common.annotation.Excel;
import com.qianhe.common.core.domain.BaseEntity;
/**
* 文档-文档信息对象 wd_wdxx
*
* @author qianhe
* @date 2024-02-28
*/
public class WdWdxx extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 关联id */
@Excel(name = "关联id")
private String glId;
/** 附件名称 */
@Excel(name = "附件名称")
private String fjmc;
/** 附件地址 */
@Excel(name = "附件地址")
private String fjdz;
/** 模块名称 */
@Excel(name = "模块名称")
private String mkmc;
/** 附件类型 */
@Excel(name = "附件类型")
private String fjlx;
/** 录入人 */
@Excel(name = "录入人")
private String lrr;
/** 录入时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "录入时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date lrsj;
/** 修改人 */
@Excel(name = "修改人")
private String xgr;
/** 修改时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date xgsj;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 预留1 */
@Excel(name = "预留1")
private String yl1;
/** 预留2 */
@Excel(name = "预留2")
private String yl2;
/** 预留3 */
@Excel(name = "预留3")
private String yl3;
/** 预留4 */
@Excel(name = "预留4")
private String yl4;
/** 预留5 */
@Excel(name = "预留5")
private String yl5;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setGlId(String glId)
{
this.glId = glId;
}
public String getGlId()
{
return glId;
}
public void setFjmc(String fjmc)
{
this.fjmc = fjmc;
}
public String getFjmc()
{
return fjmc;
}
public void setFjdz(String fjdz)
{
this.fjdz = fjdz;
}
public String getFjdz()
{
return fjdz;
}
public void setMkmc(String mkmc)
{
this.mkmc = mkmc;
}
public String getMkmc()
{
return mkmc;
}
public void setFjlx(String fjlx)
{
this.fjlx = fjlx;
}
public String getFjlx()
{
return fjlx;
}
public void setLrr(String lrr)
{
this.lrr = lrr;
}
public String getLrr()
{
return lrr;
}
public void setLrsj(Date lrsj)
{
this.lrsj = lrsj;
}
public Date getLrsj()
{
return lrsj;
}
public void setXgr(String xgr)
{
this.xgr = xgr;
}
public String getXgr()
{
return xgr;
}
public void setXgsj(Date xgsj)
{
this.xgsj = xgsj;
}
public Date getXgsj()
{
return xgsj;
}
public void setBz(String bz)
{
this.bz = bz;
}
public String getBz()
{
return bz;
}
public void setYl1(String yl1)
{
this.yl1 = yl1;
}
public String getYl1()
{
return yl1;
}
public void setYl2(String yl2)
{
this.yl2 = yl2;
}
public String getYl2()
{
return yl2;
}
public void setYl3(String yl3)
{
this.yl3 = yl3;
}
public String getYl3()
{
return yl3;
}
public void setYl4(String yl4)
{
this.yl4 = yl4;
}
public String getYl4()
{
return yl4;
}
public void setYl5(String yl5)
{
this.yl5 = yl5;
}
public String getYl5()
{
return yl5;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("glId", getGlId())
.append("fjmc", getFjmc())
.append("fjdz", getFjdz())
.append("mkmc", getMkmc())
.append("fjlx", getFjlx())
.append("lrr", getLrr())
.append("lrsj", getLrsj())
.append("xgr", getXgr())
.append("xgsj", getXgsj())
.append("bz", getBz())
.append("yl1", getYl1())
.append("yl2", getYl2())
.append("yl3", getYl3())
.append("yl4", getYl4())
.append("yl5", getYl5())
.toString();
}
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/WdLxwhMapper.java 0 → 100644
package com.qianhe.mapper;
import java.util.List;
import com.qianhe.domain.WdLxwh;
/**
* 文档-类型维护Mapper接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface WdLxwhMapper
{
/**
* 查询文档-类型维护
*
* @param id 文档-类型维护主键
* @return 文档-类型维护
*/
public WdLxwh selectWdLxwhById(Long id);
/**
* 查询文档-类型维护列表
*
* @param wdLxwh 文档-类型维护
* @return 文档-类型维护集合
*/
public List<WdLxwh> selectWdLxwhList(WdLxwh wdLxwh);
/**
* 新增文档-类型维护
*
* @param wdLxwh 文档-类型维护
* @return 结果
*/
public int insertWdLxwh(WdLxwh wdLxwh);
/**
* 修改文档-类型维护
*
* @param wdLxwh 文档-类型维护
* @return 结果
*/
public int updateWdLxwh(WdLxwh wdLxwh);
/**
* 删除文档-类型维护
*
* @param id 文档-类型维护主键
* @return 结果
*/
public int deleteWdLxwhById(Long id);
/**
* 批量删除文档-类型维护
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWdLxwhByIds(Long[] ids);
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/WdWdwhMapper.java 0 → 100644
package com.qianhe.mapper;
import java.util.List;
import java.util.Map;
import com.qianhe.domain.WdWdwh;
import com.qianhe.domain.WdWdxx;
/**
* 文档-文档维护Mapper接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface WdWdwhMapper
{
/**
* 查询文档-文档维护
*
* @param id 文档-文档维护主键
* @return 文档-文档维护
*/
public WdWdwh selectWdWdwhById(Long id);
/**
* 查询文档-文档维护列表
*
* @param wdWdwh 文档-文档维护
* @return 文档-文档维护集合
*/
public List<WdWdwh> selectWdWdwhList(WdWdwh wdWdwh);
/**
* 新增文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
public int insertWdWdwh(WdWdwh wdWdwh);
/**
* 修改文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
public int updateWdWdwh(WdWdwh wdWdwh);
/**
* 删除文档-文档维护
*
* @param id 文档-文档维护主键
* @return 结果
*/
public int deleteWdWdwhById(Long id);
/**
* 批量删除文档-文档维护
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWdWdwhByIds(Long[] ids);
List<WdWdwh> getListBySjDw(WdWdwh wdWdwh);
List<Map> getListBySjDwByType(WdWdwh wdWdwh);
List<WdWdwh> getListByEjDw(WdWdwh wdWdwh);
List<Map> getListByEjDwByType(WdWdwh wdWdwh);
List<WdWdxx> getFileList(WdWdwh wdWdwh);
}
qianhe-ydsj/src/main/java/com/qianhe/mapper/WdWdxxMapper.java 0 → 100644
package com.qianhe.mapper;
import java.util.List;
import com.qianhe.domain.WdWdxx;
import org.apache.ibatis.annotations.Param;
/**
* 文档-文档信息Mapper接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface WdWdxxMapper
{
/**
* 查询文档-文档信息
*
* @param id 文档-文档信息主键
* @return 文档-文档信息
*/
public WdWdxx selectWdWdxxById(Long id);
/**
* 查询文档-文档信息列表
*
* @param wdWdxx 文档-文档信息
* @return 文档-文档信息集合
*/
public List<WdWdxx> selectWdWdxxList(WdWdxx wdWdxx);
/**
* 新增文档-文档信息
*
* @param wdWdxx 文档-文档信息
* @return 结果
*/
public int insertWdWdxx(WdWdxx wdWdxx);
/**
* 修改文档-文档信息
*
* @param wdWdxx 文档-文档信息
* @return 结果
*/
public int updateWdWdxx(WdWdxx wdWdxx);
/**
* 删除文档-文档信息
*
* @param id 文档-文档信息主键
* @return 结果
*/
public int deleteWdWdxxById(Long id);
/**
* 批量删除文档-文档信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteWdWdxxByIds(Long[] ids);
int deleteWdWdxxByGlIdAndMkmc(@Param("id") String id,@Param("mkmc") String mkmc);
}
qianhe-ydsj/src/main/java/com/qianhe/service/IWdLxwhService.java 0 → 100644
package com.qianhe.service;
import java.util.List;
import com.qianhe.domain.WdLxwh;
/**
* 文档-类型维护Service接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface IWdLxwhService
{
/**
* 查询文档-类型维护
*
* @param id 文档-类型维护主键
* @return 文档-类型维护
*/
public WdLxwh selectWdLxwhById(Long id);
/**
* 查询文档-类型维护列表
*
* @param wdLxwh 文档-类型维护
* @return 文档-类型维护集合
*/
public List<WdLxwh> selectWdLxwhList(WdLxwh wdLxwh);
/**
* 新增文档-类型维护
*
* @param wdLxwh 文档-类型维护
* @return 结果
*/
public int insertWdLxwh(WdLxwh wdLxwh);
/**
* 修改文档-类型维护
*
* @param wdLxwh 文档-类型维护
* @return 结果
*/
public int updateWdLxwh(WdLxwh wdLxwh);
/**
* 批量删除文档-类型维护
*
* @param ids 需要删除的文档-类型维护主键集合
* @return 结果
*/
public int deleteWdLxwhByIds(Long[] ids);
/**
* 删除文档-类型维护信息
*
* @param id 文档-类型维护主键
* @return 结果
*/
public int deleteWdLxwhById(Long id);
}
qianhe-ydsj/src/main/java/com/qianhe/service/IWdWdwhService.java 0 → 100644
package com.qianhe.service;
import java.util.List;
import java.util.Map;
import com.qianhe.domain.WdWdwh;
import com.qianhe.domain.WdWdxx;
/**
* 文档-文档维护Service接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface IWdWdwhService
{
/**
* 查询文档-文档维护
*
* @param id 文档-文档维护主键
* @return 文档-文档维护
*/
public WdWdwh selectWdWdwhById(Long id);
/**
* 查询文档-文档维护列表
*
* @param wdWdwh 文档-文档维护
* @return 文档-文档维护集合
*/
public List<WdWdwh> selectWdWdwhList(WdWdwh wdWdwh);
/**
* 新增文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
public int insertWdWdwh(WdWdwh wdWdwh);
/**
* 修改文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
public int updateWdWdwh(WdWdwh wdWdwh);
/**
* 批量删除文档-文档维护
*
* @param ids 需要删除的文档-文档维护主键集合
* @return 结果
*/
public int deleteWdWdwhByIds(Long[] ids);
/**
* 删除文档-文档维护信息
*
* @param id 文档-文档维护主键
* @return 结果
*/
public int deleteWdWdwhById(Long id);
List<WdWdwh> getListBySjDw(WdWdwh wdWdwh);
List<Map> getListBySjDwByType(WdWdwh wdWdwh);
List<WdWdwh> getListByEjDw(WdWdwh wdWdwh);
List<Map> getListByEjDwByType(WdWdwh wdWdwh);
List<WdWdxx> getFileList(WdWdwh wdWdwh);
}
qianhe-ydsj/src/main/java/com/qianhe/service/IWdWdxxService.java 0 → 100644
package com.qianhe.service;
import java.util.List;
import com.qianhe.domain.WdWdxx;
/**
* 文档-文档信息Service接口
*
* @author qianhe
* @date 2024-02-28
*/
public interface IWdWdxxService
{
/**
* 查询文档-文档信息
*
* @param id 文档-文档信息主键
* @return 文档-文档信息
*/
public WdWdxx selectWdWdxxById(Long id);
/**
* 查询文档-文档信息列表
*
* @param wdWdxx 文档-文档信息
* @return 文档-文档信息集合
*/
public List<WdWdxx> selectWdWdxxList(WdWdxx wdWdxx);
/**
* 新增文档-文档信息
*
* @param wdWdxx 文档-文档信息
* @return 结果
*/
public int insertWdWdxx(WdWdxx wdWdxx);
/**
* 修改文档-文档信息
*
* @param wdWdxx 文档-文档信息
* @return 结果
*/
public int updateWdWdxx(WdWdxx wdWdxx);
/**
* 批量删除文档-文档信息
*
* @param ids 需要删除的文档-文档信息主键集合
* @return 结果
*/
public int deleteWdWdxxByIds(Long[] ids);
/**
* 删除文档-文档信息信息
*
* @param id 文档-文档信息主键
* @return 结果
*/
public int deleteWdWdxxById(Long id);
}
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkJdServiceImpl.java → qianhe-ydsj/src/main/java/com/qianhe/service/impl/WdLxwhServiceImpl.java
package com.qianhe.service.impl; package com.qianhe.service.impl;
import java.util.List; import java.util.List;
import java.util.Map;
import com.qianhe.common.utils.DateUtils;
import com.qianhe.common.utils.SecurityUtils; import com.qianhe.common.utils.SecurityUtils;
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.qianhe.mapper.WorkJdMapper; import com.qianhe.mapper.WdLxwhMapper;
import com.qianhe.domain.WorkJd; import com.qianhe.domain.WdLxwh;
import com.qianhe.service.IWorkJdService; import com.qianhe.service.IWdLxwhService;
/** /**
* 节点Service业务层处理 * 文档-类型维护Service业务层处理
* *
* @author qianhe * @author qianhe
* @date 2024-01-17 * @date 2024-02-28
*/ */
@Service @Service
public class WorkJdServiceImpl implements IWorkJdService public class WdLxwhServiceImpl implements IWdLxwhService
{ {
@Autowired @Autowired
private WorkJdMapper workJdMapper; private WdLxwhMapper wdLxwhMapper;
/** /**
* 查询节点 * 查询文档-类型维护
* *
* @param id 节点主键 * @param id 文档-类型维护主键
* @return 节点 * @return 文档-类型维护
*/ */
@Override @Override
public WorkJd selectWorkJdById(Long id) public WdLxwh selectWdLxwhById(Long id)
{ {
return workJdMapper.selectWorkJdById(id); return wdLxwhMapper.selectWdLxwhById(id);
} }
/** /**
* 查询节点列表 * 查询文档-类型维护列表
* *
* @param workJd 节点 * @param wdLxwh 文档-类型维护
* @return 节点 * @return 文档-类型维护
*/ */
@Override @Override
public List<WorkJd> selectWorkJdList(WorkJd workJd) public List<WdLxwh> selectWdLxwhList(WdLxwh wdLxwh)
{ {
return workJdMapper.selectWorkJdList(workJd); return wdLxwhMapper.selectWdLxwhList(wdLxwh);
} }
/** /**
* 新增节点 * 新增文档-类型维护
* *
* @param workJd 节点 * @param wdLxwh 文档-类型维护
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertWorkJd(WorkJd workJd) public int insertWdLxwh(WdLxwh wdLxwh)
{ {
workJd.setCreateBy(SecurityUtils.getUsername()); wdLxwh.setLrr(SecurityUtils.getUsername());
workJd.setCreateTime(DateUtils.getNowDate()); return wdLxwhMapper.insertWdLxwh(wdLxwh);
return workJdMapper.insertWorkJd(workJd);
} }
/** /**
* 修改节点 * 修改文档-类型维护
* *
* @param workJd 节点 * @param wdLxwh 文档-类型维护
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateWorkJd(WorkJd workJd) public int updateWdLxwh(WdLxwh wdLxwh)
{ {
workJd.setUpdateBy(SecurityUtils.getUsername()); wdLxwh.setXgr(SecurityUtils.getUsername());
workJd.setUpdateTime(DateUtils.getNowDate()); return wdLxwhMapper.updateWdLxwh(wdLxwh);
return workJdMapper.updateWorkJd(workJd);
} }
/** /**
* 批量删除节点 * 批量删除文档-类型维护
* *
* @param ids 需要删除的节点主键 * @param ids 需要删除的文档-类型维护主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteWorkJdByIds(Long[] ids) public int deleteWdLxwhByIds(Long[] ids)
{ {
return workJdMapper.deleteWorkJdByIds(ids); return wdLxwhMapper.deleteWdLxwhByIds(ids);
} }
/** /**
* 删除节点信息 * 删除文档-类型维护信息
* *
* @param id 节点主键 * @param id 文档-类型维护主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteWorkJdById(Long id) public int deleteWdLxwhById(Long id)
{ {
return workJdMapper.deleteWorkJdById(id); return wdLxwhMapper.deleteWdLxwhById(id);
}
/**
* 获取用户下拉框
* @return
*/
@Override
public List<Map<String, Object>> getUserList() {
return workJdMapper.getUserList();
}
@Override
public List<String> selectJdmcByUserId(Long userId) {
return workJdMapper.selectJdmcByUserId(userId);
} }
} }
qianhe-ydsj/src/main/java/com/qianhe/service/impl/WdWdwhServiceImpl.java 0 → 100644
package com.qianhe.service.impl;
import java.util.List;
import java.util.Map;
import com.qianhe.common.annotation.DataScope;
import com.qianhe.common.core.domain.entity.SysDept;
import com.qianhe.common.core.domain.entity.SysUser;
import com.qianhe.common.utils.SecurityUtils;
import com.qianhe.common.utils.StringUtils;
import com.qianhe.domain.WdLxwh;
import com.qianhe.domain.WdWdxx;
import com.qianhe.mapper.WdLxwhMapper;
import com.qianhe.mapper.WdWdxxMapper;
import com.qianhe.system.mapper.SysDeptMapper;
import com.qianhe.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.qianhe.mapper.WdWdwhMapper;
import com.qianhe.domain.WdWdwh;
import com.qianhe.service.IWdWdwhService;
/**
* 文档-文档维护Service业务层处理
*
* @author qianhe
* @date 2024-02-28
*/
@Service
public class WdWdwhServiceImpl implements IWdWdwhService
{
@Autowired
private WdWdwhMapper wdWdwhMapper;
@Autowired
private WdLxwhMapper wdLxwhMapper;
@Autowired
private WdWdxxMapper wdWdxxMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private SysDeptMapper sysDeptMapper;
/**
* 查询文档-文档维护
*
* @param id 文档-文档维护主键
* @return 文档-文档维护
*/
@Override
public WdWdwh selectWdWdwhById(Long id)
{
WdWdwh wdWdwh = wdWdwhMapper.selectWdWdwhById(id);
WdWdxx wdWdxx=new WdWdxx();
wdWdxx.setGlId(wdWdwh.getId().toString());
wdWdxx.setMkmc("文档维护");
wdWdxx.setFjlx(wdWdwh.getTypeName());
List<WdWdxx> wdWdxxes = wdWdxxMapper.selectWdWdxxList(wdWdxx);
wdWdwh.setFileList(wdWdxxes);
return wdWdwh;
}
/**
* 查询文档-文档维护列表
*
* @param wdWdwh 文档-文档维护
* @return 文档-文档维护
*/
@Override
@DataScope(deptAlias = "d")
public List<WdWdwh> selectWdWdwhList(WdWdwh wdWdwh)
{
List<WdWdwh> list = wdWdwhMapper.selectWdWdwhList(wdWdwh);
List<WdWdxx> wdxxList = wdWdxxMapper.selectWdWdxxList(new WdWdxx());
List<SysUser> userList = sysUserMapper.selectUserList(new SysUser());
list.forEach(item->{
//查询附件信息
WdWdxx wdWdxx = wdxxList.stream().filter(file -> item.getId().toString().equals(file.getGlId())).findFirst().orElse(null);
if(wdWdxx!=null){
item.setFjmc(wdWdxx.getFjmc());
item.setFjdz(wdWdxx.getFjdz());
item.setScsj(wdWdxx.getLrsj());
if(StringUtils.isNotEmpty(wdWdxx.getLrr())){
SysUser sysUser = userList.stream().filter(user -> user.getUserName().equals(wdWdxx.getLrr())).findFirst().orElse(null);
if(sysUser!=null){
item.setScr(sysUser.getNickName());
}
}
}
});
return list;
}
/**
* 新增文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
@Override
public int insertWdWdwh(WdWdwh wdWdwh)
{
List<WdLxwh> wdLxwhs = wdLxwhMapper.selectWdLxwhList(new WdLxwh());
List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
// 上传文件
if(wdWdwh.getFileList().size()>0){
wdWdwh.getFileList().forEach(file->{
//保存基础信息
//查询类型名称
if(StringUtils.isNotEmpty(wdWdwh.getTypeId())){
WdLxwh wdLxwh =wdLxwhs.stream().filter(type->type.getId().toString().equals(wdWdwh.getTypeId())).findFirst().orElse(null);
if(wdLxwh!=null){
wdWdwh.setTypeName(wdLxwh.getName());
}
}
//保存单位信息
wdWdwh.setDeptId(SecurityUtils.getDeptId().toString());
SysDept dept=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getDeptId())).findFirst().orElse(null);
if(dept!=null){
wdWdwh.setDeptName(dept.getDeptName());
wdWdwh.setEjdeptId(dept.getParentId()+"");
if(wdWdwh.getEjdeptId()!=null){
SysDept deptP=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getEjdeptId())).findFirst().orElse(null);
if(deptP!=null){
wdWdwh.setEjdeptName(deptP.getDeptName());
}
}
}
wdWdwh.setLrr(SecurityUtils.getUsername());
wdWdwhMapper.insertWdWdwh(wdWdwh);
file.setGlId(wdWdwh.getId().toString());
file.setMkmc("文档维护");
file.setFjlx(wdWdwh.getTypeName());
file.setLrr(SecurityUtils.getUsername());
wdWdxxMapper.insertWdWdxx(file);
});
}else {
//查询类型名称
if(StringUtils.isNotEmpty(wdWdwh.getTypeId())){
WdLxwh wdLxwh =wdLxwhs.stream().filter(type->type.getId().toString().equals(wdWdwh.getTypeId())).findFirst().orElse(null);
if(wdLxwh!=null){
wdWdwh.setTypeName(wdLxwh.getName());
}
}
//保存单位信息
wdWdwh.setDeptId(SecurityUtils.getDeptId().toString());
SysDept dept=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getDeptId())).findFirst().orElse(null);
if(dept!=null){
wdWdwh.setDeptName(dept.getDeptName());
wdWdwh.setEjdeptId(dept.getParentId()+"");
if(wdWdwh.getEjdeptId()!=null){
SysDept deptP=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getEjdeptId())).findFirst().orElse(null);
if(deptP!=null){
wdWdwh.setEjdeptName(deptP.getDeptName());
}
}
}
wdWdwh.setLrr(SecurityUtils.getUsername());
wdWdwhMapper.insertWdWdwh(wdWdwh);
}
return 1;
}
/**
* 修改文档-文档维护
*
* @param wdWdwh 文档-文档维护
* @return 结果
*/
@Override
public int updateWdWdwh(WdWdwh wdWdwh)
{
List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
//删除文件
wdWdxxMapper.deleteWdWdxxByGlIdAndMkmc(wdWdwh.getId()+"","文档维护");
//查询类型名称
if(StringUtils.isNotEmpty(wdWdwh.getTypeId())){
WdLxwh wdLxwh = wdLxwhMapper.selectWdLxwhById(Long.parseLong(wdWdwh.getTypeId()));
if(wdLxwh!=null){
wdWdwh.setTypeName(wdLxwh.getName());
}
}
//保存单位信息
wdWdwh.setDeptId(SecurityUtils.getDeptId().toString());
SysDept dept=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getDeptId())).findFirst().orElse(null);
if(dept!=null){
wdWdwh.setDeptName(dept.getDeptName());
wdWdwh.setEjdeptId(dept.getParentId()+"");
if(wdWdwh.getEjdeptId()!=null){
SysDept deptP=deptList.stream().filter(sysDept->sysDept.getDeptId().toString().equals(wdWdwh.getEjdeptId())).findFirst().orElse(null);
if(deptP!=null){
wdWdwh.setEjdeptName(deptP.getDeptName());
}
}
}
wdWdwh.setXgr(SecurityUtils.getUsername());
int i1 = wdWdwhMapper.updateWdWdwh(wdWdwh);
// 上传文件
for(int i=0;i<wdWdwh.getFileList().size();i++){
WdWdxx file=wdWdwh.getFileList().get(i);
if(i==0){
//更新第一个文件
file.setGlId(wdWdwh.getId().toString());
file.setMkmc("文档维护");
file.setFjlx(wdWdwh.getTypeName());
file.setLrr(SecurityUtils.getUsername());
wdWdxxMapper.insertWdWdxx(file);
continue;
}
//剩余文件改为新增
wdWdwhMapper.insertWdWdwh(wdWdwh);
file.setGlId(wdWdwh.getId().toString());
file.setMkmc("文档维护");
file.setFjlx(wdWdwh.getTypeName());
file.setLrr(SecurityUtils.getUsername());
wdWdxxMapper.insertWdWdxx(file);
}
return i1;
}
/**
* 批量删除文档-文档维护
*
* @param ids 需要删除的文档-文档维护主键
* @return 结果
*/
@Override
public int deleteWdWdwhByIds(Long[] ids)
{
return wdWdwhMapper.deleteWdWdwhByIds(ids);
}
/**
* 删除文档-文档维护信息
*
* @param id 文档-文档维护主键
* @return 结果
*/
@Override
public int deleteWdWdwhById(Long id)
{
return wdWdwhMapper.deleteWdWdwhById(id);
}
@Override
public List<WdWdwh> getListBySjDw(WdWdwh wdWdwh) {
return wdWdwhMapper.getListBySjDw(wdWdwh);
}
@Override
public List<Map> getListBySjDwByType(WdWdwh wdWdwh) {
return wdWdwhMapper.getListBySjDwByType(wdWdwh);
}
@Override
public List<WdWdwh> getListByEjDw(WdWdwh wdWdwh) {
return wdWdwhMapper.getListByEjDw(wdWdwh);
}
@Override
public List<Map> getListByEjDwByType(WdWdwh wdWdwh) {
return wdWdwhMapper.getListByEjDwByType(wdWdwh);
}
@Override
public List<WdWdxx> getFileList(WdWdwh wdWdwh) {
return wdWdwhMapper.getFileList(wdWdwh);
}
}
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkAccessoryServiceImpl.java → qianhe-ydsj/src/main/java/com/qianhe/service/impl/WdWdxxServiceImpl.java
package com.qianhe.service.impl; package com.qianhe.service.impl;
import java.util.List; import java.util.List;
import com.qianhe.common.utils.DateUtils;
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.qianhe.mapper.WorkAccessoryMapper; import com.qianhe.mapper.WdWdxxMapper;
import com.qianhe.domain.WorkAccessory; import com.qianhe.domain.WdWdxx;
import com.qianhe.service.IWorkAccessoryService; import com.qianhe.service.IWdWdxxService;
/** /**
* 附件信息Service业务层处理 * 文档-文档信息Service业务层处理
* *
* @author qianhe * @author qianhe
* @date 2024-01-17 * @date 2024-02-28
*/ */
@Service @Service
public class WorkAccessoryServiceImpl implements IWorkAccessoryService public class WdWdxxServiceImpl implements IWdWdxxService
{ {
@Autowired @Autowired
private WorkAccessoryMapper workAccessoryMapper; private WdWdxxMapper wdWdxxMapper;
/** /**
* 查询附件信息 * 查询文档-文档信息
* *
* @param id 附件信息主键 * @param id 文档-文档信息主键
* @return 附件信息 * @return 文档-文档信息
*/ */
@Override @Override
public WorkAccessory selectWorkAccessoryById(Long id) public WdWdxx selectWdWdxxById(Long id)
{ {
return workAccessoryMapper.selectWorkAccessoryById(id); return wdWdxxMapper.selectWdWdxxById(id);
} }
/** /**
* 查询附件信息列表 * 查询文档-文档信息列表
* *
* @param workAccessory 附件信息 * @param wdWdxx 文档-文档信息
* @return 附件信息 * @return 文档-文档信息
*/ */
@Override @Override
public List<WorkAccessory> selectWorkAccessoryList(WorkAccessory workAccessory) public List<WdWdxx> selectWdWdxxList(WdWdxx wdWdxx)
{ {
return workAccessoryMapper.selectWorkAccessoryList(workAccessory); return wdWdxxMapper.selectWdWdxxList(wdWdxx);
} }
/** /**
* 新增附件信息 * 新增文档-文档信息
* *
* @param workAccessory 附件信息 * @param wdWdxx 文档-文档信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertWorkAccessory(WorkAccessory workAccessory) public int insertWdWdxx(WdWdxx wdWdxx)
{ {
workAccessory.setCreateTime(DateUtils.getNowDate()); return wdWdxxMapper.insertWdWdxx(wdWdxx);
return workAccessoryMapper.insertWorkAccessory(workAccessory);
} }
/** /**
* 修改附件信息 * 修改文档-文档信息
* *
* @param workAccessory 附件信息 * @param wdWdxx 文档-文档信息
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateWorkAccessory(WorkAccessory workAccessory) public int updateWdWdxx(WdWdxx wdWdxx)
{ {
workAccessory.setUpdateTime(DateUtils.getNowDate()); return wdWdxxMapper.updateWdWdxx(wdWdxx);
return workAccessoryMapper.updateWorkAccessory(workAccessory);
} }
/** /**
* 批量删除附件信息 * 批量删除文档-文档信息
* *
* @param ids 需要删除的附件信息主键 * @param ids 需要删除的文档-文档信息主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteWorkAccessoryByIds(Long[] ids) public int deleteWdWdxxByIds(Long[] ids)
{ {
return workAccessoryMapper.deleteWorkAccessoryByIds(ids); return wdWdxxMapper.deleteWdWdxxByIds(ids);
} }
/** /**
* 删除附件信息信息 * 删除文档-文档信息信息
* *
* @param id 附件信息主键 * @param id 文档-文档信息主键
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteWorkAccessoryById(Long id) public int deleteWdWdxxById(Long id)
{ {
return workAccessoryMapper.deleteWorkAccessoryById(id); return wdWdxxMapper.deleteWdWdxxById(id);
} }
} }
qianhe-ydsj/src/main/resources/mapper/WdLxwhMapper.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.qianhe.mapper.WdLxwhMapper">
<resultMap type="WdLxwh" id="WdLxwhResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="lrr" column="lrr" />
<result property="lrsj" column="lrsj" />
<result property="xgr" column="xgr" />
<result property="xgsj" column="xgsj" />
<result property="bz" column="bz" />
<result property="yl1" column="yl1" />
<result property="yl2" column="yl2" />
<result property="yl3" column="yl3" />
<result property="yl4" column="yl4" />
<result property="yl5" column="yl5" />
</resultMap>
<sql id="selectWdLxwhVo">
select id, name, lrr, lrsj, xgr, xgsj, bz, yl1, yl2, yl3, yl4, yl5 from wd_lxwh
</sql>
<select id="selectWdLxwhList" parameterType="WdLxwh" resultMap="WdLxwhResult">
<include refid="selectWdLxwhVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="lrr != null and lrr != ''"> and lrr = #{lrr}</if>
<if test="lrsj != null "> and lrsj = #{lrsj}</if>
<if test="xgr != null and xgr != ''"> and xgr = #{xgr}</if>
<if test="xgsj != null "> and xgsj = #{xgsj}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if>
<if test="yl1 != null and yl1 != ''"> and yl1 = #{yl1}</if>
<if test="yl2 != null and yl2 != ''"> and yl2 = #{yl2}</if>
<if test="yl3 != null and yl3 != ''"> and yl3 = #{yl3}</if>
<if test="yl4 != null and yl4 != ''"> and yl4 = #{yl4}</if>
<if test="yl5 != null and yl5 != ''"> and yl5 = #{yl5}</if>
</where>
</select>
<select id="selectWdLxwhById" parameterType="Long" resultMap="WdLxwhResult">
<include refid="selectWdLxwhVo"/>
where id = #{id}
</select>
<insert id="insertWdLxwh" parameterType="WdLxwh" useGeneratedKeys="true" keyProperty="id">
insert into wd_lxwh
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="lrr != null">lrr,</if>
<if test="lrsj != null">lrsj,</if>
<if test="xgr != null">xgr,</if>
<if test="xgsj != null">xgsj,</if>
<if test="bz != null">bz,</if>
<if test="yl1 != null">yl1,</if>
<if test="yl2 != null">yl2,</if>
<if test="yl3 != null">yl3,</if>
<if test="yl4 != null">yl4,</if>
<if test="yl5 != null">yl5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="lrr != null">#{lrr},</if>
<if test="lrsj != null">#{lrsj},</if>
<if test="xgr != null">#{xgr},</if>
<if test="xgsj != null">#{xgsj},</if>
<if test="bz != null">#{bz},</if>
<if test="yl1 != null">#{yl1},</if>
<if test="yl2 != null">#{yl2},</if>
<if test="yl3 != null">#{yl3},</if>
<if test="yl4 != null">#{yl4},</if>
<if test="yl5 != null">#{yl5},</if>
</trim>
</insert>
<update id="updateWdLxwh" parameterType="WdLxwh">
update wd_lxwh
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="lrr != null">lrr = #{lrr},</if>
<if test="lrsj != null">lrsj = #{lrsj},</if>
<if test="xgr != null">xgr = #{xgr},</if>
<if test="xgsj != null">xgsj = #{xgsj},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="yl1 != null">yl1 = #{yl1},</if>
<if test="yl2 != null">yl2 = #{yl2},</if>
<if test="yl3 != null">yl3 = #{yl3},</if>
<if test="yl4 != null">yl4 = #{yl4},</if>
<if test="yl5 != null">yl5 = #{yl5},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWdLxwhById" parameterType="Long">
delete from wd_lxwh where id = #{id}
</delete>
<delete id="deleteWdLxwhByIds" parameterType="String">
delete from wd_lxwh where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
qianhe-ydsj/src/main/resources/mapper/WdWdwhMapper.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.qianhe.mapper.WdWdwhMapper">
<resultMap type="WdWdwh" id="WdWdwhResult">
<result property="id" column="id" />
<result property="year" column="year" />
<result property="typeId" column="type_id" />
<result property="typeName" column="type_name" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="fjId" column="fj_id" />
<result property="lrr" column="lrr" />
<result property="lrsj" column="lrsj" />
<result property="xgr" column="xgr" />
<result property="xgsj" column="xgsj" />
<result property="bz" column="bz" />
<result property="yl1" column="yl1" />
<result property="yl2" column="yl2" />
<result property="yl3" column="yl3" />
<result property="yl4" column="yl4" />
<result property="yl5" column="yl5" />
<result property="fjmc" column="fjmc" />
<result property="scsj" column="scsj" />
<result property="scr" column="scr" />
<result property="fjdz" column="fjdz" />
<result property="ejdeptId" column="ejdept_id" />
<result property="ejdeptName" column="ejdept_name" />
<result property="num" column="num" />
</resultMap>
<sql id="selectWdWdwhVo">
select a.id, year,
type_id, type_name,
a.dept_id, a.dept_name,
fj_id, a.lrr, a.lrsj,
a.xgr, a.xgsj, a.bz, a.yl1, a.yl2, a.yl3,
a.yl4, a.yl5, ejdept_id, ejdept_name
from wd_wdwh a
left join sys_dept d on a.dept_id = d.dept_id
</sql>
<select id="selectWdWdwhList" parameterType="WdWdwh" resultMap="WdWdwhResult">
<include refid="selectWdWdwhVo"/>
<where>
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="typeId != null and typeId != ''"> and type_id = #{typeId}</if>
<if test="typeName != null and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
<if test="deptId != null and deptId != ''"> and (d.dept_id = #{deptId} or find_in_set(#{deptId},ancestors)) </if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
<if test="fjId != null and fjId != ''"> and fj_id = #{fjId}</if>
<if test="lrr != null and lrr != ''"> and a.lrr = #{lrr}</if>
<if test="lrsj != null "> and a.lrsj = #{lrsj}</if>
<if test="xgr != null and xgr != ''"> and a.xgr = #{xgr}</if>
<if test="xgsj != null "> and a.xgsj = #{xgsj}</if>
<if test="bz != null and bz != ''"> and a.bz = #{bz}</if>
<if test="yl1 != null and yl1 != ''"> and a.yl1 = #{yl1}</if>
<if test="yl2 != null and yl2 != ''"> and a.yl2 = #{yl2}</if>
<if test="yl3 != null and yl3 != ''"> and a.yl3 = #{yl3}</if>
<if test="yl4 != null and yl4 != ''"> and a.yl4 = #{yl4}</if>
<if test="yl5 != null and yl5 != ''"> and a.yl5 = #{yl5}</if>
<if test="ejdeptId != null and ejdeptId != ''"> and ejdept_id = #{ejdeptId}</if>
<if test="ejdeptName != null and ejdeptName != ''"> and ejdept_name like concat('%', #{ejdeptName}, '%')</if>
${params.dataScope}
</where>
</select>
<select id="selectWdWdwhById" parameterType="Long" resultMap="WdWdwhResult">
select * from wd_wdwh
where id = #{id}
</select>
<select id="getListBySjDw" resultMap="WdWdwhResult">
select
a.id,
a.dept_id,
a.dept_name,
a.year
from wd_wdwh a
left join wd_lxwh b on a.type_id=b.id
left join sys_dept d on a.dept_id = d.dept_id
where 1=1
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="deptId != null and deptId != ''"> and (d.dept_id = #{deptId} or find_in_set(#{deptId},ancestors)) </if>
group by a.dept_id,year order by a.dept_id,year
</select>
<select id="getListBySjDwByType" resultType="java.util.Map">
select
a.id,
a.year year,
a.dept_id deptId,
a.type_id typeId,
a.type_name typeName,
count(xx.id) num
from wd_wdwh a
left join wd_lxwh b on a.type_id=b.id
left join sys_dept d on a.dept_id = d.dept_id
left join wd_wdxx xx on a.id=xx.gl_id
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="deptId != null and deptId != ''"> and (d.dept_id = #{deptId} or find_in_set(#{deptId},ancestors)) </if>
group by a.dept_id,year,type_id
</select>
<select id="getListByEjDw" resultMap="WdWdwhResult">
select
a.id,
a.ejdept_id ,
a.ejdept_name,
a.year
from wd_wdwh a
left join wd_lxwh b on a.type_id=b.id
left join sys_dept d on a.ejdept_id = d.dept_id
where 1=1
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="deptId != null and deptId != ''"> and (d.dept_id = #{deptId} or find_in_set(#{deptId},ancestors)) </if>
group by a.ejdept_id,year order by a.ejdept_id,year
</select>
<select id="getListByEjDwByType" resultType="java.util.Map">
select
a.id,
a.year year,
a.ejdept_id ejdeptId,
a.type_id typeId,
a.type_name typeName,
count(xx.id) num
from wd_wdwh a
left join wd_lxwh b on a.type_id=b.id
left join sys_dept d on a.ejdept_id = d.dept_id
left join wd_wdxx xx on a.id=xx.gl_id
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="deptId != null and deptId != ''"> and (d.dept_id = #{deptId} or find_in_set(#{deptId},ancestors)) </if>
group by a.ejdept_id,year,type_id
</select>
<select id="getFileList" resultType="com.qianhe.domain.WdWdxx">
select
a.*
from wd_wdxx a
left join wd_wdwh b on a.gl_id=b.id
where 1=1
<if test="typeName != null and typeName != ''"> and type_name =#{typeName}</if>
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId} </if>
<if test="ejdeptId != null and ejdeptId != ''"> and ejdept_id = #{ejdeptId}</if>
</select>
<insert id="insertWdWdwh" parameterType="WdWdwh" useGeneratedKeys="true" keyProperty="id">
insert into wd_wdwh
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="year != null">year,</if>
<if test="typeId != null">type_id,</if>
<if test="typeName != null">type_name,</if>
<if test="deptId != null">dept_id,</if>
<if test="deptName != null">dept_name,</if>
<if test="fjId != null">fj_id,</if>
<if test="lrr != null">lrr,</if>
<if test="lrsj != null">lrsj,</if>
<if test="xgr != null">xgr,</if>
<if test="xgsj != null">xgsj,</if>
<if test="bz != null">bz,</if>
<if test="yl1 != null">yl1,</if>
<if test="yl2 != null">yl2,</if>
<if test="yl3 != null">yl3,</if>
<if test="yl4 != null">yl4,</if>
<if test="yl5 != null">yl5,</if>
<if test="ejdeptId != null">ejdept_id,</if>
<if test="ejdeptName != null">ejdept_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="year != null">#{year},</if>
<if test="typeId != null">#{typeId},</if>
<if test="typeName != null">#{typeName},</if>
<if test="deptId != null">#{deptId},</if>
<if test="deptName != null">#{deptName},</if>
<if test="fjId != null">#{fjId},</if>
<if test="lrr != null">#{lrr},</if>
<if test="lrsj != null">#{lrsj},</if>
<if test="xgr != null">#{xgr},</if>
<if test="xgsj != null">#{xgsj},</if>
<if test="bz != null">#{bz},</if>
<if test="yl1 != null">#{yl1},</if>
<if test="yl2 != null">#{yl2},</if>
<if test="yl3 != null">#{yl3},</if>
<if test="yl4 != null">#{yl4},</if>
<if test="yl5 != null">#{yl5},</if>
<if test="ejdeptId != null">#{ejdeptId},</if>
<if test="ejdeptName != null">#{ejdeptName},</if>
</trim>
</insert>
<update id="updateWdWdwh" parameterType="WdWdwh">
update wd_wdwh
<trim prefix="SET" suffixOverrides=",">
<if test="year != null">year = #{year},</if>
<if test="typeId != null">type_id = #{typeId},</if>
<if test="typeName != null">type_name = #{typeName},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="deptName != null">dept_name = #{deptName},</if>
<if test="fjId != null">fj_id = #{fjId},</if>
<if test="lrr != null">lrr = #{lrr},</if>
<if test="lrsj != null">lrsj = #{lrsj},</if>
<if test="xgr != null">xgr = #{xgr},</if>
<if test="xgsj != null">xgsj = #{xgsj},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="yl1 != null">yl1 = #{yl1},</if>
<if test="yl2 != null">yl2 = #{yl2},</if>
<if test="yl3 != null">yl3 = #{yl3},</if>
<if test="yl4 != null">yl4 = #{yl4},</if>
<if test="yl5 != null">yl5 = #{yl5},</if>
<if test="ejdeptId != null">ejdept_id = #{ejdeptId},</if>
<if test="ejdeptName != null">ejdept_name = #{ejdeptName},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWdWdwhById" parameterType="Long">
delete from wd_wdwh where id = #{id}
</delete>
<delete id="deleteWdWdwhByIds" parameterType="String">
delete from wd_wdwh where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
qianhe-ydsj/src/main/resources/mapper/WdWdxxMapper.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.qianhe.mapper.WdWdxxMapper">
<resultMap type="WdWdxx" id="WdWdxxResult">
<result property="id" column="id" />
<result property="glId" column="gl_id" />
<result property="fjmc" column="fjmc" />
<result property="fjdz" column="fjdz" />
<result property="mkmc" column="mkmc" />
<result property="fjlx" column="fjlx" />
<result property="lrr" column="lrr" />
<result property="lrsj" column="lrsj" />
<result property="xgr" column="xgr" />
<result property="xgsj" column="xgsj" />
<result property="bz" column="bz" />
<result property="yl1" column="yl1" />
<result property="yl2" column="yl2" />
<result property="yl3" column="yl3" />
<result property="yl4" column="yl4" />
<result property="yl5" column="yl5" />
</resultMap>
<sql id="selectWdWdxxVo">
select id, gl_id, fjmc, fjdz, mkmc, fjlx, lrr, lrsj, xgr, xgsj, bz, yl1, yl2, yl3, yl4, yl5 from wd_wdxx
</sql>
<select id="selectWdWdxxList" parameterType="WdWdxx" resultMap="WdWdxxResult">
<include refid="selectWdWdxxVo"/>
<where>
<if test="glId != null and glId != ''"> and gl_id = #{glId}</if>
<if test="fjmc != null and fjmc != ''"> and fjmc = #{fjmc}</if>
<if test="fjdz != null and fjdz != ''"> and fjdz = #{fjdz}</if>
<if test="mkmc != null and mkmc != ''"> and mkmc = #{mkmc}</if>
<if test="fjlx != null and fjlx != ''"> and fjlx = #{fjlx}</if>
<if test="lrr != null and lrr != ''"> and lrr = #{lrr}</if>
<if test="lrsj != null "> and lrsj = #{lrsj}</if>
<if test="xgr != null and xgr != ''"> and xgr = #{xgr}</if>
<if test="xgsj != null "> and xgsj = #{xgsj}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if>
<if test="yl1 != null and yl1 != ''"> and yl1 = #{yl1}</if>
<if test="yl2 != null and yl2 != ''"> and yl2 = #{yl2}</if>
<if test="yl3 != null and yl3 != ''"> and yl3 = #{yl3}</if>
<if test="yl4 != null and yl4 != ''"> and yl4 = #{yl4}</if>
<if test="yl5 != null and yl5 != ''"> and yl5 = #{yl5}</if>
</where>
</select>
<select id="selectWdWdxxById" parameterType="Long" resultMap="WdWdxxResult">
<include refid="selectWdWdxxVo"/>
where id = #{id}
</select>
<insert id="insertWdWdxx" parameterType="WdWdxx" useGeneratedKeys="true" keyProperty="id">
insert into wd_wdxx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="glId != null">gl_id,</if>
<if test="fjmc != null">fjmc,</if>
<if test="fjdz != null">fjdz,</if>
<if test="mkmc != null">mkmc,</if>
<if test="fjlx != null and fjlx != ''">fjlx,</if>
<if test="lrr != null">lrr,</if>
<if test="lrsj != null">lrsj,</if>
<if test="xgr != null">xgr,</if>
<if test="xgsj != null">xgsj,</if>
<if test="bz != null">bz,</if>
<if test="yl1 != null">yl1,</if>
<if test="yl2 != null">yl2,</if>
<if test="yl3 != null">yl3,</if>
<if test="yl4 != null">yl4,</if>
<if test="yl5 != null">yl5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="glId != null">#{glId},</if>
<if test="fjmc != null">#{fjmc},</if>
<if test="fjdz != null">#{fjdz},</if>
<if test="mkmc != null">#{mkmc},</if>
<if test="fjlx != null and fjlx != ''">#{fjlx},</if>
<if test="lrr != null">#{lrr},</if>
<if test="lrsj != null">#{lrsj},</if>
<if test="xgr != null">#{xgr},</if>
<if test="xgsj != null">#{xgsj},</if>
<if test="bz != null">#{bz},</if>
<if test="yl1 != null">#{yl1},</if>
<if test="yl2 != null">#{yl2},</if>
<if test="yl3 != null">#{yl3},</if>
<if test="yl4 != null">#{yl4},</if>
<if test="yl5 != null">#{yl5},</if>
</trim>
</insert>
<update id="updateWdWdxx" parameterType="WdWdxx">
update wd_wdxx
<trim prefix="SET" suffixOverrides=",">
<if test="glId != null">gl_id = #{glId},</if>
<if test="fjmc != null">fjmc = #{fjmc},</if>
<if test="fjdz != null">fjdz = #{fjdz},</if>
<if test="mkmc != null">mkmc = #{mkmc},</if>
<if test="fjlx != null and fjlx != ''">fjlx = #{fjlx},</if>
<if test="lrr != null">lrr = #{lrr},</if>
<if test="lrsj != null">lrsj = #{lrsj},</if>
<if test="xgr != null">xgr = #{xgr},</if>
<if test="xgsj != null">xgsj = #{xgsj},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="yl1 != null">yl1 = #{yl1},</if>
<if test="yl2 != null">yl2 = #{yl2},</if>
<if test="yl3 != null">yl3 = #{yl3},</if>
<if test="yl4 != null">yl4 = #{yl4},</if>
<if test="yl5 != null">yl5 = #{yl5},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWdWdxxById" parameterType="Long">
delete from wd_wdxx where id = #{id}
</delete>
<delete id="deleteWdWdxxByIds" parameterType="String">
delete from wd_wdxx where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteWdWdxxByGlIdAndMkmc">
delete from wd_wdxx where gl_id = #{id} and mkmc=#{mkmc}
</delete>
</mapper>
\ No newline at end of file
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