Skip to content

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

[清退 丢失 培训] 代码修改提交

上级 08ec3e59
显示空白字符变更
内嵌 并排
正在显示 包含 192 行增加 和 46 行删除
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ 9d214ce3
......@@ -75,11 +75,15 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus where o.id in :idList")
int upDateLeftStatus(Integer lifeStatus,@Param("idList") List<Integer> idList);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.lockStatus=:lock where o.id in :idList")
int upDateLeftStatusAndLockStatus(Integer lifeStatus,Integer lock,@Param("idList") List<Integer> idList);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.locationUnit = :unitName,o.ownUnit = :unitName where o.id in :idList")
int upDateLeftStatusAndUnitName(Integer lifeStatus,String unitName,@Param("idList") List<Integer> idList);
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.locationUnit = :unitName,o.ownUnit = :unitName ,o.lockStatus=:lock where o.id in :idList")
int upDateLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus,String unitName,Integer lock,@Param("idList") List<Integer> idList);
@Transactional
@Modifying
......
dev-loss/src/main/java/com/tykj/dev/device/loss/controller/DeviceLossController.java
浏览文件 @ 9d214ce3
......@@ -5,11 +5,14 @@ import com.tykj.dev.device.loss.entity.vo.LossAuditvo;
import com.tykj.dev.device.loss.entity.vo.RetrieveAuditvo;
import com.tykj.dev.device.loss.service.LossBillService;
import com.tykj.dev.device.loss.entity.domain.DeviceLoss;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
/**
* @author zjm
......@@ -27,8 +30,8 @@ public class DeviceLossController {
LossBillService lossBillService;
@PostMapping(value ="/initiateLoss")
@ApiOperation(value = "丢失装备上报", notes = "丢失装备上报接口")
public ResponseEntity initiateLoss(@RequestBody DeviceLoss deviceLoss){
lossBillService.initiateLoss(deviceLoss);
public ResponseEntity initiateLoss(@RequestBody DeviceLoss deviceLoss,@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser){
lossBillService.initiateLoss(deviceLoss,securityUser);
return ResponseEntity.ok("上报成功");
}
......@@ -42,8 +45,8 @@ public class DeviceLossController {
@PostMapping(value ="/initiateRetrieve")
@ApiOperation(value = "找回装备上报", notes = "找回装备上报接口")
public ResponseEntity initiateRetrieve(@RequestBody DeviceLoss deviceLoss){
lossBillService.initiateRetrieve(deviceLoss);
public ResponseEntity initiateRetrieve(@RequestBody DeviceLoss deviceLoss,@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser){
lossBillService.initiateRetrieve(deviceLoss,securityUser);
return ResponseEntity.ok("上报成功");
}
......
dev-loss/src/main/java/com/tykj/dev/device/loss/service/LossBillService.java
浏览文件 @ 9d214ce3
......@@ -3,6 +3,7 @@ package com.tykj.dev.device.loss.service;
import com.tykj.dev.device.loss.entity.vo.LossAuditvo;
import com.tykj.dev.device.loss.entity.domain.DeviceLoss;
import com.tykj.dev.device.loss.entity.vo.RetrieveAuditvo;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
/**
* @author zjm
......@@ -15,7 +16,7 @@ public interface LossBillService {
/**
* 发起丢失
*/
void initiateLoss(DeviceLoss deviceLoss);
void initiateLoss(DeviceLoss deviceLoss, SecurityUser securityUser);
/**
*上级审核
......@@ -26,7 +27,7 @@ public interface LossBillService {
/**
* 找回装备
*/
void initiateRetrieve(DeviceLoss deviceLoss);
void initiateRetrieve(DeviceLoss deviceLoss,SecurityUser securityUser);
/**
* 找回装备 审核
......
dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/LossBillServiceImpl.java
浏览文件 @ 9d214ce3
......@@ -2,6 +2,7 @@ package com.tykj.dev.device.loss.service.impl;
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.DeviceLog;
......@@ -13,6 +14,7 @@ import com.tykj.dev.device.loss.util.StringUtils;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.user.subject.entity.Area;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.service.AreaService;
import com.tykj.dev.device.user.subject.service.UnitsService;
......@@ -20,6 +22,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.DeviceLifeStatus;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.device.loss.entity.domain.DeviceLoss;
import com.tykj.dev.misc.utils.TaskDisposeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -49,6 +52,9 @@ public class LossBillServiceImpl implements LossBillService {
@Autowired
DeviceLibraryDao deviceLibraryDao;
@Autowired
DeviceLibraryService deviceLibraryService;
@Autowired
AreaService areaService;
......@@ -56,7 +62,8 @@ public class LossBillServiceImpl implements LossBillService {
DeviceLogService deviceLogService;
@Override
public void initiateLoss(DeviceLoss deviceLoss) {
public void initiateLoss(DeviceLoss deviceLoss, SecurityUser securityUser) {
deviceLibraryService.isInStockOrWaitRetired(deviceLoss.getDevIdsList());
deviceLoss.setDevIds(StringUtils.ListToString(deviceLoss.getDevIdsList()));
deviceLoss.setLossFile(FilesUtil.stringFileToList(deviceLoss.getFileRetList()));
DeviceLoss deviceLossThis= deviceLossService.save(deviceLoss);
......@@ -64,9 +71,12 @@ public class LossBillServiceImpl implements LossBillService {
Area area=areaService.findByid(units.getAreaId());
if (units.getLevel() == 1) {
end(deviceLossThis.getCreateUserId(), deviceLossThis.getId(), units.getName() + "丢失装备任务", units.getUnitId());
} else {
} else if (units.getLevel()==2){
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
newLossCityTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "丢失装备任务",securityUser.getCurrentUserInfo().getUserId());
}else {
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
newLossTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "丢失装备任务");
newLossCountyTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "丢失装备任务",securityUser.getCurrentUserInfo().getUserId());
}
deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.LOSS.id,deviceLoss.getDevIdsList());
devLogAdd(deviceLoss.getDevIdsList(),"装备报备丢失", deviceLoss.getCreateUserId());
......@@ -81,22 +91,25 @@ public class LossBillServiceImpl implements LossBillService {
TaskBto taskBto=taskService.get(lossAuditvo.getTaskId());
DeviceLoss deviceLoss=deviceLossService.findByDeviceLoss(taskBto.getBillId());
if (units.getLevel()==1){
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.LOSS1301);
deviceLoss.setProvinceUnitName(units.getName());
deviceLoss.setProvinceDes(lossAuditvo.getDes());
taskService.moveToEnd(taskBto);
}else {
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.LOSS1300);
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
deviceLoss.setCityUnitName(units.getName());
deviceLoss.setCityDes(lossAuditvo.getDes());
taskBto.setOwnUnit(parentUnits.getUnitId());
taskService.moveToSpecial(taskBto,StatusEnum.LOSS1300,0);
taskService.moveToSpecial(taskBto,StatusEnum.LOSS1301,0);
}
deviceLossService.save(deviceLoss);
}
@Override
public void initiateRetrieve(DeviceLoss deviceLoss) {
public void initiateRetrieve(DeviceLoss deviceLoss,SecurityUser securityUser) {
deviceLibraryService.isInStockOrWaitRetired(deviceLoss.getDevIdsList());
deviceLoss.setDevIds(StringUtils.ListToString(deviceLoss.getDevIdsList()));
deviceLoss.setLossFile(FilesUtil.stringFileToList(deviceLoss.getFileRetList()));
DeviceLoss deviceLossThis= deviceLossService.save(deviceLoss);
......@@ -105,9 +118,12 @@ public class LossBillServiceImpl implements LossBillService {
if (units.getLevel() == 1) {
endRetrieve(deviceLossThis.getCreateUserId(), deviceLossThis.getId(), units.getName() + "找回装备任务", units.getUnitId());
deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.IN_LIBRARY.id,deviceLoss.getDevIdsList());
} else {
} else if (units.getLevel()==2){
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
newRetrieveTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "找回装备任务");
newRetrieveCityTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "找回装备任务",securityUser.getCurrentUserInfo().getUserId());
}else {
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
newRetrieveCountyTask(parentUnits.getUnitId(), deviceLossThis.getId(), units.getName() + "找回装备任务",securityUser.getCurrentUserInfo().getUserId());
}
devLogAdd(deviceLoss.getDevIdsList(),"装备找回上报", deviceLoss.getCreateUserId());
}
......@@ -120,6 +136,7 @@ public class LossBillServiceImpl implements LossBillService {
TaskBto taskBto=taskService.get(retrieveAuditvo.getTaskId());
DeviceLoss deviceLoss=deviceLossService.findByDeviceLoss(taskBto.getBillId());
if (units.getLevel()==1){
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.RETRIEVE1401);
deviceLoss.setProvinceUnitName(units.getName());
deviceLoss.setProvinceDes(retrieveAuditvo.getDes());
taskService.moveToEnd(taskBto);
......@@ -130,12 +147,14 @@ public class LossBillServiceImpl implements LossBillService {
deviceLoss.setBackStatus(3);
}
}else {
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.RETRIEVE1400);
Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
deviceLoss.setCityUnitName(units.getName());
deviceLoss.setCityDes(retrieveAuditvo.getDes());
if (retrieveAuditvo.getType()==1){
taskBto.setOwnUnit(parentUnits.getUnitId());
taskService.moveToSpecial(taskBto,StatusEnum.RETRIEVE1400,0);
taskService.moveToSpecial(taskBto,StatusEnum.RETRIEVE1401,0);
}else {
taskService.moveToEnd(taskBto);
deviceLoss.setBackStatus(3);
......@@ -146,10 +165,18 @@ public class LossBillServiceImpl implements LossBillService {
}
private void newRetrieveTask(Integer unitId, Integer lossId, String title){
private void newRetrieveCountyTask(Integer unitId, Integer lossId, String title,Integer userID){
List<Integer> list=new ArrayList<>();
list.add(userID);
list.add(0);
taskService.start(new TaskBto(StatusEnum.RETRIEVE1400.id, title, 0, ".", lossId, BusinessEnum.RETRIEVE.id, unitId, 0, "", list));
taskService.start(new TaskBto(StatusEnum.RETRIEVE1400.id, title, 0, ".", lossId, BusinessEnum.RETRIEVE.id, unitId, 1, "", list));
}
private void newRetrieveCityTask(Integer unitId, Integer lossId, String title,Integer userID){
List<Integer> list=new ArrayList<>();
list.add(userID);
list.add(0);
taskService.start(new TaskBto(StatusEnum.RETRIEVE1401.id, title, 0, ".", lossId, BusinessEnum.RETRIEVE.id, unitId, 1, "", list));
}
private void endRetrieve(Integer userId, Integer lossId, String title, Integer unitId){
......@@ -159,10 +186,18 @@ public class LossBillServiceImpl implements LossBillService {
}
private void newLossTask(Integer unitId, Integer lossId, String title){
private void newLossCountyTask(Integer unitId, Integer lossId, String title,Integer userID){
List<Integer> list=new ArrayList<>();
list.add(userID);
list.add(0);
taskService.start(new TaskBto(StatusEnum.LOSS1300.id, title, 0, ".", lossId, BusinessEnum.LOSS.id, unitId, 1, "", list));
}
private void newLossCityTask(Integer unitId, Integer lossId, String title,Integer userID){
List<Integer> list=new ArrayList<>();
list.add(userID);
list.add(0);
taskService.start(new TaskBto(StatusEnum.LOSS1300.id, title, 0, ".", lossId, BusinessEnum.LOSS.id, unitId, 0, "", list));
taskService.start(new TaskBto(StatusEnum.LOSS1301.id, title, 0, ".", lossId, BusinessEnum.LOSS.id, unitId, 1, "", list));
}
private void end(Integer userId, Integer lossId, String title, Integer unitId){
......
dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java
浏览文件 @ 9d214ce3
......@@ -90,9 +90,13 @@ public enum StatusEnum {
LOSS1300(1300,"丢失装备等待审核"),
LOSS1300(1300,"丢失装备等待市审核"),
RETRIEVE1400(1400,"装备找回等待审核"),
LOSS1301(1301,"丢失装备等待省审核"),
RETRIEVE1400(1400,"装备找回等待市审核"),
RETRIEVE1401(1401,"装备找回等待省审核"),
// SEND_BACK_1204(1204, "入库待审核"),
......
dev-misc/src/main/java/com/tykj/dev/misc/utils/TaskDisposeUtil.java
浏览文件 @ 9d214ce3
......@@ -22,9 +22,8 @@ public class TaskDisposeUtil {
}
public static void isNotSubmit(Integer billStatus, StatusEnum statusEnum){
if (!statusEnum.id.equals(billStatus)){
public static void isNotSubmit(Integer billStatus, StatusEnum statusEnums){
if (!statusEnums.id.equals(billStatus)){
throw new ApiException(ResponseEntity.status(303).body("本次任务已经被其他专管员完成,请处理其他任务"));
}
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelDevController.java
浏览文件 @ 9d214ce3
......@@ -4,11 +4,14 @@ import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
import com.tykj.dev.device.sendback.entity.vo.*;
import com.tykj.dev.device.sendback.service.RepelBusinessService;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
......@@ -160,8 +163,8 @@ public class RepelDevController {
*/
@ApiOperation(value = "省直属任务待清退", notes = "省直属任务待清退")
@GetMapping(value ="/provinceDirectlyUnder/{taskId}")
public ResponseEntity provinceDirectlyUnder(@PathVariable Integer taskId){
repelBusinessService.provinceDirectlyUnder(taskId);
public ResponseEntity provinceDirectlyUnder(@PathVariable Integer taskId,@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser){
repelBusinessService.provinceDirectlyUnder(taskId,securityUser);
return ResponseEntity.ok("省直属单位任务提交成功");
}
......@@ -175,5 +178,13 @@ public class RepelDevController {
return ResponseEntity.ok("上传回执单成功");
}
/**
* 测试
*/
@ApiOperation(value = "测试", notes = "上传回执单 也可以不上传回执单")
@PostMapping(value ="/test")
public ResponseEntity receipts1(){
return ResponseEntity.status(303).body("test");
}
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/StorageDeviceRepel.java
浏览文件 @ 9d214ce3
......@@ -31,4 +31,12 @@ public class StorageDeviceRepel {
private Integer userId;
private Integer taskId;
private Integer userA;
private Integer userB;
private String userAName;
private String userBName;
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java
浏览文件 @ 9d214ce3
......@@ -7,6 +7,7 @@ import com.tykj.dev.device.sendback.entity.vo.OrderOutData;
import com.tykj.dev.device.sendback.entity.vo.RepelAuditResult;
import com.tykj.dev.device.sendback.entity.vo.ResolveConfirm;
import com.tykj.dev.device.sendback.entity.vo.StorageDeviceRepel;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import java.util.List;
......@@ -28,6 +29,7 @@ public interface RepelBusinessService {
*/
void cityInitiateRepel(DeviceRepel deviceRepel,Integer userId);
/**
* 省审核市清退任务
*/
......@@ -81,7 +83,7 @@ public interface RepelBusinessService {
/**
* 省直属任务等待上传
*/
void provinceDirectlyUnder(Integer taskId);
void provinceDirectlyUnder(Integer taskId, SecurityUser securityUser);
/**
* 省\市清退任待办结 签字上传
......@@ -94,7 +96,7 @@ public interface RepelBusinessService {
void cityRepelEnd(Integer taskId);
/**
* 生成省中办出库的任务
* 生成省中办退役的任务
* @param userId 用户id
* @param orderOutData 出库对象
*/
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ 9d214ce3
......@@ -5,6 +5,7 @@ import com.tykj.dev.config.GlobalMap;
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.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
......@@ -20,6 +21,7 @@ import com.tykj.dev.device.sendback.util.StringUtils;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.user.subject.entity.Area;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.subject.service.AreaService;
......@@ -31,6 +33,7 @@ import com.tykj.dev.misc.base.DeviceLifeStatus;
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.TaskDisposeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
......@@ -88,6 +91,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Autowired
PackingLibraryDao packingLibraryDao;
@Autowired
DeviceLibraryService deviceLibraryService;
@Override
public void initiateRepel(DeviceRepel deviceRepel, Integer userId) {
User user = userService.findByUser(userId);
......@@ -274,6 +280,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Override
public void provinceAuditCity(Integer taskId, Integer userId,RepelAuditResult repelAuditResult) {
TaskBto taskBto=taskService.get(taskId);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1211);
if (repelAuditResult.getType()==1) {
DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
DeviceRepel deviceRepel = deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
......@@ -315,6 +323,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
public void resolveConfirm(Integer taskId,Integer userId) {
TaskBto taskBto= taskService.get(taskId);
List<StatusEnum> list=new ArrayList<>();
list.add(StatusEnum.SEND_BACK_1205);
list.add(StatusEnum.SEND_BACK_1203);
list.add(StatusEnum.SEND_BACK_1202);
list.add(StatusEnum.SEND_BACK_1201);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),list);
StringBuffer ids=new StringBuffer();
DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
......@@ -346,7 +361,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
public void submitChooseDevice(Integer taskId, ResolveConfirm resolveConfirm) {
long stime=System.currentTimeMillis();
TaskBto taskBto= taskService.get(taskId);
isNotSubmit(taskBto,StatusEnum.SEND_BACK_1205);
deviceLibraryService.isInStockOrWaitRetired(resolveConfirm.getDevIds());
List<StatusEnum> list=new ArrayList<>();
list.add(StatusEnum.SEND_BACK_1205);
list.add(StatusEnum.SEND_BACK_1203);
list.add(StatusEnum.SEND_BACK_1202);
list.add(StatusEnum.SEND_BACK_1201);
list.add(StatusEnum.SEND_BACK_1206);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),list);
log.info("提交装备接口开始{}",taskId);
Map<String,Integer> map=new HashMap<>();
StringBuffer ids=new StringBuffer();
......@@ -379,6 +401,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
repelTaskStatistical.setDes(resolveConfirm.getDes());
repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
//装备状态改为锁定
deviceLibraryDao.upDateLeftStatusAndLockStatus(2,1,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
deviceRepelDetail.setDeviceIds(ids.toString());
deviceRepelDetail.setSubmitDescription(resolveConfirm.getDes());
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
......@@ -388,6 +413,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Override
public void resolveAudit(Integer taskId, RepelAuditResult repelAuditResult) {
TaskBto taskBto = taskService.get(taskId);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1207);
DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
repelTaskStatistical.setTaskStatus(0);
......@@ -395,11 +422,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
//1 审核通过
if (repelAuditResult.getType()==1){
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1208,0);
deviceLibraryDao.upDateLeftStatus(15,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
// deviceLibraryDao.upDateLeftStatus(15,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
}else {
//审核失败
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1206,0);
deviceLibraryDao.upDateLeftStatus(2,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
deviceLibraryDao.upDateLeftStatusAndLockStatus(2,0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
}
deviceRepelDetail.setAuditingFeedback(repelAuditResult.getDes());
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
......@@ -416,6 +443,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Override
public DeviceRepelDetail sendBackOutCheck(Integer taskId, Integer userId, OrderOutData orderOutData) {
TaskBto taskBto= taskService.get(taskId);
List<StatusEnum> statusEnums=new ArrayList<>();
statusEnums.add(StatusEnum.SEND_BACK_1206);
statusEnums.add(StatusEnum.SEND_BACK_1208);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
DeviceRepelDetail orderOutDataRepelDetail =orderOutData.toTrainDetailsVo();
orderOutDataRepelDetail.setId(deviceRepelDetail.getId());
......@@ -423,7 +455,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
orderOutDataRepelDetail.setDeviceIds(deviceRepelDetail.getDeviceIds());
orderOutDataRepelDetail.setLeftSignatureId(UUID.randomUUID().toString());
orderOutDataRepelDetail.setRightSignatureId(UUID.randomUUID().toString());
orderOutDataRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+deviceRepelDetail.getId());
orderOutDataRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+taskBto.getBillId());
deviceRepelDetailService.saveDeviceRepelDetail(orderOutDataRepelDetail);
deviceLibraryDao.upDateLeftStatusAndOwnUnitName(DeviceLifeStatus.REPEL.id,orderOutData.getReceiveUnit(),StringUtils.stringToList(orderOutDataRepelDetail.getDeviceIds()));
taskBto.setOwnUnit(orderOutData.getReceiveUnitId());
......@@ -442,6 +474,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
public void storageDeviceRepel(Integer taskId, StorageDeviceRepel storageDeviceRepel) {
List<RepelDeviceUnit> list=new ArrayList<>();
TaskBto taskBto= taskService.get(taskId);
List<StatusEnum> enumList=new ArrayList<>();
enumList.add(StatusEnum.SEND_BACK_1209);
enumList.add(StatusEnum.SEND_BACK_1213);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1209);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
deviceRepelDetail.setInFile(FilesUtil.stringFileToList(storageDeviceRepel.getInFiles()));
......@@ -450,11 +487,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
//判断是否为 市提交 是则为在库
//否则为待清退
Integer inStock;
if (unitsService.findById(deviceRepelDetail.getReceiveUnitId()).getLevel()==2){
inStock=DeviceLifeStatus.IN_LIBRARY.id;
}else {
// if (unitsService.findById(deviceRepelDetail.getReceiveUnitId()).getLevel()==2){
// inStock=DeviceLifeStatus.IN_LIBRARY.id;
// }else {
inStock=DeviceLifeStatus.REPEL.id;
}
// }
List<DeviceLibrary> libraries= findInvoleDevice(deviceRepelDetail.getDeviceIds());
libraries.forEach(
deviceLibrary -> {
......@@ -467,7 +504,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
);
log.info("更新数据装备以及所属单位-{}",libraries.size());
long time=System.currentTimeMillis();
deviceLibraryDao.upDateLeftStatusAndUnitName(inStock,deviceRepelDetail.getReceiveUnit(),StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(inStock,deviceRepelDetail.getReceiveUnit(),0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
log.info("更新数据装备以及所属单位{}",System.currentTimeMillis()-time);
repelDeviceUnitService.saveAllRepelDeviceUnit(list);
......@@ -488,6 +525,12 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
Units units=unitsService.findById(user.getUnitsId());
List<RepelDeviceUnit> list=new ArrayList<>();
TaskBto taskBto= taskService.get(taskId);
List<StatusEnum> enumList=new ArrayList<>();
enumList.add(StatusEnum.SEND_BACK_1213);
enumList.add(StatusEnum.SEND_BACK_1203);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
deviceRepelDetail.setRepelStatus(2);
......@@ -501,7 +544,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
);
log.info("更新数据装备以及所属单位-{}",libraries.size());
long time=System.currentTimeMillis();
deviceLibraryDao.upDateLeftStatusAndUnitName(DeviceLifeStatus.REPEL.id,units.getName(),libraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList()));
deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.REPEL.id,units.getName(),0,libraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList()));
log.info("更新数据装备以及所属单位{}",System.currentTimeMillis()-time);
// deviceRepelDetail.setDeviceIds(ids.toString());
......@@ -516,8 +559,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
}
@Override
public void provinceDirectlyUnder(Integer taskId) {
public void provinceDirectlyUnder(Integer taskId,SecurityUser securityUser) {
TaskBto taskBto= taskService.get(taskId);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1202);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
List<DeviceLibrary> libraries=deviceLibraryDao.getDeviceLibraryEntitiesByIdIn(StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
devLogAdd(libraries,"省直属清退，把装备转变为待清退",securityUser.getCurrentUserInfo().getUserId());
deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.REPEL.id,securityUser.getCurrentUserInfo().getUnits().getName(),0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1213,0);
}
......@@ -530,6 +578,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Override
public void cityRepelEnd(Integer taskId) {
TaskBto taskBto=taskService.get(taskId);
List<StatusEnum> enumList=new ArrayList<>();
enumList.add(StatusEnum.SEND_BACK_1200);
enumList.add(StatusEnum.SEND_BACK_1212);
enumList.add(StatusEnum.SEND_BACK_1204);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
taskService.moveToEnd(taskService.get(taskId));
}
......@@ -551,8 +606,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
public void receiptSingle(Integer taskId, StorageDeviceRepel storageDeviceRepel) {
List<RepelDeviceUnit> list=new ArrayList<>();
TaskBto taskBto= taskService.get(taskId);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1210);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
// deviceRepelDetail.setReceiveUserAId(storageDeviceRepel.getUserA());
deviceRepelDetail.setReceiveUserAName(storageDeviceRepel.getUserAName());
// deviceRepelDetail.setReceiveUserBId(storageDeviceRepel.getUserB());
deviceRepelDetail.setReceiveUserBName(storageDeviceRepel.getUserBName());
taskService.moveToEnd(taskBto);
List<DeviceLibrary> libraries= findInvoleDevice(deviceRepelDetail.getDeviceIds());
......@@ -566,7 +627,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
);
log.info("更新数据装备以及所属单位-{}",libraries.size());
long time=System.currentTimeMillis();
deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.RETIRE.id,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
deviceLibraryDao.upDateLeftStatusAndLockStatus(DeviceLifeStatus.RETIRE.id,0,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
log.info("更新数据装备以及所属单位{}",System.currentTimeMillis()-time);
// deviceLibraryDao.saveAll(libraries);
......@@ -582,6 +643,8 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Override
public void receipts(StorageDeviceRepel storageDeviceRepel) {
TaskBto taskBto = taskService.get(storageDeviceRepel.getTaskId());
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1214);
taskService.moveToEnd(taskBto);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setOutboundFile(FilesUtil.stringFileToList(storageDeviceRepel.getOutFiles()));
......@@ -764,11 +827,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
}
private void isNotSubmit(TaskBto taskBto,StatusEnum statusEnum){
if (taskBto.getBillStatus()!=statusEnum.id){
throw new ApiException(ResponseEntity.status(303).body("任务已被其他专管员处理"));
}
}
}
dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java
浏览文件 @ 9d214ce3
......@@ -27,6 +27,7 @@ import com.tykj.dev.misc.base.BeanHelper;
import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.TaskDisposeUtil;
import com.tykj.dev.socket.MyWebSocket;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -175,6 +176,8 @@ public class TrainJobController {
public ResponseEntity signUp(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody signUpReturn signUpReturn) {
TrainTheme trainTheme = trainThemeService.findById(signUpReturn.getTrainThemeId());
TaskBto taskBto = taskService.get(signUpReturn.getTaskId());
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1002);
Integer taskId=taskBto.getId();
List<SignUpUsers> signUpUsers= signUpReturn.getSignUpUsers();
signUpUsers.forEach(signUpUser -> {
......@@ -274,6 +277,9 @@ public class TrainJobController {
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
// TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
//判断
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1008);
taskBto.setOwnUnit(1);
taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1005);
gradeEntryVo.getGradeEntryList().forEach(
......@@ -303,6 +309,10 @@ public class TrainJobController {
public ResponseEntity provinceAudit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
//判断
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1005);
taskBto = taskService.addInvolveUser(taskBto, securityUser.getCurrentUserInfo().getUserId());
taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1006, gradeEntryVo.getAuditId());
......@@ -335,6 +345,11 @@ public class TrainJobController {
public ResponseEntity audit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
//判断
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1008);
taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1007, gradeEntryVo.getAuditId());
//7 省培训发证审核
......@@ -376,6 +391,12 @@ public class TrainJobController {
TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
//给培训报名的人员都发起一个通知，查看自己都证书
TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
List<StatusEnum> statusEnums=new ArrayList<>();
statusEnums.add(StatusEnum.TRAIN1006);
statusEnums.add(StatusEnum.TRAIN1007);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
taskService.moveToEnd(taskBto);
// TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
// //8 培训完成
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论