【清退】 代码提交

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -203,6 +203,8 @@ public enum LogType {
     LOSS_3(9002,LOSS.id,LOSS1300.id,END.id,"确认了装备丢失报告,报告任务结束"),
     LOSS_4(9003,LOSS.id,ORIGIN_STATUS.id,END.id,"省装备丢失报告发起记录"),
     LOSS_5(9004,LOSS.id,ORIGIN_STATUS.id,LOSS1301.id,"发起丢失装备上报"),
+    LOSS_6(9005,LOSS.id,LOSS1301.id,END.id,"发起丢失装备上报,完成"),
+
 
 
     RETRIEVE_1(9010,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1400.id,"发起装备找回上报"),

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -61,7 +61,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     boolean existsAllByPackingIdInAndOwnUnitIn(List<Integer> packingIds,List<String> unitNames);
 
-    Integer countAllByModelAndOwnUnitIn(String model,List<String> unitNames);
+    Integer countAllByModelAndOwnUnitInAndLifeStatusNotIn(String model,List<String> unitNames,List<Integer> lifeStatus);
 
 
     List<DeviceLibrary> findAllByPackingIdInAndOwnUnit(List<Integer> packingIds,String unitNames);

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -99,6 +99,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         User user = userService.findByUser(userId);
         Units units=unitsService.findById(user.getUnitsId());
         Area area=areaService.findByid(units.getAreaId());
+        List<Integer> lifeStatus=new ArrayList<>();
+        lifeStatus.add(DeviceLifeStatus.RETIRE.id);
+        lifeStatus.add(DeviceLifeStatus.LOSS.id);
+        lifeStatus.add(DeviceLifeStatus.DESTROYED.id);
+        lifeStatus.add(DeviceLifeStatus.SCRAP_I.id);
         List<String> directlUnderUnitNames=new ArrayList<>();
         AtomicBoolean directlUnderUnit= new AtomicBoolean(false);
         AtomicBoolean correspondingLevel= new AtomicBoolean(false);
@@ -119,7 +124,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         TaskBto taskBto= statsXTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
 //        repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
         List<RepelTaskStatistical> list=new ArrayList<>();
-        Set<ModelCount> modelCounts=new HashSet<>();
+        List<ModelCount> modelCounts=new ArrayList<>();
         deviceRepel.getModels().forEach(i->{
             modelCounts.add(new ModelCount(i,0));
         });
@@ -137,10 +142,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                              deviceRepelDetail.setId(null);
                              if (deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitsService.findBySubordinateUnitName(units1.getUnitId()))) {
                                  TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
-                                 Set<ModelCount> modelCounts1=modelCounts;
+                                 List<ModelCount> modelCounts1=modelCounts;
                                  if (deviceRepel.getRepelStatus()==1){
+                                     modelCounts1.clear();
                                      deviceRepel.getModels().forEach(i->{
-                                         modelCounts1.add(new ModelCount(i,deviceLibraryDao.countAllByModelAndOwnUnitIn(i,unitsService.findBySubordinateUnitName(units1.getUnitId()))));
+                                         modelCounts1.add(new ModelCount(i,deviceLibraryDao.countAllByModelAndOwnUnitInAndLifeStatusNotIn(i,unitsService.findBySubordinateUnitName(units1.getUnitId()),lifeStatus)));
                                      });
                                  }
                                  list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), JacksonUtil.toJSon(modelCounts1), ""));
@@ -157,8 +163,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         deviceRepelDetail.setId(null);
         if (directlUnderUnit.get()&&deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), directlUnderUnitNames)){
             if (deviceRepel.getRepelStatus()==1) {
+                modelCounts.clear();
                 deviceRepel.getModels().forEach(i -> {
-                    modelCounts.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitIn(i, directlUnderUnitNames)));
+                    modelCounts.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitInAndLifeStatusNotIn(i, directlUnderUnitNames,lifeStatus)));
                 });
             }
                 TaskBto taskBto2 = directlyUnderTask(units.getUnitId(), deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
@@ -170,9 +177,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
 
         if (correspondingLevel.get()&&deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(),strings)){
             if (deviceRepel.getRepelStatus()==1) {
-
+                modelCounts.clear();
                 deviceRepel.getModels().forEach(i -> {
-                    modelCounts.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitIn(i, strings)));
+                    modelCounts.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitInAndLifeStatusNotIn(i, strings,lifeStatus)));
                 });
             }
             TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
@@ -190,6 +197,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         // 当前task推送  装备待清退
         // 生成的任务放入统计表中 关联信息
         // 修改当前任务的状态 市清退任务待区县提交
+        List<Integer> lifeStatus=new ArrayList<>();
+        lifeStatus.add(DeviceLifeStatus.RETIRE.id);
+        lifeStatus.add(DeviceLifeStatus.LOSS.id);
+        lifeStatus.add(DeviceLifeStatus.DESTROYED.id);
+        lifeStatus.add(DeviceLifeStatus.SCRAP_I.id);
         User user = userService.findByUser(userId);
         Units units=unitsService.findById(user.getUnitsId());
         Area area=areaService.findByid(units.getAreaId());
