[清退、报废、退役、销毁、培训] 代码优化提交

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

 package com.tykj.dev.device.decommissioning.controller;
 
 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 io.swagger.annotations.Api;
@@ -92,4 +93,17 @@ public class DecommissioningQueryController {
     public ResponseEntity findApplyIdToDecommissioningTask(@PathVariable Integer applyId){
         return ResponseEntity.ok(deviceDecommissioningQueryService.findApplyIdToDecommissioningTask(applyId));
     }
+
+
+    /**
+     * 业务办理档案接口
+     */
+    @PostMapping(value ="/findPageDeviceDecommissioningDetail")
+    @ApiOperation(value = "业务办理档案接口", notes = "业务办理档案接口调用")
+    public ResponseEntity findApplyIdToDecommissioningTask(@RequestBody DecommissioningSelectVo decommissioningSelectVo){
+        return ResponseEntity.ok(deviceDecommissioningQueryService.findPageDeviceDecommissioningDetail(decommissioningSelectVo));
+    }
+
+
+
 }

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/entity/vo/DecommissioningSelectVo.java

+package com.tykj.dev.device.decommissioning.entity.vo;
+
+import com.tykj.dev.misc.base.CustomPage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelManagementVo.java
+ * @Description 清退管理 清退清退vo
+ * @createTime 2021年01月23日 12:42:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("退役业务分页查询业务")
+public class DecommissioningSelectVo extends CustomPage {
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    private LocalDateTime endTime;
+
+}

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

 package com.tykj.dev.device.decommissioning.service;
 
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
+import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -37,4 +39,6 @@ public interface DeviceDecommissioningDetailService {
 
     DeviceDecommissioningDetail findApplyId(Integer applyId);
 
+    Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo);
+
 }

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

 package com.tykj.dev.device.decommissioning.service;
 
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
+import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
 import com.tykj.dev.device.decommissioning.entity.vo.PagingVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import org.apache.poi.ss.formula.functions.T;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -55,4 +57,7 @@ public interface DeviceDecommissioningQueryService {
      * 根据申请id查询退役任务
      */
     TaskBto findApplyIdToDecommissioningTask(Integer applyId);
+
+    Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo);
+
 }

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

@@ -108,6 +108,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             DeviceDecommissioningDetail  deviceDecommissioningDetail1 = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
             deviceDecommissioningDetail.setId(deviceDecommissioningDetail1.getId());
         }
+        deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
+        deviceDecommissioningDetail.setReplayNumber(decommissioningOrderOutData.getReplayNumber());
         deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
         deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
         deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
@@ -225,6 +227,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
             taskService.moveToSpecial(taskBto, StatusEnum.DECOMMISSIONING_1251, orderOutData.getSendUserbId());
         }
+        deviceDecommissioningDetail.setApplyNumber(orderOutData.getApplyNumber());
+        deviceDecommissioningDetail.setReplayNumber(orderOutData.getReplayNumber());
         deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(orderOutData.getReplyFileList()));
         deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(orderOutData.getApplyFileList()));
         deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(orderOutData.getScriptSaveVos()));

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

 package com.tykj.dev.device.decommissioning.service.impl;
 
 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.device.decommissioning.entity.DeviceDecommissioningDetail;
+import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
+import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.decommissioning.repository.DeviceDecommissioningDetailDao;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
 import com.tykj.dev.device.file.service.FilesUtil;
@@ -15,13 +19,14 @@ import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import javax.persistence.Transient;
+import java.lang.reflect.Field;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -110,6 +115,22 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
         return deviceDecommissioningDetailDao.findByApplyId(applyId);
     }
 
+    @Override
+    public Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo) {
+        return deviceDecommissioningDetailDao.findAll(getFindRetiredSpecification(decommissioningSelectVo),decommissioningSelectVo.getPageable()).map(deviceDecommissioningDetail -> {
+            deviceDecommissioningDetail.setScripts(JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {
+            }));
+            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()));
+            return deviceDecommissioningDetail;
+        });
+    }
+
+
+
     private List<DeviceLibrary> findInvoleDevice(String involeDevice){
         if (involeDevice!=null && !involeDevice.equals(",") ) {
             List<String> idStringList = Arrays.asList(involeDevice.split(","));
@@ -121,4 +142,20 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
             return new ArrayList<>();
         }
     }
