Skip to content

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

[销毁 报废 培训] bug代码提交

上级 09fb0e41
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 177 行增加 和 27 行删除
dev-config/src/main/java/com/tykj/dev/config/base/DeviceLifeStatus.java
浏览文件 @ e4e5d90e
......@@ -38,6 +38,9 @@ public enum DeviceLifeStatus {
* 清退
*/
SEND_BACK(6, "待清退"),
SEND_BACK_IN(7, "清退中"),
// /**
// * 待退装
// */
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/entity/DeviceDecommissioningDetail.java
浏览文件 @ e4e5d90e
......@@ -145,6 +145,12 @@ public class DeviceDecommissioningDetail extends BaseEntity {
@Column(name = "bill_file",columnDefinition = "TEXT")
private String billFile;
/**
* 退役状态
*/
@ApiModelProperty(value = "退役状态")
private Integer decommissioningStatus;
/**
* 入库确认单
*/
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -13,6 +13,7 @@ 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;
import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
......@@ -153,6 +154,8 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
if (decommissioningSelectVo.getEndTime() != null) {
predicateBuilder.lt("createTime", decommissioningSelectVo.getEndTime());
}
predicateBuilder.eq("decommissioningStatus", StatusEnum.END.id);
return predicateBuilder.build();
}
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java
浏览文件 @ e4e5d90e
......@@ -70,6 +70,9 @@ public class DeviceDestroyBill extends BaseEntity {
@ApiModelProperty(value = "区块链记录id")
private String recordId;
@ApiModelProperty(value = "销毁状态")
private Integer destroyStatus;
@ApiModelProperty(value = "单据数据")
@Column(name = "script_json",columnDefinition = "TEXT")
private String scriptJson;
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.github.wenhao.jpa.PredicateBuilder;
import com.github.wenhao.jpa.Specifications;
import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
import com.tykj.dev.config.base.DeviceLifeStatus;
import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
......@@ -16,6 +17,8 @@ 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.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
......@@ -118,7 +121,8 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
deviceDestroyBill.setApplyFileList(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFiles()));
deviceDestroyBill.setDestructionFileList(FilesUtil.stringFileToList(deviceDestroyBill.getDestructionFiles()));
deviceDestroyBill.setReplayFileList(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFiles()));
return deviceDestroyBill;
deviceDestroyBill.setUnitName(unitsService.findById(deviceDestroyBill.getUnitId()).getName());
return deviceDestroyBill;
});
}
......@@ -130,6 +134,7 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
if (destroySelectVo.getEndTime() != null) {
predicateBuilder.lt("createTime", destroySelectVo.getEndTime());
}
predicateBuilder.eq("destroyStatus", StatusEnum.END.id);
return predicateBuilder.build();
}
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -86,12 +86,14 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceDestroyBill.setNum("NO:第" + LocalDateTime.now().getYear() + "XF" + deviceDestroyBill.getId());
taskBto= sendDraftTask(securityUser.getCurrentUserInfo().getUnitsId(),deviceDestroyBill.getId(),securityUser.getCurrentUserInfo().getUserId());
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"保存销毁任务草稿",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
}else {
taskBto=taskService.get(deviceDestroyBillVo.getTaskId());
DeviceDestroyBill deviceDestroyBill1= deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
deviceDestroyBill.setId(deviceDestroyBill1.getId());
deviceDestroyBill.setNum(deviceDestroyBill1.getNum());
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
}
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
return taskBto;
......@@ -106,17 +108,20 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
List<String> seqNumbers= scriptListToStringList(deviceDestroyBillVo);
deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.TO_BE_DESTROYED.id);
if (deviceDestroyBillVo.getTaskId()==null){
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceDestroyBill.setNum("NO:第" + LocalDateTime.now().getYear() + "XF" + deviceDestroyBill.getId());
TaskBto taskBto= awaitUploadDestructionTask(securityUser.getCurrentUserInfo().getUnitsId(),deviceDestroyBill.getId(),securityUser.getCurrentUserInfo().getUserId());
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务等待补充手续",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
}else {
TaskBto taskBto = taskService.get(deviceDestroyBillVo.getTaskId());
DeviceDestroyBill deviceDestroyBill1=deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
deviceDestroyBill.setId(deviceDestroyBill1.getId());
deviceDestroyBill.setNum(deviceDestroyBill1.getNum());
taskService.moveToSpecial(taskBto,StatusEnum.DESTROY_2,0,"country");
taskBto= taskService.moveToSpecial(taskBto,StatusEnum.DESTROY_2,0,"country");
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务等待补充手续",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
}
......@@ -135,6 +140,7 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
TaskBto taskBto= taskService.get(taskId);
DeviceDestroyBill deviceDestroyBill= deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
List<String> seqNumbers= scriptListToStringList(deviceDestroyBillVo);
deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.IN_THE_DESTROYED.id);
if (deviceDestroyBillVo.getSupervisor()!=null) {
deviceDestroyBill.setSupervisor(deviceDestroyBill.getSupervisor());
}
......@@ -146,7 +152,8 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
}
deviceDestroyBill.setDestructionFiles(FilesUtil.stringFileToList(deviceDestroyBillVo.getDestructionFileList()));
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
taskService.moveToEnd(taskBto);
taskBto= taskService.moveToEnd(taskBto);
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId());
......@@ -156,7 +163,10 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
@Override
public void moveToArchiveDestroyBill(Integer taskId) {
TaskBto taskBto= taskService.get(taskId);
taskService.moveToArchive(taskBto);
DeviceDestroyBill deviceDestroyBill= deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
taskBto = taskService.moveToArchive(taskBto);
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
}
/**
......
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ e4e5d90e
......@@ -25,6 +25,8 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
List<DeviceLibrary> findAllBySeqNumberIn(List<String> seqNumbers);
boolean existsAllBySeqNumberInAndLifeStatus(List<String> seqNumbers,Integer lifeStatus);
/**
* 根据装备型号与装备所在地(多个地区)查询装备数量
*
......
dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java
浏览文件 @ e4e5d90e
......@@ -139,6 +139,7 @@ public interface DeviceLibraryService {
*/
void isInStockOrWaitRetired(List<Integer> ids);
/**
* 判断装备状态是否丢失
* @param ids
......@@ -164,4 +165,10 @@ public interface DeviceLibraryService {
List<DeviceLibrary> findAllBySeqNumber(List<String> seqNumbers);
/**
* 判断装备序列号中是否有不等于指定的leftStatus的装备
* 有则返回303给前端提示
*/
void judgeSeqNumbersInNotEqualLifeStatus(List<String> seqNumbers,Integer leftStatus);
}
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -484,6 +484,13 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
return deviceLibraryDao.findAllBySeqNumberIn(seqNumbers);
}
@Override
public void judgeSeqNumbersInNotEqualLifeStatus(List<String> seqNumbers, Integer leftStatus) {
if (!deviceLibraryDao.existsAllBySeqNumberInAndLifeStatus(seqNumbers, leftStatus)){
throw new ApiException(ResponseEntity.status(303).body("装备已被其他同单位专管员操作"));
}
}
@Override
public void isNotLoss(List<Integer> ids) {
ids.forEach(integer -> {
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBillServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -11,6 +11,7 @@ import com.tykj.dev.device.scrap.repository.ScrapBillDao;
import com.tykj.dev.device.scrap.service.ScrapBillService;
import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.ResultUtil;
......@@ -99,6 +100,7 @@ public class ScrapBillServiceImpl implements ScrapBillService {
if (scrapSelectVo.getEndTime() != null) {
predicateBuilder.lt("scrapTime", scrapSelectVo.getEndTime());
}
predicateBuilder.eq("destroyStatus", StatusEnum.END.id);
return scrapBillDao.findAll(predicateBuilder.build(), scrapSelectVo.getPageable());
}
}
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.tykj.dev.config.base.DeviceLifeStatus;
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.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
......@@ -65,6 +66,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
@Autowired
TaskService taskService;
@Autowired
DeviceLibraryService deviceLibraryService;
@Autowired
DeviceLogService deviceLogService;
......@@ -98,10 +101,12 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
taskBto=sendDraftTask(units.getUnitId(), scrap.getId(), userId);
scrap.setScrapStatus(taskBto.getBillStatus());
}else {
taskBto=taskService.get(scrapOrderOutData.getTaskId());
Scrap scrap1= scrapService.findScrap(taskBto.getBillId());
scrap.setId(scrap1.getId());
scrap.setScrapStatus(taskBto.getBillStatus());
}
scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
......@@ -128,6 +133,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
}
}
);
deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.TO_BE_SCRAPPED.id);
//判断是否为草稿 还是直接发起
if (scrapOrderOutData.getTaskId()!=null){
TaskBto taskBto= taskService.get(scrapOrderOutData.getTaskId());
......@@ -140,12 +146,13 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrap.setNum(scrap1.getNum());
taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2222,"country");
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setScrapStatus(taskBto.getBillStatus());
}else {
scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
TaskBto taskBto= sendOutSuperior(units.getUnitId(), scrap.getId(),userId);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setScrapStatus(taskBto.getBillStatus());
}
scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
......@@ -173,6 +180,15 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SCRAP_2222);
Scrap scrap=scrapService.findScrap(taskBto.getBillId());
scrap.setBillFile(FilesUtil.stringFileToList(storageScrap.getFileRets()));
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()));
}
}
);
deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.IN_THE_SCRAPPED.id);
if (storageScrap.getUserBName()!=null) {
scrap.setReceiveUserB(storageScrap.getUserBName());
}
......@@ -187,16 +203,9 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
if (storageScrap.getUserAName()!=null) {
scrap.setReceiveUserA(storageScrap.getUserAName());
}
taskService.moveToEnd(taskBto);
taskBto = taskService.moveToEnd(taskBto);
scrap.setScrapStatus(taskBto.getBillStatus());
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()));
}
}
);
deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SCRAP_I.id,scrap.getReceiveUnit(),0,seqNumbers);
scrapService.saveScrap(scrap);
devLogAdd(seqNumbers,"报废任务完成,状态转化为已报废",user.getUserId());
......@@ -212,14 +221,16 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrap = scrapOrderOutData.toScrap();
scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId());
TaskBto taskBto= sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId());
scrap.setScrapStatus(taskBto.getBillStatus());
}else {
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_2224, user.getUserId());
taskBto= taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2224, user.getUserId());
scrap.setScrapStatus(taskBto.getBillStatus());
}
scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
......@@ -235,21 +246,28 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
@Override
public void outSealOfAuditEnd(Integer taskId, Integer reviewTheResults) {
TaskBto taskBto= taskService.get(taskId);
Scrap scrap=scrapService.findScrap(taskBto.getBillId());
if (reviewTheResults==0){
taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2225,0);
taskBto = taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2225,0);
scrap.setScrapStatus(taskBto.getBillStatus());
}else {
Scrap scrap=scrapService.findScrap(taskBto.getBillId());
scrap.setSenderUserB(null);
scrap.setSendUserbId(null);
scrapService.saveScrap(scrap);
taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2223,scrap.getSendUseraId());
taskBto = taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2223,scrap.getSendUseraId());
scrap.setScrapStatus(taskBto.getBillStatus());
}
scrapService.saveScrap(scrap);
}
@Override
public void deleteDrafts(Integer taskId) {
TaskBto taskBto= taskService.get(taskId);
taskService.moveToArchive(taskBto);
Scrap scrap=scrapService.findScrap(taskBto.getBillId());
taskBto=taskService.moveToArchive(taskBto);
scrap.setScrapStatus(taskBto.getBillStatus());
scrapService.saveScrap(scrap);
}
/**
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -13,6 +13,7 @@ import com.tykj.dev.device.scrap.service.ScrapService;
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.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
......@@ -117,6 +118,8 @@ public class ScrapServiceImpl implements ScrapService {
if (scrapSelectVo.getEndTime() != null) {
predicateBuilder.lt("createTime", scrapSelectVo.getEndTime());
}
predicateBuilder.eq("scrapStatus", StatusEnum.END.id);
return scrapDao.findAll(predicateBuilder.build(), scrapSelectVo.getPageable()).map(
scrap -> {
scrap.setScripts(JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}));
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/domin/Scrap.java
浏览文件 @ e4e5d90e
......@@ -95,6 +95,9 @@ public class Scrap extends BaseEntity {
private Integer receiveUserbId;
@ApiModelProperty(value = "报废状态")
private Integer scrapStatus;
@ApiModelProperty(value = "回执单")
@Column(name = "outbound_file",columnDefinition = "TEXT")
private String outboundFile;
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelQueryController.java
浏览文件 @ e4e5d90e
......@@ -156,4 +156,11 @@ public class RepelQueryController {
return ResponseEntity.ok(againStorageBillService.findByid(taskId));
}
@PostMapping(value ="/repelDeviceInList")
@ApiOperation(value = "清退中", notes = "清退中列表")
public ResponseEntity repelDeviceInList(@RequestBody RepelManagementVo repelManagementVo){
return ResponseEntity.ok(repelQueryService.repelDeviceInList(repelManagementVo));
}
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelQueryService.java
浏览文件 @ e4e5d90e
......@@ -116,5 +116,9 @@ public interface RepelQueryService {
*/
PagingVo repelDeviceList(RepelManagementVo repelManagementVo);
/**
* 查看待清退装备列表
*/
PagingVo repelDeviceInList(RepelManagementVo repelManagementVo);
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -79,7 +79,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
deviceRepelDetailDao.findAllBySendTimeBetweenAndSendUnitIdAndRepelStatus(time,endTime,unitId,2).forEach(
deviceRepelDetail -> libraries.addAll(StringUtils.stringToList(deviceRepelDetail.getDeviceIds()))
);
return new ArrayList<>(libraries);
return new ArrayList<>(libraries);
}
@Override
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -521,7 +521,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
orderOutDataRepelDetail.setReplyFiles(FilesUtil.stringFileToList(orderOutData.getReplyFileList()));
orderOutDataRepelDetail.setApplyFiles(FilesUtil.stringFileToList(orderOutData.getApplyFileList()));
deviceRepelDetailService.saveDeviceRepelDetail(orderOutDataRepelDetail);
deviceLibraryDao.upDateLeftStatusAndOwnUnitName(DeviceLifeStatus.REPEL.id,orderOutData.getReceiveUnit(),StringUtils.stringToList(orderOutDataRepelDetail.getDeviceIds()));
deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.SEND_BACK_IN.id,StringUtils.stringToList(orderOutDataRepelDetail.getDeviceIds()));
taskBto.setCreateUserId(userId);
taskBto.setOwnUnit(orderOutData.getReceiveUnitId());
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1209,0);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ e4e5d90e
......@@ -446,10 +446,16 @@ public class RepelQueryServiceImpl implements RepelQueryService {
*/
@Override
public PagingVo clearedDeviceList(RepelManagementVo repelManagementVo) {
List<DeviceLibrary> deviceLibraries=deviceLibraryDao.findAll(getClearedSpecification(repelManagementVo));
List<DeviceLibrary> deviceLibraries=new ArrayList<>();
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
//unitId为空，默认查询当前单位
List<Integer> ids= repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId());
if (ids!=null&&ids.size()!=0) {
predicateBuilder.in("id", repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()), new Date(repelManagementVo.getEndTime()), repelManagementVo.getUnitId()).toArray());
deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build());
}
Page<DeviceLibrary> page = PageUtil.getPerPage(repelManagementVo.getPage(), repelManagementVo.getSize(), deviceLibraries, repelManagementVo.getPageable());
return PagingVo.builder()
.data(page.getContent().stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList())).page(repelManagementVo.getPage())
.size(repelManagementVo.getSize()).total((int)page.getTotalElements())
......@@ -471,10 +477,35 @@ public class RepelQueryServiceImpl implements RepelQueryService {
.build();
}
@Override
public PagingVo repelDeviceInList(RepelManagementVo repelManagementVo) {
List<DeviceLibrary> deviceLibraries=deviceLibraryDao.findAll(getRepelDeviceSpecificationIn(repelManagementVo));
Page<DeviceLibrary> page = PageUtil.getPerPage(repelManagementVo.getPage(), repelManagementVo.getSize(), deviceLibraries, repelManagementVo.getPageable());
return PagingVo.builder()
.data(page.getContent().stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList())).page(repelManagementVo.getPage())
.size(repelManagementVo.getSize()).total((int)page.getTotalElements())
.models(deviceLibraries.stream().map(DeviceLibrary::getModel).collect(Collectors.toSet()))
.names(deviceLibraries.stream().map(DeviceLibrary::getName).collect(Collectors.toSet()))
.build();
}
private Specification<DeviceLibrary> getRepelDeviceSpecificationIn(RepelManagementVo repelManagementVo) {
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
//unitId为空，默认查询当前单位
predicateBuilder.eq("lifeStatus", com.tykj.dev.config.base.DeviceLifeStatus.SEND_BACK_IN.id);
Units units= unitsService.findById(repelManagementVo.getUnitId());
predicateBuilder.eq("ownUnit",units.getName());
return predicateBuilder.build();
}
private Specification<DeviceLibrary> getRepelDeviceSpecification(RepelManagementVo repelManagementVo) {
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
//unitId为空，默认查询当前单位
predicateBuilder.eq("lifeStatus", com.tykj.dev.config.base.DeviceLifeStatus.SEND_BACK.id);
Units units= unitsService.findById(repelManagementVo.getUnitId());
predicateBuilder.eq("ownUnit",units.getName());
return predicateBuilder.build();
}
......@@ -482,6 +513,8 @@ public class RepelQueryServiceImpl implements RepelQueryService {
private Specification<DeviceLibrary> getClearedSpecification(RepelManagementVo repelManagementVo) {
PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
//unitId为空，默认查询当前单位
List<Integer> ids= repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId());
predicateBuilder.in("id",repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId()));
return predicateBuilder.build();
......
dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java
浏览文件 @ e4e5d90e
......@@ -135,7 +135,6 @@ public class TrainJobController {
TaskBto task = taskService.start(new TaskBto(StatusEnum.TRAIN1000.id, trainTheme.getName(), null, null, trainTheme.getTrainId(), BusinessEnum.TRAIN.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
trainTheme.setTrainStatus(StatusEnum.TRAIN1000.id);
trainThemeAddVo.getUnitsIds().forEach(
unitId->{
List<Integer> list = new ArrayList<>();
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java
浏览文件 @ e4e5d90e
......@@ -3,6 +3,7 @@ package com.tykj.dev.device.train.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.tykj.dev.device.file.entity.FileRet;
import com.tykj.dev.device.train.entity.vo.*;
import com.tykj.dev.misc.base.BaseEntity;
import com.tykj.dev.misc.base.BeanHelper;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -10,8 +11,13 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -144,6 +150,35 @@ public class TrainTheme {
@ApiModelProperty(value = "优秀", name = "good")
private Integer good;
/**
* 创建用户id
*/
@CreatedBy
private Integer createUserId;
/**
* 更新用户id
*/
@LastModifiedBy
private Integer updateUserId;
/**
* 创建时间
*/
@CreatedDate
private LocalDateTime createTime;
/**
* 更新时间
*/
@LastModifiedDate
private LocalDateTime updateTime;
/**
* 删除标记(0:未删除，1:已删除)
*/
private Integer deleteTag = 0;
@Column(name = "train_papers_files",columnDefinition = "TEXT")
@ApiModelProperty(value = "培训试卷文件db", name = "trainPapersFiles")
......
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainThemeAddVo.java
浏览文件 @ e4e5d90e
......@@ -110,7 +110,7 @@ public class TrainThemeAddVo {
/**
* 需要参加的单位
*/
@ApiModelProperty(value = "参会人员id 集合",name = "unitsIds")
@ApiModelProperty(value = "参会单位 集合",name = "unitsIds")
private List<Integer> unitsIds;
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论