Skip to content

Q
qianhe-ydsj
Commit 16c23897 by xuwenhao
Options

1.25问题修改

parent 8de0cb5b
Showing with 271 additions and 78 deletions
qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmController.java
package com.qianhe.controller; package com.qianhe.controller;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap; import java.util.stream.Collectors;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.qianhe.domain.WorkXmcb; import com.qianhe.domain.WorkXmcb;
...@@ -123,6 +121,7 @@ public class WorkXmController extends BaseController ...@@ -123,6 +121,7 @@ public class WorkXmController extends BaseController
public TableDataInfo getXmJdList(WorkXm workXm){ public TableDataInfo getXmJdList(WorkXm workXm){
//查询已提交的项目 //查询已提交的项目
workXm.setTjzt("1"); workXm.setTjzt("1");
startPage();
List<WorkXm> list = workXmService.selectWorkXmList(workXm); List<WorkXm> list = workXmService.selectWorkXmList(workXm);
return getDataTable(list); return getDataTable(list);
} }
...@@ -138,15 +137,38 @@ public class WorkXmController extends BaseController ...@@ -138,15 +137,38 @@ public class WorkXmController extends BaseController
WorkXmVo workXmVo = workXmService.getXmInfo(id); WorkXmVo workXmVo = workXmService.getXmInfo(id);
//查询审批历史 //查询审批历史
List<WorkXmcb> workXmcbs = workXmcbService.getspls(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<>(); List<Map<String,Object>> list = new ArrayList<>();
for (WorkXmcb workXmcb : workXmcbs) { for (WorkXmcb workXmcb : collect) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("jd",workXmcb.getShrlx()); if (workXmcb.getShzt().equals("同意") || workXmcb.getShzt().equals("符合条件")){
map.put("shsj",dateFormat.format(workXmcb.getShsj())); switch (workXmcb.getShrlx()){
list.add(map); case "0":
map.put("jd","压裂通知");
break;
case "1":
map.put("jd","采集设计");
break;
case "2":
map.put("jd","设计审核");
break;
case "3":
map.put("jd","现场勘查");
break;
default:
map.put("jd","");
break;
}
map.put("shsj",dateFormat.format(workXmcb.getShsj()));
list.add(map);
}
} }
ajaxResult.put("workXm",workXmVo); ajaxResult.put("workXm",workXmVo);
ajaxResult.put("spls",workXmcbs); // ajaxResult.put("spls",workXmcbs);
ajaxResult.put("jdck",list); ajaxResult.put("jdck",list);
return ajaxResult; return ajaxResult;
} }
...@@ -156,9 +178,43 @@ public class WorkXmController extends BaseController ...@@ -156,9 +178,43 @@ public class WorkXmController extends BaseController
*/ */
@GetMapping("/getGzlTjList") @GetMapping("/getGzlTjList")
public TableDataInfo getGzlTjList(WorkXmVo workXmVo){ public TableDataInfo getGzlTjList(WorkXmVo workXmVo){
//查询所有已提交的项目
workXmVo.setTjzt("1");
startPage(); startPage();
List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo); 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); return getDataTable(list);
// startPage();
// List<WorkXmTjVo> list = workXmService.getGzlTjList(workXmVo);
// return getDataTable(list);
} }
/** /**
......
qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmcbController.java
package com.qianhe.controller; package com.qianhe.controller;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.qianhe.common.utils.SecurityUtils;
import com.qianhe.service.IWorkJdService;
import com.qianhe.service.IWorkXmService; import com.qianhe.service.IWorkXmService;
import com.qianhe.vo.WorkXmVo; import com.qianhe.vo.WorkXmVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -37,14 +40,37 @@ public class WorkXmcbController extends BaseController ...@@ -37,14 +40,37 @@ public class WorkXmcbController extends BaseController
private IWorkXmcbService workXmcbService; private IWorkXmcbService workXmcbService;
@Autowired @Autowired
private IWorkXmService workXmService; private IWorkXmService workXmService;
@Autowired
private IWorkJdService workJdService;
/** /**
* 首页-待办已办 * 首页-待办已办
*/ */
@GetMapping("/taskList/{state}") @GetMapping("/taskList/{state}")
public TableDataInfo taskList(@PathVariable("state") String state, WorkXmVo workXmVo){ public TableDataInfo taskList(@PathVariable("state") String state, WorkXmVo workXmVo){
List<WorkXmVo> list = workXmcbService.taskList(state,workXmVo);
return getDataTable(list); //当前登录用户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);
} }
/** /**
......
qianhe-gzpt/src/main/java/com/qianhe/domain/WorkAccessory.java
...@@ -20,6 +20,8 @@ public class WorkAccessory extends BaseEntity ...@@ -20,6 +20,8 @@ public class WorkAccessory extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private int index;
/** 主键id */ /** 主键id */
private Long id; private Long id;
......
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmMapper.java
...@@ -32,7 +32,7 @@ public interface WorkXmMapper ...@@ -32,7 +32,7 @@ public interface WorkXmMapper
public List<WorkXm> selectWorkXmList(WorkXm workXm); public List<WorkXm> selectWorkXmList(WorkXm workXm);
/** /**
* 查询项目列表 * 查询项目工作量列表
* *
* @param workXmVo 项目 * @param workXmVo 项目
* @return 项目集合 * @return 项目集合
......
qianhe-gzpt/src/main/java/com/qianhe/mapper/WorkXmcbMapper.java
...@@ -83,4 +83,10 @@ public interface WorkXmcbMapper ...@@ -83,4 +83,10 @@ public interface WorkXmcbMapper
* 批量新增附件 * 批量新增附件
*/ */
int insertFile(List<WorkAccessory> list); 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/IWorkJdService.java
...@@ -67,4 +67,9 @@ public interface IWorkJdService ...@@ -67,4 +67,9 @@ public interface IWorkJdService
*/ */
List<Map<String,Object>> getUserList(); List<Map<String,Object>> getUserList();
/**
* 根据用户id查询节点名称
*/
List<String> selectJdmcByUserId(Long userId);
} }
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmService.java
...@@ -76,9 +76,17 @@ public interface IWorkXmService ...@@ -76,9 +76,17 @@ public interface IWorkXmService
WorkXmVo getXmInfo(Long id); WorkXmVo getXmInfo(Long id);
/** /**
* 工作量统计 * 工作量统计(仅导出功能使用)
* @param workXmVo * @param workXmVo
* @return * @return
*/ */
List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo); List<WorkXmTjVo> getGzlTjList(WorkXmVo workXmVo);
/**
* 查询项目工作量列表
*
* @param workXmVo 项目
* @return 项目集合
*/
public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo);
} }
qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmcbService.java
...@@ -60,13 +60,22 @@ public interface IWorkXmcbService ...@@ -60,13 +60,22 @@ public interface IWorkXmcbService
*/ */
public int deleteWorkXmcbById(Long id); public int deleteWorkXmcbById(Long id);
// /**
// * 首页-待办已办
// * @param state
// * @param workXmVo
// * @return
// */
// List<WorkXmVo> taskList(String state, WorkXmVo workXmVo);
/** /**
* 首页-待办已办 * 查询待办已办任务
* @param jdmc
* @param userId
* @param state * @param state
* @param workXmVo
* @return * @return
*/ */
List<WorkXmVo> taskList(String state, WorkXmVo workXmVo); List<WorkXmVo> taskList(Long userId, String state, List<String> jdmc,String jh);
/** /**
* 查询审批历史 * 查询审批历史
......
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkJdServiceImpl.java
...@@ -107,4 +107,9 @@ public class WorkJdServiceImpl implements IWorkJdService ...@@ -107,4 +107,9 @@ public class WorkJdServiceImpl implements IWorkJdService
public List<Map<String, Object>> getUserList() { public List<Map<String, Object>> getUserList() {
return workJdMapper.getUserList(); return workJdMapper.getUserList();
} }
@Override
public List<String> selectJdmcByUserId(Long userId) {
return workJdMapper.selectJdmcByUserId(userId);
}
} }
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmServiceImpl.java
...@@ -4,6 +4,8 @@ import java.util.ArrayList; ...@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.qianhe.common.utils.DateUtils; import com.qianhe.common.utils.DateUtils;
import com.qianhe.common.utils.SecurityUtils; 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.domain.WorkXmcb;
import com.qianhe.mapper.WorkXmcbMapper; import com.qianhe.mapper.WorkXmcbMapper;
import com.qianhe.vo.WorkXmTjVo; import com.qianhe.vo.WorkXmTjVo;
...@@ -68,6 +70,26 @@ public class WorkXmServiceImpl implements IWorkXmService ...@@ -68,6 +70,26 @@ public class WorkXmServiceImpl implements IWorkXmService
workXm.setDqjdmc("压裂通知"); workXm.setDqjdmc("压裂通知");
workXm.setCreateBy(SecurityUtils.getUsername()); workXm.setCreateBy(SecurityUtils.getUsername());
workXm.setCreateTime(DateUtils.getNowDate()); 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); return workXmMapper.insertWorkXm(workXm);
} }
...@@ -149,18 +171,42 @@ public class WorkXmServiceImpl implements IWorkXmService ...@@ -149,18 +171,42 @@ public class WorkXmServiceImpl implements IWorkXmService
WorkXmVo workXmVo = new WorkXmVo(); WorkXmVo workXmVo = new WorkXmVo();
BeanUtils.copyProperties(workXm,workXmVo); BeanUtils.copyProperties(workXm,workXmVo);
//查询监测设计图集合 //查询监测设计图集合
workXmVo.setJcsjtList(workXmMapper.selectFile(id,"项目-监测设计图")); List<WorkAccessory> workAccessories = workXmMapper.selectFile(id, "项目-监测设计图");
int a = 0;
for (WorkAccessory workAccessory : workAccessories) {
workAccessory.setIndex(a);
a ++;
}
workXmVo.setJcsjtList(workAccessories);
//查询布设坐标集合 //查询布设坐标集合
workXmVo.setBszbList(workXmMapper.selectFile(id,"项目-布设坐标")); List<WorkAccessory> workAccessories1 = workXmMapper.selectFile(id, "项目-布设坐标");
int b = 0;
for (WorkAccessory workAccessory : workAccessories1) {
workAccessory.setIndex(b);
b ++;
}
workXmVo.setBszbList(workAccessories1);
//查询试油工程设计集合 //查询试油工程设计集合
workXmVo.setSygcsjList(workXmMapper.selectFile(id,"项目-试油工程设计")); List<WorkAccessory> workAccessories2 = workXmMapper.selectFile(id, "项目-试油工程设计");
int c = 0;
for (WorkAccessory workAccessory : workAccessories2) {
workAccessory.setIndex(c);
c ++;
}
workXmVo.setSygcsjList(workAccessories2);
//查询其他附件集合 //查询其他附件集合
workXmVo.setQtList(workXmMapper.selectFile(id,"项目-其他附件")); List<WorkAccessory> workAccessories3 = workXmMapper.selectFile(id, "项目-其他附件");
int d = 0;
for (WorkAccessory workAccessory : workAccessories3) {
workAccessory.setIndex(d);
d ++;
}
workXmVo.setQtList(workAccessories3);
return workXmVo; return workXmVo;
} }
/** /**
* 工作量统计 * 工作量统计(仅导出功能使用)
* @param workXmVo * @param workXmVo
* @return * @return
*/ */
...@@ -198,4 +244,14 @@ public class WorkXmServiceImpl implements IWorkXmService ...@@ -198,4 +244,14 @@ public class WorkXmServiceImpl implements IWorkXmService
} }
return list; return list;
} }
/**
* 查看项目工作量列表
* @param workXmVo 项目
* @return
*/
@Override
public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo) {
return workXmMapper.selectWorkXmGzlList(workXmVo);
}
} }
qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmcbServiceImpl.java
...@@ -114,32 +114,37 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -114,32 +114,37 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
return workXmcbMapper.deleteWorkXmcbById(id); return workXmcbMapper.deleteWorkXmcbById(id);
} }
/**
* 首页-待办已办
* @param state // /**
* @param workXmVo // * 首页-待办已办
* @return // * @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 @Override
public List<WorkXmVo> taskList(String state, WorkXmVo workXmVo) { public List<WorkXmVo> taskList(Long userId, String state, List<String> jdmc, String jh) {
//当前登录用户id return workXmcbMapper.taskList(userId,state,jdmc,jh);
Long userId = SecurityUtils.getUserId();
//查询当前登录用户属于哪个节点的审批人
List<String> jds = workJdMapper.selectJdmcByUserId(userId);
if (jds.size() > 0){
//根据节点名称和用户id查询待办已办列表
List<WorkXmVo> list = workXmcbMapper.taskList(userId, state, jds,workXmVo.getJh());
//查询当前登陆人待办任务
if (state.equals("0")){
List<WorkXmVo> list1 = workXmcbMapper.userTaskList(userId);
if (list1.size() > 0 || list.size() > 0){
list1.addAll(list);
return list1;
}
}
return list;
}
return new ArrayList<>();
} }
/** /**
...@@ -215,6 +220,15 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -215,6 +220,15 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
if (StringUtils.isNull(workXmVo.getJcsjtList()) && StringUtils.isNull(workXmVo.getBszbList()) && StringUtils.isNull(workXmVo.getSygcsjList()) && StringUtils.isNull(workXmVo.getQtList())){ if (StringUtils.isNull(workXmVo.getJcsjtList()) && StringUtils.isNull(workXmVo.getBszbList()) && StringUtils.isNull(workXmVo.getSygcsjList()) && StringUtils.isNull(workXmVo.getQtList())){
throw new ServiceException("请上传附件!"); 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> jcsjtList = workXmVo.getJcsjtList();
//布设坐标集合 //布设坐标集合
...@@ -255,6 +269,9 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -255,6 +269,9 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
workXm.setId(id); workXm.setId(id);
workXm.setLczt("2"); workXm.setLczt("2");
workXm.setDqjdmc("设计审核"); workXm.setDqjdmc("设计审核");
if (StringUtils.isNotEmpty(workXmVo.getBz())){
workXm.setBz(workXmVo.getBz());
}
int num = workXmMapper.updateWorkXm(workXm); int num = workXmMapper.updateWorkXm(workXm);
//增加审批历史 //增加审批历史
WorkXmcb workXmcb = new WorkXmcb(); WorkXmcb workXmcb = new WorkXmcb();
...@@ -262,9 +279,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -262,9 +279,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
workXmcb.setShrId(SecurityUtils.getUserId()); workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate()); workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("1"); workXmcb.setShrlx("1");
workXmcb.setShzt("同意");
workXmcb.setWczt("1"); workXmcb.setWczt("1");
workXmcb.setYj("无");
workXmcb.setCreateBy(SecurityUtils.getUsername()); workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate()); workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb); workXmcbMapper.insertWorkXmcb(workXmcb);
...@@ -296,24 +311,24 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -296,24 +311,24 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
// String shzt = sysDictDataMapper.selectDictLabel("shzt", workXmVo.getShzt()); // String shzt = sysDictDataMapper.selectDictLabel("shzt", workXmVo.getShzt());
//判断审核人审核状态是否为退回 //判断审核人审核状态是否为退回
if (workXmVo.getShzt().equals("退回")){ if (workXmVo.getShzt().equals("退回")){
//修改该项目为第1节点 //修改该项目为第2节点
WorkXm workXm = new WorkXm(); WorkXm workXm = new WorkXm();
workXm.setId(id); workXm.setId(id);
workXm.setLczt("0"); workXm.setLczt("1");
workXm.setDqjdmc("压裂通知"); workXm.setDqjdmc("采集设计");
num = workXmMapper.updateWorkXm(workXm); num = workXmMapper.updateWorkXm(workXm);
//查询项目详情 //查询项目详情
WorkXm workXm1 = workXmMapper.selectWorkXmById(id); // WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
//增加审批历史 // //增加审批历史
WorkXmcb workXmcb = new WorkXmcb(); // WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id); // workXmcb.setYltzId(id);
workXmcb.setShrId(workXm1.getTbrId()); // workXmcb.setShrId(workXm1.getTbrId());
workXmcb.setShrlx("0"); // workXmcb.setShrlx("0");
workXmcb.setWczt("0"); // workXmcb.setWczt("0");
workXmcb.setSfsctj("0"); // workXmcb.setSfsctj("0");
workXmcb.setCreateBy(SecurityUtils.getUsername()); // workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate()); // workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb); // workXmcbMapper.insertWorkXmcb(workXmcb);
}else { }else {
//修改该项目为第四节点 //修改该项目为第四节点
WorkXm workXm = new WorkXm(); WorkXm workXm = new WorkXm();
...@@ -354,21 +369,21 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -354,21 +369,21 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
//修改该项目为第1节点 //修改该项目为第1节点
WorkXm workXm = new WorkXm(); WorkXm workXm = new WorkXm();
workXm.setId(id); workXm.setId(id);
workXm.setLczt("0"); workXm.setLczt("1");
workXm.setDqjdmc("压裂通知"); workXm.setDqjdmc("采集设计");
num = workXmMapper.updateWorkXm(workXm); num = workXmMapper.updateWorkXm(workXm);
//查询项目详情 // //查询项目详情
WorkXm workXm1 = workXmMapper.selectWorkXmById(id); // WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
//增加审批历史 // //增加审批历史
WorkXmcb workXmcb = new WorkXmcb(); // WorkXmcb workXmcb = new WorkXmcb();
workXmcb.setYltzId(id); // workXmcb.setYltzId(id);
workXmcb.setShrId(workXm1.getTbrId()); // workXmcb.setShrId(workXm1.getTbrId());
workXmcb.setShrlx("0"); // workXmcb.setShrlx("0");
workXmcb.setWczt("0"); // workXmcb.setWczt("0");
workXmcb.setSfsctj("0"); // workXmcb.setSfsctj("0");
workXmcb.setCreateBy(SecurityUtils.getUsername()); // workXmcb.setCreateBy(SecurityUtils.getUsername());
workXmcb.setCreateTime(DateUtils.getNowDate()); // workXmcb.setCreateTime(DateUtils.getNowDate());
workXmcbMapper.insertWorkXmcb(workXmcb); // workXmcbMapper.insertWorkXmcb(workXmcb);
}else { }else {
//修改该项目为第五节点（暂定为已完工） //修改该项目为第五节点（暂定为已完工）
WorkXm workXm = new WorkXm(); WorkXm workXm = new WorkXm();
...@@ -382,7 +397,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService ...@@ -382,7 +397,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
workXmcb.setYltzId(id); workXmcb.setYltzId(id);
workXmcb.setShrId(SecurityUtils.getUserId()); workXmcb.setShrId(SecurityUtils.getUserId());
workXmcb.setShsj(DateUtils.getNowDate()); workXmcb.setShsj(DateUtils.getNowDate());
workXmcb.setShrlx("2"); workXmcb.setShrlx("3");
workXmcb.setShzt(workXmVo.getShzt()); workXmcb.setShzt(workXmVo.getShzt());
workXmcb.setWczt("1"); workXmcb.setWczt("1");
if (StringUtils.isNotEmpty(workXmVo.getYj())){ if (StringUtils.isNotEmpty(workXmVo.getYj())){
......
qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
GROUP BY x.id
</select> </select>
<select id="userTaskList" resultType="com.qianhe.vo.WorkXmVo" parameterType="Long"> <select id="userTaskList" resultType="com.qianhe.vo.WorkXmVo" parameterType="Long">
...@@ -144,4 +145,8 @@ ...@@ -144,4 +145,8 @@
(0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.accessoryName}, #{item.createBy}, #{item.createTime}) (0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<delete id="deleteFileByBusinessId">
delete from work_accessory where business_id = #{businessId} and module_name = #{moduleName}
</delete>
</mapper> </mapper>
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