+
+    private Specification<DeviceDecommissioningDetail> getFindRetiredSpecification(DecommissioningSelectVo decommissioningSelectVo) {
+        PredicateBuilder<DeviceDecommissioningDetail> predicateBuilder = Specifications.and();
+//        List<Integer> leftStatus=new ArrayList<>();
+//        leftStatus.add(com.tykj.dev.config.base.DeviceLifeStatus.RETIRED.id);
+        if (decommissioningSelectVo.getStartTime() != null) {
+            predicateBuilder.gt("createTime", decommissioningSelectVo.getStartTime());
+        }
+        if (decommissioningSelectVo.getEndTime() != null) {
+            predicateBuilder.lt("createTime", decommissioningSelectVo.getEndTime());
+        }
+        return predicateBuilder.build();
+
+    }
+
+
 }

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

@@ -3,6 +3,7 @@ package com.tykj.dev.device.decommissioning.service.impl;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
+import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
 import com.tykj.dev.device.decommissioning.entity.vo.PagingVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
@@ -136,6 +137,12 @@ public class DeviceDecommissioningQueryServiceImpl implements DeviceDecommission
 
     }
 
+    @Override
+    public Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo) {
+
+        return deviceDecommissioningDetailService.findPageDeviceDecommissioningDetail(decommissioningSelectVo);
+    }
+
     private Specification<DeviceLibrary> getRetiredSpecification(RepelManagementVo repelManagementVo) {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
         predicateBuilder.eq("lifeStatus", DeviceLifeStatus.RETIRE.id);
@@ -218,4 +225,6 @@ public class DeviceDecommissioningQueryServiceImpl implements DeviceDecommission
         }
         return predicateBuilder;
     }
+
+
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyQueryController.java

 package com.tykj.dev.device.destroy.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.entity.vo.DeviceDestroyBillVo;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBusinessService;
 import com.tykj.dev.device.destroy.service.DeviceDestroyQueryService;
@@ -42,5 +43,12 @@ public class DeviceDestroyQueryController {
         return ResponseEntity.ok(deviceDestroyQueryService.findApplyIdToDeviceDestroyTask(applyId));
     }
 
-
+    /**
+     * 业务办理档案接口
+     */
+    @PostMapping(value ="/findPageDeviceDecommissioningDetail")
+    @ApiOperation(value = "业务办理档案接口", notes = "业务办理档案接口调用")
+    public ResponseEntity findApplyIdToDecommissioningTask(@RequestBody DestroySelectVo destroySelectVo){
+        return ResponseEntity.ok(deviceDestroyQueryService.findPageDeviceDestroyBill(destroySelectVo));
+    }
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/vo/DestroySelectVo.java

+package com.tykj.dev.device.destroy.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.misc.base.CustomPage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelManagementVo.java
+ * @Description 清退管理 清退清退vo
+ * @createTime 2021年01月23日 12:42:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("销毁业务分页查询业务")
+public class DestroySelectVo extends CustomPage {
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(name = "开始清退的年份 默认各式 2020-01-01 00：00：00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endTime;
+
+}

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/DeviceDestroyBillService.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.destroy.service;
 
 
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
+import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -36,4 +37,7 @@ public interface DeviceDestroyBillService {
      * 根据申请id查询报废任务
      */
     Optional<DeviceDestroyBill> findApplyId(Integer applyId);
+
+    Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo);
+
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/DeviceDestroyQueryService.java

 package com.tykj.dev.device.destroy.service;
 
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
+import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import org.springframework.data.domain.Page;
 
@@ -22,4 +23,7 @@ public interface DeviceDestroyQueryService {
     DeviceDestroyBill findTaskId(Integer taskId);
 
     TaskBto findApplyIdToDeviceDestroyTask(Integer applyId);
+
+    Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo);
+
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

 package com.tykj.dev.device.destroy.service.Impl;
 
 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.device.destroy.entity.domain.DeviceDestroyBill;
+import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
 import com.tykj.dev.device.file.entity.FileRet;
@@ -18,6 +21,8 @@ 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.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -104,4 +109,28 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
     public Optional<DeviceDestroyBill> findApplyId(Integer applyId) {
         return deviceDestroyBillDao.findByApplyId(applyId);
     }
+
+    @Override
+    public Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo) {
+        return deviceDestroyBillDao.findAll(getFindRetiredSpecification(destroySelectVo),destroySelectVo.getPageable()).map(
+                deviceDestroyBill -> {
+                    deviceDestroyBill.setScripts(JacksonUtil.readValue(deviceDestroyBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}));
+                    deviceDestroyBill.setApplyFileList(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFiles()));
+                    deviceDestroyBill.setDestructionFileList(FilesUtil.stringFileToList(deviceDestroyBill.getDestructionFiles()));
+                    deviceDestroyBill.setReplayFileList(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFiles()));
+            return deviceDestroyBill;
+        });
+    }
+
+    private Specification<DeviceDestroyBill> getFindRetiredSpecification(DestroySelectVo destroySelectVo) {
+        PredicateBuilder<DeviceDestroyBill> predicateBuilder = Specifications.and();
+        if (destroySelectVo.getStartTime() != null) {
+            predicateBuilder.gt("createTime", destroySelectVo.getStartTime());
+        }
+        if (destroySelectVo.getEndTime() != null) {
+            predicateBuilder.lt("createTime", destroySelectVo.getEndTime());
+        }
+        return predicateBuilder.build();
+
+    }
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java

