[销毁] bug提交

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/controller/DecommissioningQueryController.java

@@ -4,12 +4,16 @@ import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningQueryService;
+import com.tykj.dev.device.library.service.DeviceLibraryService;
 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.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author zjm
  * @version 1.0.0
@@ -26,6 +30,9 @@ public class DecommissioningQueryController {
     @Autowired
     DeviceDecommissioningQueryService deviceDecommissioningQueryService;
 
+    @Autowired
+    DeviceLibraryService deviceLibraryService;
+
     /**
      * 查询退役中办任务
      */
@@ -104,6 +111,17 @@ public class DecommissioningQueryController {
         return ResponseEntity.ok(deviceDecommissioningQueryService.findPageDeviceDecommissioningDetail(decommissioningSelectVo));
     }
 
+    /**
+     * 业务办理档案接口
+     */
+    @GetMapping(value ="/test")
+    @ApiOperation(value = "test", notes = "业务办理档案接口调用")
+    public ResponseEntity responseEntity(){
+        List<String> list=new ArrayList<>();
+        list.add("129678376353");
+        deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(list,3);
+        return ResponseEntity.ok("ok");
+    }
 
 
 }

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

@@ -141,7 +141,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                         }
                     }
             );
-        deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.REPEL.id);
+            deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.REPEL.id);
             //判断是否为草稿 还是直接发起
             if (decommissioningOrderOutData.getTaskId()!=null){
                 TaskBto taskBto= taskService.get(decommissioningOrderOutData.getTaskId());
@@ -184,8 +184,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
     public void receiptSingle(Integer taskId, StorageDeviceDevommissiong storageDeviceDevommissiong) {
         User user=userService.findByUser(storageDeviceDevommissiong.getUserId());
         TaskBto taskBto= taskService.get(taskId);
-        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1210);
-        DeviceDecommissioningDetail deviceDecommissioningDetail=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
+        List<StatusEnum> statusEnums = new ArrayList<>();
+        statusEnums.add(StatusEnum.SEND_BACK_1210);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);        DeviceDecommissioningDetail deviceDecommissioningDetail=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
         deviceDecommissioningDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceDevommissiong.getFileRets()));
         List<String> seqNumbers=new ArrayList<>();
         JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainController.java

@@ -57,5 +57,14 @@ public class TrainController {
         return ResponseEntity.ok(trainThemeService.findById(trainThemeId));
     }
 
+    /**
+     * 根据taskId查询培训信息
+     */
+    @GetMapping("/detail/task/{taskId}")
+    public ResponseEntity trainThemeVoResponseEntity1(@PathVariable Integer taskId) {
+
+        return ResponseEntity.ok(trainThemeService.findBytaskId(taskId));
+    }
+
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/TrainThemeService.java

@@ -38,4 +38,6 @@ public interface TrainThemeService {
     TrainThemePage findTrainPageVo(ConditionsTrainVo conditionsTrainVo);
 
     TrainDetailsVo findSelectDetailsVo(Integer trainId);
+
+    TrainTheme findBytaskId(Integer taskId);
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -6,7 +6,9 @@ import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
 import com.tykj.dev.device.file.service.FilesUtil;
+import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
+import com.tykj.dev.device.task.subject.domin.Task;
 import com.tykj.dev.device.train.dao.TrainThemeDao;
 import com.tykj.dev.device.train.dao.TrainUserDao;
 import com.tykj.dev.device.train.entity.TrainTheme;
@@ -62,6 +64,9 @@ public class TrainThemeServiceImpl implements TrainThemeService {
     @Autowired
     BlockChainUtil blockChainUtil;
 
+    @Autowired
+    TaskService taskService;
+
     @Override
     public TrainTheme save(TrainTheme trainTheme) {
         TrainTheme trainTheme1 = trainThemeDao.save(trainTheme);
@@ -230,6 +235,13 @@ public class TrainThemeServiceImpl implements TrainThemeService {
 
     }
 
+    @Override
+    public TrainTheme findBytaskId(Integer taskId) {
+        TaskBto taskBto = taskService.get(taskId);
+
+        return findById(taskBto.getBillId());
+    }
+
     private Page<TrainTheme> getContacts(ConditionsTrainVo conditionsTrainVo, Pageable pageable) {
         PredicateBuilder<TrainTheme> predicateBuilder = Specifications.and();
         if (conditionsTrainVo.getEndTime() != null && conditionsTrainVo.getStatusTime() != null) {

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -53,7 +53,6 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findLeftNavigation(securityUser));
     }
 
-
     @GetMapping(value = "/findAll/GreaterThanEqual/{level}")
     @ApiOperation(value = "根据当前用户的单位等级，查询所有的下级单位以及自己单位", notes = "单位集合")
     public ResponseEntity GreaterThanEqualLeven(@PathVariable Integer level) {

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -169,7 +169,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public List<UserShenRe> findByUniteId(Integer unitsId) {
 
-        return userDao.findAllByUnitsId(unitsId).stream().map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
+        return userDao.findAllByUnitsId(unitsId).stream().filter(user -> user.getIsDel()==0).map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
     }
 
     @Override
@@ -409,7 +409,7 @@ public class UserServiceImpl implements UserService {
         List<UserSuperiorVo> list = new ArrayList<>();
         User user = userDao.findById(userId).get();
 
-        userDao.findAllByUnitsIdIn(unitsService.findSuperiorByunitsId(user.getUnitsId())).stream().filter(user1 -> user1.getUsername()!=null&&!user1.getUsername().equals("")).forEach(
+        userDao.findAllByUnitsIdIn(unitsService.findSuperiorByunitsId(user.getUnitsId())).stream().filter(user1 -> user1.getIsDel()==0&&user1.getTrainStatus()!=5).forEach(
                 user1 -> {
                     UserSuperiorVo userSuperiorVo = user1.toUserSuperiorVo();
                     userSuperiorVo.setUnitsName(unitsService.findById(user1.getUnitsId()).getName());
@@ -482,7 +482,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public List<UserShenRe> findUnitNameListUser(UnitNameVo unitNameVo) {
 
-        return userDao.findAllByUnitsId(userPublicService.findUnitIdByName(unitNameVo.getUnitName())).stream().map(User::toRe).collect(Collectors.toList());
+        return userDao.findAllByUnitsId(userPublicService.findUnitIdByName(unitNameVo.getUnitName())).stream().filter(user -> user.getIsDel()==0).map(User::toRe).collect(Collectors.toList());
     }
 
     @Override