fix(维修模块): 修复bug

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

@@ -171,7 +171,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
     List<DeviceLibrary> findAllByModel(String model);
 
     @Modifying
-    @Query("update DeviceLibrary d set d.ownUnit = d.locationUnit where d.id in :deviceIds")
+    @Query("update DeviceLibrary d set d.ownUnit = d.locationUnit ,d.lifeStatus = 2 where d.id in :deviceIds")
     int updateDevicesOwnUnit(@Param("deviceIds") List<Integer> deviceIds);
 }
 

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

@@ -20,9 +20,9 @@ public interface RepairSendBillDao extends JpaRepository<RepairSendBill, Integer
     @Query("select o from RepairSendBill o where o.sendUnit= :unitName and o.createTime >= :startTime and o.createTime <= :endTime")
     List<RepairSendBill> findAllByUnitBetweenTime(String unitName, Date startTime, Date endTime);
 
-    @Transactional
-    @Modifying
-    @Query("update RepairSendBill r set r. = :remake where r.id in :repairDetailIds")
-    void updateRemakeForClear(@Param("remake") String remake, @Param("repairDetailIds") List<Integer> repairDetailIds);
+//    @Transactional
+//    @Modifying
+//    @Query("update RepairSendBill r set r.scriptJson = :scriptJson where r.id in :repairDetailIds")
+//    void updateRemakeForClear(@Param("scriptJson") String scriptJson, @Param("repairDetailIds") List<Integer> repairDetailIds);
 
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -5,6 +5,8 @@ import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.library.subject.vo.Script;
+import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.device.repair.repository.RepairDetailDao;
 import com.tykj.dev.device.repair.repository.RepairSendBillDao;
 import com.tykj.dev.device.repair.service.RepairDetailService;
@@ -172,24 +174,23 @@ public class RepairDetailServiceImpl implements RepairDetailService {
         //修改维修单的remark
         List<Integer> repairBillIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairBillId).collect(Collectors.toList());
         //根据sendBill查询
-        List<RepairSendBill> repairBills = new ArrayList<>();
+//        List<RepairSendBill> repairBills = new ArrayList<>();
+        String remark = "装备正在进行清退处理,维修任务终止";
         repairBillIds.forEach(integer -> {
            RepairSendBill sendBill = repairSendBillDao.findByDeviceRepairBillId(integer);
-           repairBills.add(sendBill);
+            String scriptJson = sendBill.getScriptJson();
+            List<ScriptSaveVo> scriptSaveVos = JacksonUtil.readValueToList(scriptJson, ScriptSaveVo.class);
+            for (ScriptSaveVo scriptSaveVo : scriptSaveVos) {
+                scriptSaveVo.setRemark(remark);
+                sendBill.setScriptJson(JacksonUtil.toJSon(scriptJson));
+                repairSendBillDao.save(sendBill);
+            }
         });
-//        deviceRepairSendBillEntity.setScriptJson(JacksonUtil.toJSon(repairBillSaveVo.getScriptSaveVos()));
-
         List<Integer> repairDetailIds = setDevicesOwnUnits.stream().map(SetDevicesOwnUnit::getRepairDetailId).collect(Collectors.toList());
-        updateRemakeForClear(repairDetailIds);
         //删除维修详情
         repairDetailIds.forEach(integer -> {
             deviceRepairDetailDao.deleteById(integer);
         });
 
     }
-
-    public void updateRemakeForClear(List<Integer> repairDetailIds){
-        String remake = "装备正在进行清退处理,维修任务终止";
-        deviceRepairDetailDao.updateRemakeForClear(remake,repairDetailIds);
-    }
 }