@@ -71,6 +71,8 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
     public TaskBto saveDeviceDestroyBill(SecurityUser securityUser, DeviceDestroyBillVo deviceDestroyBillVo) {
         TaskBto taskBto;
         DeviceDestroyBill deviceDestroyBill= deviceDestroyBillVo.toDeviceDestroyBill();
+        deviceDestroyBill.setApplyNumber(deviceDestroyBillVo.getApplyNumber());
+        deviceDestroyBill.setReplayNumber(deviceDestroyBillVo.getReplayNumber());
         deviceDestroyBill.setApplyFiles(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFileList()));
         deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
         deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
@@ -98,6 +100,8 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
     @Override
     public DeviceDestroyBill provinceDeviceDestroyBill(SecurityUser securityUser, DeviceDestroyBillVo deviceDestroyBillVo) {
         DeviceDestroyBill deviceDestroyBill= deviceDestroyBillVo.toDeviceDestroyBill();
+        deviceDestroyBill.setApplyNumber(deviceDestroyBillVo.getApplyNumber());
+        deviceDestroyBill.setReplayNumber(deviceDestroyBillVo.getReplayNumber());
         deviceDestroyBill.setApplyFiles(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFileList()));
         deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
         deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyQueryServiceImpl.java

 package com.tykj.dev.device.destroy.service.Impl;
 
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
+import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
 import com.tykj.dev.device.destroy.service.DeviceDestroyQueryService;
 import com.tykj.dev.device.task.service.TaskService;
@@ -11,6 +12,7 @@ import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -57,4 +59,9 @@ public class DeviceDestroyQueryServiceImpl implements DeviceDestroyQueryService
             }
         }
     }
+
+    @Override
+    public Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo) {
+        return deviceDestroyBillService.findPageDeviceDestroyBill(destroySelectVo);
+    }
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/ScrapService.java

@@ -40,4 +40,5 @@ public interface ScrapService {
      */
     Optional<Scrap> findApplyId(Integer applyId);
 
+
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBillServiceImpl.java

@@ -92,17 +92,7 @@ public class ScrapBillServiceImpl implements ScrapBillService {
     @Override
     public Page<ScrapBill> getPage(ScrapSelectVo scrapSelectVo) {
         PredicateBuilder<ScrapBill> predicateBuilder = Specifications.and();
-        if (scrapSelectVo.getContent() != null) {
-            Class<ScrapBill> scrapBillClass = ScrapBill.class;
-            Field[] declaredFields = scrapBillClass.getDeclaredFields();
-            PredicateBuilder<ScrapBill> p = Specifications.or();
-            for (Field field : declaredFields) {
-                if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
-                    p.like(field.getName(), "%" + scrapSelectVo.getContent() + "%");
-                }
-            }
-            predicateBuilder.predicate(p.build());
-        }
+
         if (scrapSelectVo.getStartTime() != null) {
             predicateBuilder.gt("scrapTime", scrapSelectVo.getStartTime());
         }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -103,6 +103,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             Scrap scrap1= scrapService.findScrap(taskBto.getBillId());
             scrap.setId(scrap1.getId());
         }
+        scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
+        scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
         scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
         scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
         scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
@@ -145,6 +147,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             TaskBto taskBto= sendOutSuperior(units.getUnitId(), scrap.getId(),userId);
             addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
         }
+        scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
+        scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
         scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
         scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
@@ -217,6 +221,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             scrap = scrapService.findScrap(taskBto.getBillId());
             taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2224, user.getUserId());
         }
