fix(维修模块): 修改部分bug

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -80,6 +80,9 @@ public class RepairController {
     @Autowired
     private RepairDetailService deviceRepairDetailService;
 
+    @Autowired
+    private RepairDetailDao repairDetailDao;
+
     @Autowired
     private UserUtils userUtils;
 
@@ -101,9 +104,6 @@ public class RepairController {
     @Autowired
     private TaskLogService taskLogService;
 
-    @Autowired
-    private RepairDetailDao repairDetailDao;
-
     @Autowired
     private RepairBackBillDao repairBackBillDao;
 
@@ -1835,16 +1835,20 @@ public class RepairController {
     @PostMapping(value = "/uploadRecord")
     public ResponseEntity uploadRecord(@RequestBody RepairRecord repairRecord) {
         Integer level = userUtils.getCurrentUnitLevel();
-        RepairDetail repairDetail = deviceRepairDetailService.getOne(repairRecord.getId());
+//        RepairDetail repairDetail = deviceRepairDetailService.getOne(repairRecord.getId());
         //省市县三种备注
         if (level == 1) {
-            repairDetail.setRecord(repairRecord.getRecord());
+//            repairDetail.setRecord(repairRecord.getRecord());
+            repairDetailDao.updateRecord(repairRecord.getRecord(),repairRecord.getId());
         } else if (level == 2) {
-            repairDetail.setRecord2(repairRecord.getRecord());
+//            repairDetail.setRecord2(repairRecord.getRecord());
+            repairDetailDao.updateRecord2(repairRecord.getRecord(),repairRecord.getId());
         } else if (level == 3) {
-            repairDetail.setRecord3(repairRecord.getRecord());
+            repairDetailDao.updateRecord3(repairRecord.getRecord(),repairRecord.getId());
+//            repairDetail.setRecord3(repairRecord.getRecord());
         }
-        deviceRepairDetailService.update(repairDetail);
+//        deviceRepairDetailService.update(repairDetail);
+
         return ResponseEntity.ok("更新成功");
     }
 

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

@@ -4,6 +4,9 @@ import com.tykj.dev.device.repair.subject.domin.RepairDetail;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -17,4 +20,19 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
     List<RepairDetail> findAllByRepairStatus(Integer repairStatus, Sort s);
     List<RepairDetail> findAllByDeviceId(Integer deviceId);
     List<RepairDetail> findAllByPid(Integer pid);
+
+    @Transactional
+    @Modifying
+    @Query("update RepairDetail r set r.record = :record where r.id = :id")
+    void updateRecord(String record,Integer id);
+
+    @Transactional
+    @Modifying
+    @Query("update RepairDetail r set r.record2 = :record where r.id = :id")
+    void updateRecord2(String record,Integer id);
+
+    @Transactional
+    @Modifying
+    @Query("update RepairDetail r set r.record3 = :record where r.id = :id")
+    void updateRecord3(String record,Integer id);
 }