Skip to content

D
device-back
提交 a9ed218d authored 作者: 133's avatar 133
浏览文件
操作

[清退] 提交代码 1-25

上级 bce9059c
隐藏空白字符变更
内嵌 并排
正在显示 包含 173 行增加 和 46 行删除
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ a9ed218d
......@@ -61,6 +61,9 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
boolean existsAllByPackingIdInAndOwnUnitIn(List<Integer> packingIds,List<String> unitNames);
Integer countAllByModelAndOwnUnitIn(String model,List<String> unitNames);
List<DeviceLibrary> findAllByPackingIdInAndOwnUnit(List<Integer> packingIds,String unitNames);
List<DeviceLibrary> findAllByPackingIdInAndOwnUnitIn(List<Integer> packingIds,List<String> unitNames);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelQueryController.java
浏览文件 @ a9ed218d
......@@ -3,6 +3,7 @@ package com.tykj.dev.device.sendback.controller;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.sendback.entity.vo.DeviceIdLIstVo;
import com.tykj.dev.device.sendback.entity.vo.ModelAndTypeVo;
import com.tykj.dev.device.sendback.entity.vo.RepelManagementVo;
import com.tykj.dev.device.sendback.entity.vo.SendBackOutFormVo;
import com.tykj.dev.device.sendback.service.RepelQueryService;
import io.swagger.annotations.Api;
......@@ -61,19 +62,19 @@ public class RepelQueryController {
/**
* 待清退列表
*/
@GetMapping(value ="/toRepelList/{unitId}")
@PostMapping(value ="/toRepelList")
@ApiOperation(value = "待清退列表", notes = "待清退列表")
public ResponseEntity toRepelList(@PathVariable Integer unitId){
return ResponseEntity.ok(repelQueryService.toRepelList(unitId));
public ResponseEntity toRepelList(@RequestBody RepelManagementVo repelManagementVo){
return ResponseEntity.ok(repelQueryService.toRepelList(repelManagementVo));
}
/**
* 已清退列表
*/
@GetMapping(value ="/clearedList/{unitId}")
@ApiOperation(value = "已清退列表", notes = "待清退列表")
public ResponseEntity clearedList(@PathVariable Integer unitId){
return ResponseEntity.ok(repelQueryService.clearedList(unitId));
@PostMapping(value ="/clearedList")
@ApiOperation(value = "已清退列表", notes = "已清退列表")
public ResponseEntity clearedList(@RequestBody RepelManagementVo repelManagementVo){
return ResponseEntity.ok(repelQueryService.clearedList(repelManagementVo));
}
// /**
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java
浏览文件 @ a9ed218d
......@@ -80,7 +80,7 @@ public class DeviceRepel extends BaseEntity {
* 1。全量清退 2。部分清退
*/
@ApiModelProperty(value = "清退状态 1。全量清退 2。部分清退")
private Integer repelStatus;
private Integer repelStatus=1;
/**
* 发起人名称
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java
浏览文件 @ a9ed218d
......@@ -226,6 +226,10 @@ public class DeviceRepelDetail extends BaseEntity {
@Column(name = "auditing_feedback",columnDefinition = "TEXT")
private String auditingFeedback;
@ApiModelProperty(value = "清退状态",name = "1.清退中，2.清退完成")
private Integer repelStatus;
@Transient
@ApiModelProperty(value = "装备List")
private List<DeviceLibrary> deviceLibraryEntities =new ArrayList<>();
......@@ -234,4 +238,6 @@ public class DeviceRepelDetail extends BaseEntity {
@ApiModelProperty(value = "清退单对象")
private List<FileRet> billFiles ;
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DevRepelVo.java
浏览文件 @ a9ed218d
package com.tykj.dev.device.sendback.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author zjm
* @version 1.0.0
......@@ -17,13 +20,34 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@ApiModel("清退管理-统计点击列表对象")
public class DevRepelVo {
/**
* 数据id
*/
private Integer id;
/**
* 名称
*/
private String name;
/**
* 类型
*/
private String model;
/**
* 装备序列号
*/
private String code;
/**
* 形态
*/
private Integer type;
/**
* 清退时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date repelTime;
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/RepelManagementVo.java 0 → 100644
浏览文件 @ a9ed218d
package com.tykj.dev.device.sendback.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author zjm
* @version 1.0.0
* @ClassName RepelManagementVo.java
* @Description 清退管理 清退清退vo
* @createTime 2021年01月23日 12:42:00
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("清退管理 清退清退vo")
public class RepelManagementVo {
@ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
private Long time;
@ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
private Long endTime;
@ApiModelProperty(name = "单位id")
private Integer unitId;
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/DeviceRepelDetailDao.java
浏览文件 @ a9ed218d
......@@ -4,5 +4,9 @@ import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.Date;
import java.util.List;
public interface DeviceRepelDetailDao extends JpaRepository<DeviceRepelDetail, Integer>, JpaSpecificationExecutor<DeviceRepelDetail> {
List<DeviceRepelDetail> findAllBySendTimeBetweenAndSendUnitIdAndRepelStatus(Date time,Date endTime, Integer unitId, Integer repelStatus);
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/DeviceRepelDetailService.java
浏览文件 @ a9ed218d
package com.tykj.dev.device.sendback.service;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
import java.util.Date;
import java.util.List;
public interface DeviceRepelDetailService {
......@@ -26,4 +28,9 @@ public interface DeviceRepelDetailService {
DeviceRepelDetail findDeviceRepelDetailNoDev(Integer repelDetailId);
List<DeviceRepelDetail> findAll();
/**
* 根据年份以及单位 查询清退的装备列表
*/
List<DeviceLibrary> findYearAndUnitToDeviceList(Date time,Date endTime,Integer unitId);
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelQueryService.java
浏览文件 @ a9ed218d
......@@ -44,7 +44,7 @@ public interface RepelQueryService {
/**
* 待清退列表 省
*/
List<ModelNameGroup> toRepelList(Integer unitId);
List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo);
/**
......@@ -55,7 +55,7 @@ public interface RepelQueryService {
/**
* 已清退列表
*/
List<ModelNameGroup> clearedList(Integer unitId);
List<ModelNameGroup> clearedList(RepelManagementVo repelManagementVo);
/**
*省直属任务装备查询接口 （无用）
......@@ -69,7 +69,6 @@ public interface RepelQueryService {
List<DirectlyUnderNavigation> directlyUnderUnitLeftNavigation(Integer taskId);
/**
*省直属任务装备已选择装备列表接口
*/
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java
浏览文件 @ a9ed218d
......@@ -11,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -69,6 +66,17 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
return deviceRepelDetailDao.findAll();
}
@Override
public List<DeviceLibrary> findYearAndUnitToDeviceList(Date time,Date endTime,Integer unitId) {
List<DeviceLibrary> libraries=new ArrayList<>();
deviceRepelDetailDao.findAllBySendTimeBetweenAndSendUnitIdAndRepelStatus(time,endTime,unitId,2).forEach(
deviceRepelDetail -> {
libraries.addAll(findInvoleDevice(deviceRepelDetail.getDeviceIds()));
}
);
return libraries;
}
private List<DeviceLibrary> findInvoleDevice(String involeDevice){
if (involeDevice!=null && !involeDevice.equals(",") ) {
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ a9ed218d
......@@ -93,6 +93,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
User user = userService.findByUser(userId);
Units units=unitsService.findById(user.getUnitsId());
Area area=areaService.findByid(units.getAreaId());
List<String> directlUnderUnitNames=new ArrayList<>();
AtomicBoolean directlUnderUnit= new AtomicBoolean(false);
AtomicBoolean correspondingLevel= new AtomicBoolean(false);
deviceRepel.setFielding(StringUtils.ListToString(deviceRepel.getFieldingIds()));
......@@ -108,6 +109,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
//写入业务日志
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= statsXTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
// repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
List<RepelTaskStatistical> list=new ArrayList<>();
......@@ -121,7 +123,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
if (unisId != units.getUnitId()) {
Units units1 = unitsService.findById(unisId);
if (units1.getType() == 2) {
directlUnderUnit.set(deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitsService.findBySubordinateUnitName(units1.getUnitId())));
directlUnderUnit.set(true);
directlUnderUnitNames.add(units1.getName());
} else if (units1.getType() == 1) {
Area area1 = areaService.findByid(units1.getAreaId());
deviceRepelDetail.setSendUnit(units1.getName());
......@@ -129,7 +132,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setId(null);
if (deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitsService.findBySubordinateUnitName(units1.getUnitId()))) {
TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), model, ""));
Set<ModelCount> modelCounts1=modelCounts;
if (deviceRepel.getRepelStatus()==1){
deviceRepel.getModels().forEach(i->{
modelCounts1.add(new ModelCount(i,deviceLibraryDao.countAllByModelAndOwnUnitIn(i,unitsService.findBySubordinateUnitName(units1.getUnitId()))));
});
}
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), JacksonUtil.toJSon(modelCounts1), ""));
}
}
}else {
......@@ -141,17 +150,23 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setSendUnitId(units.getUnitId());
deviceRepelDetail.setSendUnit(units.getName());
deviceRepelDetail.setId(null);
if (directlUnderUnit.get()){
TaskBto taskBto2 = directlyUnderTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId());
list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto2.getId(),0,"省直属",model,""));
}
if (directlUnderUnit.get()&&deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), directlUnderUnitNames)){
deviceRepel.getModels().forEach(i->{
modelCounts.add(new ModelCount(i,deviceLibraryDao.countAllByModelAndOwnUnitIn(i,directlUnderUnitNames)));
});
TaskBto taskBto2 = directlyUnderTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto2.getId(), 0, "省直属", JacksonUtil.toJSon(modelCounts), ""));
}
deviceRepelDetail.setId(null);
List<String> strings=new ArrayList<>();
strings.add(units.getName());
if (correspondingLevel.get()&&deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(),strings)){
TaskBto taskBto1 = oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId());
list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",model,""));
deviceRepel.getModels().forEach(i->{
modelCounts.add(new ModelCount(i,deviceLibraryDao.countAllByModelAndOwnUnitIn(i,strings)));
});
TaskBto taskBto1 = oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",JacksonUtil.toJSon(modelCounts),""));
}
repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
......@@ -175,13 +190,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= cityTotalTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
// repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
Set<ModelCount> modelCounts=new HashSet<>();
deviceRepel.getModels().forEach(i->{
modelCounts.add(new ModelCount(i,0));
});
String model=JacksonUtil.toJSon(modelCounts);
List<RepelTaskStatistical> list=new ArrayList<>();
deviceRepel.getTaskScopes().forEach(
unisId-> {
......@@ -191,9 +206,16 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setId(null);
deviceRepelDetail.setSendUnit(units1.getName());
deviceRepelDetail.setSendUnitId(units1.getUnitId());
if (deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitsService.findBySubordinateUnitName(units1.getUnitId()))) {
List<String> unitNames= unitsService.findBySubordinateUnitName(units1.getUnitId());
if (deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitNames)) {
Set<ModelCount> modelCounts1=modelCounts;
if (deviceRepel.getRepelStatus()==1) {
deviceRepel.getModels().forEach(i -> {
modelCounts1.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitIn(i, unitNames)));
});
}
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), model, ""));
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), JacksonUtil.toJSon(modelCounts1), ""));
}
}
......@@ -218,6 +240,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepel deviceRepel1= deviceRepelService.saveDeviceRepel(deviceRepel);
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= cityInitiateTask(unitsFather.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
// repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
// Set<ModelCount> modelCounts=new HashSet<>();
......@@ -410,6 +433,7 @@ log.info("存储结束{}",System.currentTimeMillis()-time1);
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
deviceRepelDetail.setInFile(FilesUtil.stringFileToList(storageDeviceRepel.getInFiles()));
taskService.moveToEnd(taskBto);
deviceRepelDetail.setRepelStatus(2);
//判断是否为 市提交 是则为在库
//否则为待清退
Integer inStock;
......@@ -453,6 +477,7 @@ log.info("存储结束{}",System.currentTimeMillis()-time1);
TaskBto taskBto= taskService.get(taskId);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
deviceRepelDetail.setRepelStatus(2);
taskService.moveToEnd(taskBto);
StringBuffer ids=new StringBuffer();
List<DeviceLibrary> libraries= deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(storageDeviceRepel.getDeviceIds());
......@@ -623,10 +648,10 @@ log.info("存储结束{}",System.currentTimeMillis()-time1);
* @param parentTaskId 上级taskid
* @return TaskBto
*/
private TaskBto directlyUnderTask(Integer unitId, Integer repelDetailId, Integer parentTaskId){
private TaskBto directlyUnderTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
List<Integer> list=new ArrayList<>();
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1202.id, "直属单位清退任务", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1202.id, title+"直属单位", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
}
/**
......@@ -636,10 +661,10 @@ log.info("存储结束{}",System.currentTimeMillis()-time1);
* @param parentTaskId
* @return
*/
private TaskBto oneselfTask(Integer unitId, Integer repelDetailId, Integer parentTaskId){
private TaskBto oneselfTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
List<Integer> list=new ArrayList<>();
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1203.id, "省本级装备清退", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1203.id, title+"省本级", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
}
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ a9ed218d
package com.tykj.dev.device.sendback.service.impl;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
......@@ -21,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.persistence.Id;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
......@@ -96,9 +99,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
@Override
public List<ModelNameGroup> toRepelList(Integer unitId) {
Units units= unitsService.findById(unitId);
return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15));
public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) {
Units units= unitsService.findById(repelManagementVo.getUnitId());
return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime()).collect(Collectors.toList()));
}
private List<ModelNameGroup> toModelNameGroup(List<DeviceLibrary> deviceLibraries){
......@@ -145,9 +148,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override
public List<ModelNameGroup> clearedList(Integer unitId) {
return toModelNameGroup(deviceUnitService.findHasRepel(unitId));
public List<ModelNameGroup> clearedList(RepelManagementVo repelManagementVo) {
new Date(repelManagementVo.getTime());
return toModelNameGroup(repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId()));
}
@Override
......@@ -204,7 +207,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
private DevRepelVo devRepelVo(DeviceLibrary deviceLibrary){
return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType());
return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType(),deviceLibrary.getUpdateTime());
}
private List<DeviceLibrary> findInvoleDevice(String involeDevice){
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandover.java
浏览文件 @ a9ed218d
......@@ -36,12 +36,22 @@ public class WorkHandover {
/**
* 交接人
*/
private Integer handoverUserId;
private Integer handoverUserAId;
/**
* 移交人
* 交接人b
*/
private Integer turnOverUserId;
private Integer handoverUserBId;
/**
* 移交人a
*/
private Integer turnOverUserAId;
/**
* 移交人b
*/
private Integer turnOverUserBId;
/**
* 监交人
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverAddVo.java
浏览文件 @ a9ed218d
......@@ -22,17 +22,22 @@ public class WorkHandoverAddVo {
/**
* 交接人
*/
private Integer handoverUserId;
private Integer handoverUserAId;
/**
* 移交人
* 交接人b
*/
private Integer turnOverUserId;
private Integer handoverUserBId;
/**
* 监交人
* 移交人a
*/
private String inUserName;
private Integer turnOverUserAId;
/**
* 移交人b
*/
private Integer turnOverUserBId;
public WorkHandover toWorkHandover() {
......
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java
浏览文件 @ a9ed218d
......@@ -77,7 +77,7 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
workHandover.setFileLists(JacksonUtil.toJSon(workHandoverEndAddVo.getFileLists()));
workHandover = workHandoverDao.save(workHandover);
//把移交人的所有代办任务和跟踪任务替换名称，换成交接人
taskService.workHandover(workHandover.getHandoverUserId(), workHandover.getTurnOverUserId());
taskService.workHandover(workHandover.getHandoverUserAId(), workHandover.getTurnOverUserAId());
//推入完结状态
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id);
taskService.moveToEnd(taskBto);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论