+        scrap.setApplyNumber(scrapOrderOutData.getApplyNumber());
+        scrap.setReplayNumber(scrapOrderOutData.getReplayNumber());
         scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
         scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -19,6 +19,7 @@ import com.tykj.dev.misc.utils.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -109,24 +110,24 @@ public class ScrapServiceImpl implements ScrapService {
     @Override
     public Page<Scrap> findPageScrapList(ScrapSelectVo scrapSelectVo) {
         PredicateBuilder<Scrap> predicateBuilder = Specifications.and();
-        if (scrapSelectVo.getContent() != null) {
-            Class<ScrapBill> scrapBillClass = ScrapBill.class;
-            Field[] declaredFields = scrapBillClass.getDeclaredFields();
-            PredicateBuilder<ScrapBill> p = Specifications.or();
-            for (Field field : declaredFields) {
-                if (field.getType().equals(String.class) && field.getAnnotation(Transient.class) == null) {
-                    p.like(field.getName(), "%" + scrapSelectVo.getContent() + "%");
-                }
-            }
-            predicateBuilder.predicate(p.build());
-        }
+
         if (scrapSelectVo.getStartTime() != null) {
-            predicateBuilder.gt("updateTime", scrapSelectVo.getStartTime());
+            predicateBuilder.gt("createTime", scrapSelectVo.getStartTime());
         }
         if (scrapSelectVo.getEndTime() != null) {
-            predicateBuilder.lt("updateTime", scrapSelectVo.getEndTime());
+            predicateBuilder.lt("createTime", scrapSelectVo.getEndTime());
         }
-        return scrapDao.findAll(predicateBuilder.build(), scrapSelectVo.getPageable());
+        return scrapDao.findAll(predicateBuilder.build(), scrapSelectVo.getPageable()).map(
+                scrap -> {
+                    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()));
+                return scrap;
+                }
+
+        );
     }
 
     @Override

dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/domin/Scrap.java

