发送ERP 牌号问题

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -1414,7 +1414,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         executor1.execute(() -> {
             // 针对铝成品和原铝进行发送ERP数据处理
             logger.error("{}开始执行发送ERP请求:---->ERP---", DateUtils.toYearMonthDayTime(new Date()));
-            sendTestDataToErp(Arrays.asList(ids));
+            sendTestDataToErp(Arrays.asList(ids), finalSampleBrandMap);
         });
 
         logger.error("======================质量判定结束========================");
@@ -1426,7 +1426,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
      *
      * @param sampleVOList
      */
-    private void sendTestDataToErp(List<Long> ids) {
+    private void sendTestDataToErp(List<Long> ids, Map<Long, String> sampleBrandMap) {
         log("执行发送的样品IDS:" + StringUtils.join(ids, ","));
         List<EntrustSample> sampleList = entrustSampleService.getBatchIds(ids);
         if (CollectionUtils.isEmpty(sampleList)) {
@@ -1442,6 +1442,11 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         }
         // 获取检测项目指标数据
         List<Map<String, Object>> dataList = entrustSampleItemIndexService.listSampleItemIndex(ids);
+        dataList.forEach(t -> {
+            Long sampleId = Long.valueOf(t.get("id").toString());
+            t.put("brand", sampleBrandMap.get(sampleId));
+            t.remove("id");
+        });
         try {
             log("准备发送数据");
             doSendErpData(dataList);

src/main/resources/mapper/hmhj/EntrustSampleItemIndexMapper.xml

@@ -91,6 +91,7 @@
 
     <select id="selectSampleItemIndex" resultType="java.util.Map">
         SELECT
+            s.id,
             s.NAME "sample_name",
             s.code "sample_code",
             max(s.sample_grading) "brand",
@@ -117,7 +118,7 @@
         <foreach collection="sampleIds" index="index" item="sampleId" open=" and s.id in (" separator="," close=")">
             #{sampleId}
         </foreach>
-        GROUP BY s.name,s.code
+        GROUP BY s.id,s.name,s.code
     </select>
 
     <delete id="physicalDeleteByItemIds">