fix:【数据对接】字段修改

hxhq-modules/hxhq-integration/src/main/java/com/hxhq/controller/ContainerController.java

@@ -22,17 +22,17 @@ public class ContainerController extends BaseController
     @Autowired
     private ContainerService containerService;
 
-    /**
-     *
-     * 供试品数据推送至中间库
-     * @param dto
-     * @create 2026/1/29
-     **/
-    @PostMapping("/dataPush")
-    public AjaxResult dataPush(ContainerDTO dto) {
-        containerService.dataPush(dto);
-      return  AjaxResult.success("推送数据成功");
-    }
+//    /**
+//     *
+//     * 供试品数据推送至中间库
+//     * @param dto
+//     * @create 2026/1/29
+//     **/
+//    @PostMapping("/dataPush")
+//    public AjaxResult dataPush(ContainerDTO dto) {
+//        containerService.dataPush(dto);
+//      return  AjaxResult.success("推送数据成功");
+//    }
     /**
      *
      * 供试品数据同步

hxhq-modules/hxhq-integration/src/main/java/com/hxhq/domain/Instrument.java

@@ -72,8 +72,8 @@ public class Instrument {
     private String remark;
 
     /**
-     * 是否是历史数据。0否1是
+     * 操作标识：1=新增，2=修改，3=删除
      **/
-    @TableField(value = "is_history")
-    private String isHistory;
+    @TableField(value = "operation_sign")
+    private Integer operationSign;
 }

hxhq-modules/hxhq-integration/src/main/java/com/hxhq/domain/ReagentStock.java

@@ -109,29 +109,7 @@ public class ReagentStock {
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    /**
-     *修改时间
-     **/
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updateTime;
-
-    /**
-     *创建者（用户ID）
-     **/
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
 
-    /**
-     *修改者
-     **/
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-
-    /**
-     *逻辑删除标记（0-未删除，1-已删除）
-     **/
-    private Integer isDeleted;
 
 
 }

hxhq-modules/hxhq-integration/src/main/java/com/hxhq/service/impl/InstrumentServiceImpl.java

@@ -93,7 +93,8 @@ public class InstrumentServiceImpl extends ServiceImpl
                 Yq existingRecord = existingRecordsInDb.stream()
                     .filter(r -> r.getBh().equals(bh))
                     .findFirst()
-                    .orElse(null); // 理论上一定能找到，因为 existingBhSet.contains(bh)
+                    // 理论上一定能找到，因为 existingBhSet.contains(bh)
+                    .orElse(null);
 
                 if (existingRecord != null) {
                     // 补全 ID
@@ -156,6 +157,11 @@ public class InstrumentServiceImpl extends ServiceImpl
 
             sj.setWc(item.getStorageConditions());
             sj.setRemark(item.getRemark());
+            if (item.getOperationSign()!=null){
+                sj.setDelFlag(item.getOperationSign()==3?"1":"0");
+            }
+
+            sj.setRemark(item.getRemark());
 
             yqList.add(sj);
         });