@@ -104,11 +104,6 @@ public class Scrap extends BaseEntity {
     @Column(name = "bill_file",columnDefinition = "TEXT")
     private String billFile;
 
-    /**
-     * 退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)
-     */
-    @ApiModelProperty(value = "退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)")
-    private Integer sendBackStatus;
 
     @ApiModelProperty(value = "装备id集合")
     @Column(name = "device_ids",columnDefinition = "TEXT")

dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/vo/ScrapSelectVo.java

 package com.tykj.dev.device.scrap.subject.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tykj.dev.misc.base.CustomPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,13 +24,12 @@ import java.util.Date;
 @ApiModel(value = "报废装备查询条件", description = "报废装备查询条件")
 public class ScrapSelectVo extends CustomPage {
 
-    @ApiModelProperty(value = "模糊查询关键字", example = "测试")
-    public String content;
-
     @ApiModelProperty(value = "开始时间", example = "2020-10-10 01:10:10")
-    public Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public LocalDateTime startTime;
 
     @ApiModelProperty(value = "结束时间", example = "2020-10-10 01:10:10")
-    public Date endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public LocalDateTime endTime;
 
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChooseRepel.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjm
@@ -30,4 +31,14 @@ public class DeviceChooseRepel {
      * 是否可以提交 1。可以 0。不可以 用于判读市下级任务是否都完成了
      */
     private Integer isNotSubmit;
+
+    private Map<String,String> modelMap;
+
+    private Map<Integer,String> typeMap;
+
+    private Map<String,String> modelMapAbnormal;
+
+    private Map<Integer,String> typeMapAbnormal;
+
+
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/PagingVo.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
+import java.util.Set;
 
 @Data
 @AllArgsConstructor
@@ -22,4 +23,9 @@ public class PagingVo {
     private Integer size;
 
     private List<DeviceLibrary> data;
+
+    private Set<String> models;
+
+    private Set<String> names;
+
 }
\ No newline at end of file

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/RepelManagementVo.java

@@ -61,6 +61,23 @@ public class RepelManagementVo extends CustomPage {
     @ApiModelProperty(value = "模糊查询内容", example = "测试")
     public String content;
 
+    @ApiModelProperty(value = "型号模糊查询字段")
+    private String modelDim;
+
+    @ApiModelProperty(value = "名称模糊查询字段")
+    private String nameDim;
+
+    @ApiModelProperty(value = "序列号模糊查询字段")
+    private String seqDim;
+
+    @ApiModelProperty(value = "所在单位模糊查询字段")
+    private String locationUnitDim;
+
+    @ApiModelProperty(value = "所属单位模糊查询字段")
+    private String ownUnitDim;
+
+    @ApiModelProperty(value = "生命状态模糊查询字段")
+    private String lifeStatusDim;
 
 
 }

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

@@ -83,13 +83,6 @@ public interface RepelQueryService {
      */
     List<DirectlyUnderNavigation> directlyUnderUnitLeftNavigation(Integer taskId);
 
-
-//    /**
-//     * 根据任务taskId查询任务涉及直属单位的相关装备
-//     */
-//    List<DirectlyUnderNavigation> directlyUnderUnitLeftNavigation(Integer taskId);
-
-
     /**
      *省直属任务装备已选择装备列表接口
      */
@@ -100,7 +93,6 @@ public interface RepelQueryService {
      */
     List<DevRepelVo> repelManagementListDetails(List<Integer> ids);
 
-
     /**
      查询清退单
      */
@@ -113,12 +105,12 @@ public interface RepelQueryService {
     DeviceChooseRepel findDeviceChooseRepel1(DeviceChoosePageVo deviceChoosePageVo);
 
 
-
     /**
      * 查看已清退装备列表
      */
     PagingVo clearedDeviceList(RepelManagementVo repelManagementVo);
 
+
     /**
      * 查看待清退装备列表
      */

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

@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
 public class DeviceRepelServiceImpl implements DeviceRepelService {
     @Autowired
     DeviceRepelDao deviceRepelDao;
+
     @Autowired
     UnitsService unitsService;
 

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/ConditionsTrainVo.java

@@ -21,10 +21,10 @@ import java.util.Date;
 @Data
 @ApiModel(value = "培训条件查询类", description = "培训条件查询类")
 public class ConditionsTrainVo {
-    @ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime")
+    @ApiModelProperty(value = "页数", example = "bmxx", name = "statusTime")
     private Integer page;
 
-    @ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime")
+    @ApiModelProperty(value = "每页条数", example = "bmxx", name = "statusTime")
     private Integer size;
 
     @ApiModelProperty(value = "开始时间", example = "bmxx", name = "statusTime")
@@ -38,5 +38,8 @@ public class ConditionsTrainVo {
     @ApiModelProperty(value = "结束时间", example = "bmxx", name = "endTime")
     private Date endTime;
 
+    @ApiModelProperty(value = "单位id", example = "unitId", name = "statusTime")
+    private Integer unitId;
+
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/GradeEntryVo.java

@@ -59,4 +59,6 @@ public class GradeEntryVo {
     @ApiModelProperty(value = "培训试卷文件实体集合")
     private List<FileRet> trainPapersFileList = new ArrayList<>();
 
+    @ApiModelProperty(value = "培训资料集合")
+    private List<FileRet> trainDataFileList;
 }

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainDetailsVo.java

@@ -12,6 +12,8 @@ import lombok.NoArgsConstructor;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -119,6 +121,12 @@ public class TrainDetailsVo {
     @ApiModelProperty(value = "发证状态")
     private Integer good;
 
+    /**
+     *
+     */
+    @ApiModelProperty(value = "培训试卷文件实体集合")
+    @Transient
+    private List<FileRet> trainPapersFileList = new ArrayList<>();
 
     /**
      * 成绩
@@ -126,4 +134,5 @@ public class TrainDetailsVo {
     @ApiModelProperty(value = "trainUsers")
     private List<TrainUser> trainUsers;
 
+
 }

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

@@ -220,6 +220,8 @@ public class TrainThemeServiceImpl implements TrainThemeService {
             trainUsers.forEach(trainUser -> {
                 trainUser.setMgrcert(mgrcertService.findByUserId(trainUser.getUserId()));
             });
+            trainDetailsVo.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
+            trainDetailsVo.setTrainPapersFileList(FilesUtil.stringFileToList(trainTheme.getTrainPapersFiles()));
             trainDetailsVo.setTrainUsers(trainUsers);
         return trainDetailsVo;
         }else {
@@ -234,6 +236,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
             predicateBuilder.gt("startTime", conditionsTrainVo.getStatusTime());
             predicateBuilder.lt("endTime", conditionsTrainVo.getEndTime());
         }
+        predicateBuilder.eq("unitsId",conditionsTrainVo.getUnitId());
         if (conditionsTrainVo.getDimName() != null) {
             Class<TrainTheme> trainThemeClass = TrainTheme.class;
             Field[] declaredFields = trainThemeClass.getDeclaredFields();

dev-user/src/main/java/com/tykj/dev/device/user/config/MyFilter.java

@@ -75,7 +75,7 @@ public class MyFilter extends UsernamePasswordAuthenticationFilter {
             SecurityUser principal = new SecurityUser();
             principal.setUsername(username);
             sessionRegistry.registerNewSession(request.getSession(true).getId(), principal);
-            log.info("session:{}",request.getSession(true).getId());
+//            log.info("session:{}",request.getSession(true).getId());
 //            sessionRegistry.getAllPrincipals().forEach(
 //                    u->{
 //                        log.info("see对应{}",u);