@@ -220,8 +232,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                         if (deviceLibraryDao.existsAllByPackingIdInAndOwnUnitIn(deviceRepel.getFieldingIds(), unitNames)) {
                             Set<ModelCount> modelCounts1=modelCounts;
                             if (deviceRepel.getRepelStatus()==1) {
+                                modelCounts1.clear();
                                 deviceRepel.getModels().forEach(i -> {
-                                    modelCounts1.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitIn(i, unitNames)));
+                                    modelCounts1.add(new ModelCount(i, deviceLibraryDao.countAllByModelAndOwnUnitInAndLifeStatusNotIn(i, unitNames,lifeStatus)));
                                 });
                             }
                             TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId());
@@ -445,6 +458,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     public DeviceRepelDetail sendBackOutCheck(Integer taskId, Integer userId, OrderOutData orderOutData) {
          TaskBto taskBto= taskService.get(taskId);
          List<StatusEnum> statusEnums=new ArrayList<>();
+         statusEnums.add(StatusEnum.SEND_BACK_1205);
          statusEnums.add(StatusEnum.SEND_BACK_1206);
          statusEnums.add(StatusEnum.SEND_BACK_1208);
          TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
@@ -482,6 +496,16 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
        List<RepelDeviceUnit> list=new ArrayList<>();
        TaskBto taskBto= taskService.get(taskId);
        DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
+       deviceRepelDetail.setReceiveUserBName(storageDeviceRepel.getUserBName());
+       if (storageDeviceRepel.getUserB()!=null){
+           deviceRepelDetail.setReceiveUserBId(storageDeviceRepel.getUserB());
+
+       }
+        if (storageDeviceRepel.getUserA()!=null){
+            deviceRepelDetail.setReceiveUserAId(storageDeviceRepel.getUserA());
+
+        }
+       deviceRepelDetail.setReceiveUserAName(storageDeviceRepel.getUserBName());
        //判断是否为入库单据待补充 还是直接入库。
        if (storageDeviceRepel.getFileRets()!=null&&storageDeviceRepel.getFileRets().size()!=0) {
            List<StatusEnum> enumList=new ArrayList<>();
@@ -490,13 +514,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
            enumList.add(StatusEnum.SEND_BACK_1215);
            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),enumList);
            deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
+           deviceRepelDetail.setRepelStatus(2);
            taskService.moveToEnd(taskBto);
        }else {
            //判断当前状态是否为SEND_BACK_1209 清退装备等待入库
            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1209);
            taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1215,0);
         }
-        deviceRepelDetail.setRepelStatus(2);
+
        //判断是否为 市提交 是则为在库
         //否则为待清退
 //       if (unitsService.findById(deviceRepelDetail.getReceiveUnitId()).getLevel()==2){
@@ -560,6 +585,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
 //        deviceRepelDetail.setDeviceIds(ids.toString());
 //        deviceLibraryDao.saveAll(libraries);
 //        repelDeviceUnitService.saveAllRepelDeviceUnit(list);
+        RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
+        repelTaskStatistical.setTaskStatus(1);
+        repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
         deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
         isEnd(taskBto,deviceRepelDetail.getRepelId());
         devLogAdd(libraries,"省本级清退，把装备转变为待清退",userId);

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -94,7 +94,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) {
         Units units=  unitsService.findById(repelManagementVo.getUnitId());
-        return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime()).collect(Collectors.toList()));
+        return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
     }
 
     private List<ModelNameGroup> toModelNameGroup(List<DeviceLibrary> deviceLibraries){
@@ -196,13 +196,16 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<DeviceRepelDetail> getList() {
         List<DeviceRepelDetail> list=new ArrayList<>();
-        repelDetailService.findAll().forEach(
+        repelDetailService.findAll().stream().filter(i-> i.getRepelStatus()==2).forEach(
                 deviceRepelDetail -> {
                     if (deviceRepelDetail.getBillFile()!=null){
                         deviceRepelDetail.setBillFiles(FilesUtil.stringFileToList(deviceRepelDetail.getBillFile()));
-                        deviceRepelDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllById(StringUtils.stringToList(deviceRepelDetail.getDeviceIds())));
-                        list.add(deviceRepelDetail);
                     }
+                    if (deviceRepelDetail.getOutboundFile()!=null){
+                        deviceRepelDetail.setOutboundFiles(FilesUtil.stringFileToList(deviceRepelDetail.getOutboundFile()));
+                    }
+                    deviceRepelDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllById(StringUtils.stringToList(deviceRepelDetail.getDeviceIds())));
+                    list.add(deviceRepelDetail);
                 }
         );
         return list;