feat(维修模块，自查模块): 修改

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceModelSort.java

@@ -73,7 +73,6 @@ public class DeviceModelSort {
      * @return 排序号码
      */
     public static Integer toModelSort(String model) {
-        System.out.println(model);
       Integer sort=  mapModelSort.get(model);
         if(sort == null){
             sort = 9999;

dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java

@@ -35,4 +35,6 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
     @Modifying
     @Query("update RepairDetail r set r.record3 = :record where r.id = :id")
     void updateRecord3(String record,Integer id);
+
+    List<RepairDetail> findAllByIdIn(List<Integer> ids);
 }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -317,6 +317,7 @@ public class SelfCheckController {
             selfExaminationBillEntity.setCheckedCount(selfCheckSaveVo.getCheckedCount());
             selfExaminationBillEntity.setCheckingCount(selfCheckSaveVo.getCheckingCount());
             selfExaminationBillEntity.setUserbId(selfCheckSaveVo.getUserbId());
+            selfExaminationBillEntity.setHandheldTerminalInformation(selfCheckSaveVo.getHandheldTerminalInformation());
             if (selfCheckSaveVo.getUnStockDevices()!=null&&selfCheckSaveVo.getUnStockDevices().size()>0){
                 selfExaminationBillEntity.setUnStockDetail(JacksonUtil.toJSon(selfCheckSaveVo.getUnStockDevices()));
             }
@@ -368,7 +369,7 @@ public class SelfCheckController {
                     List<Integer> idList = new ArrayList<>();
                     idList.add(selfCheckSaveVo.getUserbId());
                     //阅知
-                    MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "完成终端自查", idList, 0);
+                    MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "完成终端自查", idList, 0,0);
                     messageService.add(messageBto);
                 }
                 else {

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/SelfCheckBill.java

@@ -137,6 +137,9 @@ public class SelfCheckBill {
     @ApiModelProperty(value = "自查未入库新增装备详情(RFID卡号以.为分隔符)")
     private String newDeviceDetail;
 
+    @ApiModelProperty(value = "手持终端信息")
+    private String handheldTerminalInformation;
+
     @ApiModelProperty(value = "检查人")
     @Transient
     private String checkUser;

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/vo/SelfCheckSaveVo.java

@@ -64,6 +64,9 @@ public class SelfCheckSaveVo {
     @ApiModelProperty(value = "非在库装备集合")
     private List<DeviceLibrary> unStockDevices;
 
+    @ApiModelProperty(value = "手持终端信息")
+    private String handheldTerminalInformation;
+
     public SelfCheckBill toDo() {
         SelfCheckBill selfExaminationBillEntity = new SelfCheckBill();
         BeanUtils.copyProperties(this, selfExaminationBillEntity);

dev-user/src/main/java/com/tykj/dev/device/user/read/subject/bto/MessageBto.java

@@ -74,7 +74,7 @@ public class MessageBto {
     private Integer isHighLight = 0;
 
     @ApiModelProperty(value = "是否置顶(0：不是，1：是)")
-    private Integer isTop;
+    private Integer isTop = 0;
 
     /**
      * bto类转化为do类