Skip to content

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

[销毁 报废] bug修改

上级 232772df
隐藏空白字符变更
内嵌 并排
正在显示 包含 245 行增加 和 82 行删除
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/controller/DecommissioningDevController.java
浏览文件 @ f8e0244d
......@@ -50,9 +50,9 @@ public class DecommissioningDevController {
* 出库把任务推送至盖章审核
*/
@ApiOperation(value = "出库把任务推送至盖章审核", notes = "出库把任务推送至盖章审核")
@PostMapping(value ="/sealOfAudit/{userId}/{taskId}")
public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody DecommissioningOrderOutData orderOutData, @PathVariable Integer taskId){
deviceDecommissioningBusinessService.sealOfAudit(taskId,userId,orderOutData);
@PostMapping(value ="/sealOfAudit/{userId}")
public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody DecommissioningOrderOutData orderOutData){
deviceDecommissioningBusinessService.sealOfAudit(userId,orderOutData);
return ResponseEntity.ok("退役任务保存草稿成功");
}
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/DeviceDecommissioningBusinessService.java
浏览文件 @ f8e0244d
......@@ -37,7 +37,7 @@ public interface DeviceDecommissioningBusinessService {
/**
* 出库把任务推送至盖章审核
*/
void sealOfAudit(Integer taskId,Integer userId,DecommissioningOrderOutData orderOutData);
void sealOfAudit(Integer userId,DecommissioningOrderOutData orderOutData);
/**
* 出库盖章审核调用
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java
浏览文件 @ f8e0244d
......@@ -93,9 +93,11 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
}
);
if (decommissioningOrderOutData.getTaskId()==null){
DeviceDecommissioningDetail deviceDestroyBill1=deviceDecommissioningDetailService.findApplyId(decommissioningOrderOutData.getApplyId());
if (deviceDestroyBill1!=null){
deviceDecommissioningDetail.setId(deviceDestroyBill1.getId());
if (decommissioningOrderOutData.getApplyId()!=null) {
DeviceDecommissioningDetail deviceDestroyBill1 = deviceDecommissioningDetailService.findApplyId(decommissioningOrderOutData.getApplyId());
if (deviceDestroyBill1 != null) {
deviceDecommissioningDetail.setId(deviceDestroyBill1.getId());
}
}
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
......@@ -106,6 +108,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
DeviceDecommissioningDetail deviceDecommissioningDetail1 = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
deviceDecommissioningDetail.setId(deviceDecommissioningDetail1.getId());
}
deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(decommissioningOrderOutData.getScriptSaveVos()));
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
......@@ -147,6 +151,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
addMessage(new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "发起退役任务,待上传回执单据", gainThisUser(user.getUserId(), user.getUnitsId())));
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
}
deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
deviceDecommissioningDetail.setDeviceIds(StringUtils.ListToString(decommissioningOrderOutData.getDevIds()));
deviceDecommissioningDetail.setOutboundFile(FilesUtil.stringFileToList(decommissioningOrderOutData.getOutboundFileList()));
deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
......@@ -202,22 +208,24 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
}
@Override
public void sealOfAudit(Integer taskId, Integer userId, DecommissioningOrderOutData orderOutData) {
public void sealOfAudit(Integer userId, DecommissioningOrderOutData orderOutData) {
DeviceDecommissioningDetail deviceDecommissioningDetail =new DeviceDecommissioningDetail();
User user = userService.findByUser(orderOutData.getSendUserbId());
Units units=unitsService.findById(user.getUnitsId());
if (taskId==null){
if (orderOutData.getTaskId()==null){
deviceDecommissioningDetail = orderOutData.toDeviceDecommissioningDetail();
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
sealOfAuditTask(units.getUnitId(), deviceDecommissioningDetail.getId(),orderOutData.getSendUserbId());
}else {
TaskBto taskBto = taskService.get(taskId);
TaskBto taskBto = taskService.get(orderOutData.getTaskId());
List<StatusEnum> statusEnums = new ArrayList<>();
statusEnums.add(StatusEnum.DECOMMISSIONING_1250);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
taskService.moveToSpecial(taskBto, StatusEnum.DECOMMISSIONING_1251, orderOutData.getSendUserbId());
}
deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(orderOutData.getReplyFileList()));
deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(orderOutData.getApplyFileList()));
deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(orderOutData.getScriptSaveVos()));
deviceDecommissioningDetail.setScripts(orderOutData.getScriptSaveVos());
deviceDecommissioningDetail.setSenderUserB(user.getName());
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java
浏览文件 @ f8e0244d
......@@ -9,6 +9,7 @@ import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.StringSplitUtil;
import lombok.extern.slf4j.Slf4j;
......@@ -55,6 +56,17 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
deviceDecommissioningDetail.setBillFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getBillFile()));
deviceDecommissioningDetail.setOutboundFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getOutboundFile()));
deviceDecommissioningDetail.setInFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getInFile()));
deviceDecommissioningDetail.setReplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getReplyFiles()));
deviceDecommissioningDetail.setApplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getApplyFiles()));
List<String> seqNumbers=new ArrayList<>();
JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
scriptSaveVo -> {
if (scriptSaveVo.getSeqNumber()!=null){
seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
}
}
);
deviceDecommissioningDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
return deviceDecommissioningDetail;
}else {
log.info("[退役] 详情查看错误，id没有找到{}",decommissioningId);
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java
浏览文件 @ f8e0244d
package com.tykj.dev.device.destroy.entity.domain;
import com.tykj.dev.device.file.entity.FileRet;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
import com.tykj.dev.misc.base.BaseEntity;
import io.swagger.annotations.ApiModel;
......@@ -97,6 +98,10 @@ public class DeviceDestroyBill extends BaseEntity {
@Transient
private List<FileRet> replayFileList;
@Transient
@ApiModelProperty(value = "装备List")
private List<DeviceLibrary> deviceLibraryEntities =new ArrayList<>();
@ApiModelProperty(value = "销毁文件集合")
@Transient
private List<FileRet> destructionFileList;
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java
浏览文件 @ f8e0244d
......@@ -7,19 +7,24 @@ import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
import com.tykj.dev.device.file.entity.FileRet;
import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
import com.tykj.dev.device.user.subject.service.UnitsService;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
......@@ -44,6 +49,9 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
@Autowired
private BlockChainUtil blockChainUtil;
@Autowired
DeviceLibraryDao deviceLibraryDao;
@Override
public DeviceDestroyBill saveDeviceDestroyBill(DeviceDestroyBill scrap) {
......@@ -60,6 +68,15 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
deviceDestroyBill.setDestructionFileList(FilesUtil.stringFileToList(deviceDestroyBill.getDestructionFiles()));
deviceDestroyBill.setReplayFileList(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFiles()));
deviceDestroyBill.setUnitName(unitsService.findById(deviceDestroyBill.getUnitId()).getName());
List<String> seqNumbers=new ArrayList<>();
JacksonUtil.readValue(deviceDestroyBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
scriptSaveVo -> {
if (scriptSaveVo.getSeqNumber()!=null){
seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
}
}
);
deviceDestroyBill.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
return deviceDestroyBill;
}else {
log.info("[销毁] 详情查看错误，id没有找到{}",scrapId);
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java
浏览文件 @ f8e0244d
......@@ -75,9 +75,11 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
if (deviceDestroyBillVo.getTaskId()==null){
Optional<DeviceDestroyBill> deviceDestroyBill1=deviceDestroyBillService.findApplyId(deviceDestroyBillVo.getApplyId());
if (deviceDestroyBill1.isPresent()){
deviceDestroyBill.setId(deviceDestroyBill1.get().getId());
if (deviceDestroyBillVo.getApplyId()!=null) {
Optional<DeviceDestroyBill> deviceDestroyBill1 = deviceDestroyBillService.findApplyId(deviceDestroyBillVo.getApplyId());
if (deviceDestroyBill1.isPresent()) {
deviceDestroyBill.setId(deviceDestroyBill1.get().getId());
}
}
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceDestroyBill.setNum("NO:第" + LocalDateTime.now().getYear() + "XF" + deviceDestroyBill.getId());
......@@ -141,8 +143,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
deviceDestroyBill.setDestructionFiles(FilesUtil.stringFileToList(deviceDestroyBillVo.getDestructionFileList()));
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
taskService.moveToEnd(taskBto);
deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
devLogAdd(seqNumbers,"发了销毁任务,状态转化为销毁中",deviceDestroyBillVo.getOperationId());
devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId());
}
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/ScrapBusinessController.java
浏览文件 @ f8e0244d
......@@ -52,9 +52,9 @@ public class ScrapBusinessController {
* 出库把任务推送至盖章审核
*/
@ApiOperation(value = "出库把任务推送至盖章审核", notes = "出库把任务推送至盖章审核")
@PostMapping(value ="/sealOfAudit/{userId}/{taskId}")
public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody ScrapOrderOutData scrapOrderOutData, @PathVariable Integer taskId){
scrapBusinessService.sealOfAudit(taskId,userId,scrapOrderOutData);
@PostMapping(value ="/sealOfAudit/{userId}")
public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody ScrapOrderOutData scrapOrderOutData){
scrapBusinessService.sealOfAudit(userId,scrapOrderOutData);
return ResponseEntity.ok("退役任务保存草稿成功");
}
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/ScrapBusinessService.java
浏览文件 @ f8e0244d
......@@ -37,7 +37,7 @@ public interface ScrapBusinessService {
/**
* 出库把任务推送至盖章审核
*/
void sealOfAudit(Integer taskId,Integer userId,ScrapOrderOutData scrapOrderOutData);
void sealOfAudit(Integer userId,ScrapOrderOutData scrapOrderOutData);
/**
* 出库盖章审核调用
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ f8e0244d
......@@ -89,10 +89,12 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
if (scrapOrderOutData.getTaskId()==null) {
Optional<Scrap> scrap1=scrapService.findApplyId(scrapOrderOutData.getApplyId());
if (scrap1.isPresent()){
if (scrapOrderOutData.getApplyId() != null){
Optional<Scrap> scrap1 = scrapService.findApplyId(scrapOrderOutData.getApplyId());
if (scrap1.isPresent()) {
scrap.setId(scrap1.get().getId());
}
}
scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
taskBto=sendDraftTask(units.getUnitId(), scrap.getId(), userId);
......@@ -101,7 +103,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
Scrap scrap1= scrapService.findScrap(taskBto.getBillId());
scrap.setId(scrap1.getId());
}
scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
// scrap.setDeviceLibraryEntities(findInvoleDevice(scrap.getDeviceIds()));
......@@ -144,6 +147,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
}
scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
scrapService.saveScrap(scrap);
......@@ -195,22 +200,24 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
}
@Override
public void sealOfAudit(Integer taskId, Integer userId, ScrapOrderOutData scrapOrderOutData) {
public void sealOfAudit(Integer userId, ScrapOrderOutData scrapOrderOutData) {
Scrap scrap =new Scrap();
User user = userService.findByUser(scrapOrderOutData.getSendUserbId());
Units units=unitsService.findById(user.getUnitsId());
if (taskId==null){
if (scrapOrderOutData.getTaskId()==null){
scrap = scrapOrderOutData.toScrap();
scrapService.saveScrap(scrap);
sealOfAuditTask(units.getUnitId(), scrap.getId(),userId);
sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId());
}else {
TaskBto taskBto = taskService.get(taskId);
TaskBto taskBto = taskService.get(scrapOrderOutData.getTaskId());
List<StatusEnum> statusEnums = new ArrayList<>();
statusEnums.add(StatusEnum.SCRAP_2223);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
scrap = scrapService.findScrap(taskBto.getBillId());
taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2225, userId);
taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2224, user.getUserId());
}
scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
scrap.setSenderUserB(user.getName());
......@@ -244,7 +251,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
private TaskBto sealOfAuditTask(Integer unitId, Integer repelDetailId,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废任务", null, ".", repelDetailId, BusinessEnum.DECOMMISSIONING.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废任务", null, ".", repelDetailId, BusinessEnum.SCRAP.id, unitId, 0, "", list));
}
/**
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java
浏览文件 @ f8e0244d
......@@ -13,6 +13,7 @@ import com.tykj.dev.device.scrap.subject.domin.Scrap;
import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -57,6 +58,17 @@ public class ScrapServiceImpl implements ScrapService {
scrap.setScripts(JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}));
scrap.setBillFiles(FilesUtil.stringFileToList(scrap.getBillFile()));
scrap.setOutboundFiles(FilesUtil.stringFileToList(scrap.getOutboundFile()));
scrap.setReplyFileList(FilesUtil.stringFileToList(scrap.getReplyFiles()));
scrap.setApplyFileList(FilesUtil.stringFileToList(scrap.getApplyFiles()));
List<String> seqNumbers=new ArrayList<>();
JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
scriptSaveVo -> {
if (scriptSaveVo.getSeqNumber()!=null){
seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
}
}
);
scrap.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
return scrap;
}else {
log.info("[报废] 详情查看错误，id没有找到{}",scrapId);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelQueryController.java
浏览文件 @ f8e0244d
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.entity.vo.*;
import com.tykj.dev.device.sendback.service.AgainStorageBillService;
import com.tykj.dev.device.sendback.service.RepelQueryService;
import com.tykj.dev.device.task.service.TaskService;
......@@ -67,16 +64,16 @@ public class RepelQueryController {
return ResponseEntity.ok(repelQueryService.findDeviceRepel(taskId));
}
@PostMapping(value ="/deviceChooseRepel/{unitId}/{taskId}")
@PostMapping(value ="/deviceChooseRepel")
@ApiOperation(value = "代办任务通知页面详情", notes = "代办任务通知页面详情")
public ResponseEntity findDeviceRepel(@RequestBody List<Integer> fielding, @PathVariable Integer unitId, @PathVariable Integer taskId){
return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel(fielding,unitId,taskId));
public ResponseEntity findDeviceRepel(@RequestBody DeviceChoosePageVo deviceChoosePageVo){
return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel(deviceChoosePageVo));
}
@PostMapping(value ="/deviceChooseRepel1/{unitId}")
@PostMapping(value ="/deviceChooseRepel1")
@ApiOperation(value = "省本级任务清退装备查询接口", notes = "省本级任务清退装备查询接口")
public ResponseEntity findDeviceRepel1(@RequestBody List<Integer> fielding, @PathVariable Integer unitId){
return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel1(fielding,unitId));
public ResponseEntity findDeviceRepel1(@RequestBody DeviceChoosePageVo deviceChoosePageVo){
return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel1(deviceChoosePageVo));
}
@GetMapping(value ="/deviceSendOut/{taskId}")
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChoosePageVo.java 0 → 100644
浏览文件 @ f8e0244d
package com.tykj.dev.device.sendback.entity.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author zjm
* @version 1.0.0
* @ClassName DeviceChoosePageVo.java
* @Description TODO
* @createTime 2021年04月14日 15:01:00
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("选择装备查询分页vo")
public class DeviceChoosePageVo {
@ApiModelProperty(value = "在库查询条件")
private DeviceSelectVo deviceSelectVos;
@ApiModelProperty(value = "异常查询条件")
private DeviceSelectVo deviceSelectVoAbnormal;
@ApiModelProperty(value = "列装集合id")
private List<Integer> fielding;
@ApiModelProperty(value = "单位id")
private Integer unitId;
@ApiModelProperty(value = "任务id")
private Integer taskId;
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChooseRepel.java
浏览文件 @ f8e0244d
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.domain.Page;
import java.util.List;
......@@ -21,9 +22,9 @@ import java.util.List;
@ApiModel("选择选择页面")
public class DeviceChooseRepel {
private List<DeviceLibrary> deviceLibraries;
private Page<DeviceLibrary> deviceLibraries;
private List<DeviceLibrary> deviceLibrariesAbnormal;
private Page<DeviceLibrary> deviceLibrariesAbnormal;
/**
* 是否可以提交 1。可以 0。不可以 用于判读市下级任务是否都完成了
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceSelectVo.java 0 → 100644
浏览文件 @ f8e0244d
package com.tykj.dev.device.sendback.entity.vo;
import com.tykj.dev.misc.base.CustomPage;
/**
* @author zjm
* @version 1.0.0
* @ClassName DeviceSelectVo.java
* @Description TODO
* @createTime 2021年04月14日 15:02:00
*/
public class DeviceSelectVo extends CustomPage {
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelQueryService.java
浏览文件 @ f8e0244d
......@@ -33,7 +33,7 @@ public interface RepelQueryService {
/**
* 根据列装id,以及当前用户
*/
DeviceChooseRepel findDeviceChooseRepel(List<Integer> fielding,Integer unitId,Integer taskId);
DeviceChooseRepel findDeviceChooseRepel(DeviceChoosePageVo deviceChoosePageVo);
/**
......@@ -81,7 +81,7 @@ public interface RepelQueryService {
// /**
// * 查询直属单位
// * 根据任务taskId查询任务涉及直属单位的相关装备
// */
// List<DirectlyUnderNavigation> directlyUnderUnitLeftNavigation(Integer taskId);
......@@ -106,7 +106,7 @@ public interface RepelQueryService {
/**
* 省自己装备清退列表查询的接口
*/
DeviceChooseRepel findDeviceChooseRepel1(List<Integer> fielding,Integer unitId);
DeviceChooseRepel findDeviceChooseRepel1(DeviceChoosePageVo deviceChoosePageVo);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ f8e0244d
......@@ -193,7 +193,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto = statsXTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle());
TaskBto taskBto = statsXTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle(),userId);
//给本单位其他专管员阅知
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"发起清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
List<RepelTaskStatistical> list=new ArrayList<>();
......@@ -214,7 +214,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), seqNumbers,lifeStatus);
log.info("count 时间：{}",System.currentTimeMillis()-time);
if (count!=0) {
TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), count, ""));
}
}
......@@ -228,7 +228,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setId(null);
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),directlUnderUnitNames,seqNumbers,lifeStatus);
if (directlUnderUnit.get()&&count!=0){
TaskBto taskBto2 = directlyUnderTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
TaskBto taskBto2 = directlyUnderTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle(),userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto2.getId(), 0, "省直属",count, ""));
}
deviceRepelDetail.setId(null);
......@@ -237,7 +237,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),strings, seqNumbers,lifeStatus);
if (correspondingLevel.get()&&count!=0){
TaskBto taskBto1 = oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
TaskBto taskBto1 = oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle(),userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",count,""));
}
if (list==null||list.size()==0){
......@@ -286,7 +286,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= cityTotalTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle(),taskId);
TaskBto taskBto= cityTotalTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle(),taskId,userId);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"转发清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
List<RepelTaskStatistical> list=new ArrayList<>();
......@@ -301,7 +301,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
List<String> unitNames= unitsService.findBySubordinateUnitName(units1.getUnitId());
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
if (count!=0) {
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(),count, ""));
}
}else {
......@@ -314,7 +314,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
unitNames.add(units.getName());
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitNames, DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
if(count!=0) {
TaskBto taskBto1 = cityDeclaredTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(), units.getName());
TaskBto taskBto1 = cityDeclaredTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(), units.getName(),userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, "省本级", count, ""));
}
}
......@@ -377,7 +377,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setSendUnitId(units1.getUnitId());
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
if (count!=0) {
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
list.add(new RepelTaskStatistical(deviceRepel.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), count, ""));
}
......@@ -527,7 +527,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
taskBto.setOwnUnit(orderOutData.getReceiveUnitId());
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1209,0);
DeviceRepel deviceRepel= deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
waitingReceiptsTask(orderOutData.getSendUnitId(),deviceRepelDetail.getId(),taskBto.getId(),"清退装备出库等待上传回执单");
waitingReceiptsTask(orderOutData.getSendUnitId(),deviceRepelDetail.getId(),taskBto.getId(),"清退装备出库等待上传回执单",userId);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"根据["+deviceRepel.getTitle()+"]任务，已完成退回出库",gainThisUser(userId,user.getUnitsId())));
devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),deviceRepelDetail.getSendUnit()+"装备清退出库"+"，等待"+deviceRepelDetail.getReceiveUnit()+"接收",userId);
orderOutDataRepelDetail.setDeviceLibraryEntities(findInvoleDevice(deviceRepelDetail.getDeviceIds()));
......@@ -760,7 +760,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepel deviceRepel= deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
List<DeviceLibrary> libraries=deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
devLogAdd(libraries,"省直属清退，把装备转变为待清退",securityUser.getCurrentUserInfo().getUserId());
deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
deviceLibraryDao.upDateLeftStatusAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1213,0);
}
......@@ -875,11 +875,12 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId 上级任务ID
* @return TaskBto
*/
private TaskBto countyRepelTask(Integer unitId,Integer repelDetailId,String title,Integer parentTaskId){
private TaskBto countyRepelTask(Integer unitId,Integer repelDetailId,String title,Integer parentTaskId,Integer userId){
//省清退任务待市提交
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1205.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1205.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 1, "", list));
}
/**
......@@ -904,10 +905,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param title
* @return
*/
private TaskBto cityTotalTask(Integer unitId,Integer repelDetailId,String title,Integer parentId){
private TaskBto cityTotalTask(Integer unitId,Integer repelDetailId,String title,Integer parentId,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(-1);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1204.id, title, parentId, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 0, "shi", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1204.id, title, parentId, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 1, "shi", list));
}
/**
......@@ -917,11 +919,12 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param title
* @return
*/
private TaskBto statsXTask(Integer unitId,Integer repelDetailId,String title){
private TaskBto statsXTask(Integer unitId,Integer repelDetailId,String title,Integer userId){
//省清退任务待市提交
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(-1);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1200.id, title, null, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 0, "",list ));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1200.id, title, null, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 1, "",list ));
}
/**
......@@ -931,10 +934,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param title 标题
* @return task对象
*/
private TaskBto cityRepelTask(Integer unitId,Integer repelDetailId,String title,Integer parentTaskId){
private TaskBto cityRepelTask(Integer unitId,Integer repelDetailId,String title,Integer parentTaskId,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1201.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1201.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 1, "", list));
}
......@@ -945,10 +949,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId
* @return
*/
private TaskBto waitingReceiptsTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
private TaskBto waitingReceiptsTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1214.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1214.id, title, parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 1, "", list));
}
......@@ -959,10 +964,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId 上级taskid
* @return TaskBto
*/
private TaskBto directlyUnderTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
private TaskBto directlyUnderTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1202.id, title+"直属单位", 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, 1, "", list));
}
/**
......@@ -972,10 +978,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId
* @return
*/
private TaskBto oneselfTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
private TaskBto oneselfTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1203.id, title+"省本级", 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, 1, "", list));
}
/**
......@@ -985,10 +992,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId
* @return
*/
private TaskBto cityDeclaredTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title){
private TaskBto cityDeclaredTask(Integer unitId, Integer repelDetailId, Integer parentTaskId,String title,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1216.id, title+"市本级清退任务", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1216.id, title+"市本级清退任务", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 1, "", list));
}
......@@ -999,10 +1007,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param parentTaskId
* @return
*/
private TaskBto sendOutSuperior(Integer unitId, Integer repelDetailId, Integer parentTaskId){
private TaskBto sendOutSuperior(Integer unitId, Integer repelDetailId, Integer parentTaskId,Integer userId){
List<Integer> list=new ArrayList<>();
list.add(userId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1210.id, "省退役国家装备任务", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 0, "country", list));
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1210.id, "省退役国家装备任务", parentTaskId, ".", repelDetailId, BusinessEnum.SEND_BACK.id, unitId, 1, "country", list));
}
private List<DeviceLibrary> findInvoleDevice(String involeDevice){
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ f8e0244d
......@@ -21,6 +21,7 @@ import com.tykj.dev.misc.base.DeviceLifeStatus;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.PageUtil;
import com.tykj.dev.misc.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -78,7 +79,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override
public DeviceRepel findDeviceRepel(Integer taskId) {
TaskBto taskBto= taskService.get(taskId);
if (taskBto.getBusinessType()== BusinessEnum.SEND_BACK_STATISTICAL.id){
if (taskBto.getBusinessType().equals(BusinessEnum.SEND_BACK_STATISTICAL.id)){
return deviceRepelService.findDeviceRepel(taskBto.getBillId());
}
DeviceRepelDetail deviceRepelDetail = repelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
......@@ -86,15 +87,15 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
@Override
public DeviceChooseRepel findDeviceChooseRepel(List<Integer> fielding, Integer unitId,Integer taskId) {
public DeviceChooseRepel findDeviceChooseRepel(DeviceChoosePageVo deviceChoosePageVo) {
List<DeviceLibrary> deviceLibraries=new ArrayList<>();
List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
Units units= unitsService.findById(unitId);
Units units= unitsService.findById(deviceChoosePageVo.getUnitId());
DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(taskId).getBillId());
DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(deviceChoosePageVo.getTaskId()).getBillId());
DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
if (deviceRepel.getSeqNumbers()==null||deviceRepel.getSeqNumbers().equals("")) {
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding, units.getName()).stream()
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(deviceChoosePageVo.getFielding(), units.getName()).stream()
.filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
|| deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPEL.id)
|| deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)
......@@ -139,14 +140,27 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
int isNotSub = 1;
if (units.getLevel()==2) {
TaskBto taskBto = taskService.findFatherIdAndCustomInfo(taskId);
TaskBto taskBto = taskService.findFatherIdAndCustomInfo(deviceChoosePageVo.getTaskId());
if (!taskBto.getBillStatus().equals(StatusEnum.END.id)) {
isNotSub = 0;
}
}
return new DeviceChooseRepel(deviceLibraries,deviceLibrariesAbnormal,isNotSub);
Page<DeviceLibrary> deviceLibraryPage= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVos().getPage(), deviceChoosePageVo.getDeviceSelectVos().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVos().getPageable());
Page<DeviceLibrary> deviceLibraryPageAbnormal= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVoAbnormal().getPage(), deviceChoosePageVo.getDeviceSelectVoAbnormal().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVoAbnormal().getPageable());
return new DeviceChooseRepel(deviceLibraryPage,deviceLibraryPageAbnormal,isNotSub);
}
// private PredicateBuilder<DeviceLibrary> getPredicateBuilderDeviceChooseRepel(List<Integer> packingList,List<Integer> lifeStatusList) {
// PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
// predicateBuilder.in("packingId",packingList);
// predicateBuilder.in("lifeStatus",lifeStatusList);
// return predicateBuilder;
// }
@Override
public List<DeviceLibrary> findDeviceSendOut(Integer taskId) {
TaskBto taskBto = taskService.get(taskId);
......@@ -296,11 +310,11 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override
public DeviceChooseRepel findDeviceChooseRepel1(List<Integer> fielding, Integer unitId) {
public DeviceChooseRepel findDeviceChooseRepel1(DeviceChoosePageVo deviceChoosePageVo) {
List<DeviceLibrary> deviceLibraries=new ArrayList<>();
List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
Units units= unitsService.findById(unitId);
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding,units.getName()).stream()
Units units= unitsService.findById(deviceChoosePageVo.getUnitId());
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(deviceChoosePageVo.getFielding(),units.getName()).stream()
.filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPAIRING.id)
||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_TRANSIT.id)
......@@ -318,7 +332,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
}
);
return new DeviceChooseRepel(deviceLibraries,deviceLibrariesAbnormal,1);
Page<DeviceLibrary> deviceLibraryPage= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVos().getPage(), deviceChoosePageVo.getDeviceSelectVos().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVos().getPageable());
Page<DeviceLibrary> deviceLibraryPageAbnormal= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVoAbnormal().getPage(), deviceChoosePageVo.getDeviceSelectVoAbnormal().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVoAbnormal().getPageable());
return new DeviceChooseRepel(deviceLibraryPage,deviceLibraryPageAbnormal,1);
}
private DevRepelVo devRepelVo(DeviceLibrary deviceLibrary){
......
dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java
浏览文件 @ f8e0244d
......@@ -88,7 +88,6 @@ public class HandoverController {
@GetMapping(value = "/userList")
@ApiOperation(value = "工作交接-查询交接人下拉")
public ResponseEntity userList(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
return ResponseEntity.ok(userService.findByUniteId1(securityUser.getCurrentUserInfo().getUnitsId()).stream().filter(userShenRe -> userShenRe.getTrainStatus()!=5).collect(Collectors.toList()));
}
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverAddVo.java
浏览文件 @ f8e0244d
......@@ -27,6 +27,15 @@ public class WorkHandoverAddVo {
*/
private List<Integer> turnOverUserAId;
/**
* 监交人
*/
private String inUserName;
/**
* 上级领导
*/
private String leadershipName;
/**
* 单据装备数据统计数据
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverEndAddVo.java
浏览文件 @ f8e0244d
......@@ -24,6 +24,16 @@ public class WorkHandoverEndAddVo {
*/
private Integer workHandoverId;
/**
* 监交人
*/
private String inUserName;
/**
* 上级领导
*/
private String leadershipName;
/**
* 文件集合(装备列表签字文件集合)
*/
......
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java
浏览文件 @ f8e0244d
......@@ -72,6 +72,12 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
List<User> users= userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId());
List<Integer> handoverIds= users.stream().filter(user -> user.getTrainStatus()!=5).map(User::getUserId).collect(Collectors.toList());
WorkHandover workHandover=new WorkHandover();
if (workHandoverAddVo.getInUserName()!=null) {
workHandover.setInUserName(workHandoverAddVo.getInUserName());
}
if (workHandoverAddVo.getLeadershipName()!=null) {
workHandover.setLeadershipName(workHandoverAddVo.getLeadershipName());
}
workHandover.setStatus(1);
workHandover.setTurnOverUserIds(StringSplitUtil.ListToString(workHandoverAddVo.getTurnOverUserAId()));
workHandover.setHandoverUserIds(StringSplitUtil.ListToString(handoverIds));
......@@ -103,6 +109,8 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
log.info("[WorkHandover] 未找到id：{} 工作交接业务", workHandoverEndAddVo.getWorkHandoverId());
throw new ApiException(ResponseEntity.status(500).body("未找到id为" + workHandoverEndAddVo.getWorkHandoverId() + " 工作交接业务"));
}
workHandover.setInUserName(workHandoverEndAddVo.getInUserName());
workHandover.setLeadershipName(workHandoverEndAddVo.getLeadershipName());
workHandover.setStatus(2);
workHandover.setFile(FilesUtil.stringFileToList(workHandoverEndAddVo.getFileLists()));
workHandover = workHandoverDao.save(workHandover);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论