1

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.java

@@ -41,4 +41,11 @@ public interface BusinessMergeNoticeMapper {
 	 * @return
 	 */
 	List<BusinessMergeNoticeDetail> findByZidDetailList(@Param("obj") BusinessMergeNoticeDetail obj);
+
+	/**
+	 * 按主键ID查询主表数据
+	 * @param id
+	 * @return
+	 */
+	BusinessMergeNotice findByIdMergeNotice(String id);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.xml

@@ -51,6 +51,13 @@
 	</if>
 	ORDER BY cjsj DESC
   </select>
+  <!-- 合并通知单主键查询 -->
+  <select id="findByIdMergeNotice" resultType="com.chinaitop.depot.business.model.BusinessMergeNotice" parameterType="java.lang.String">
+	SELECT 
+      id, org_id orgId, cjsj, cjr, updatetime, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, hbhsl
+    FROM business_merge_notice 
+	WHERE 1=1 AND id = #{id,jdbcType=VARCHAR}
+  </select>
   <!-- 查询子表数据集合 -->
   <select id="findByZidDetailList" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
 	SELECT 

src/main/java/com/chinaitop/depot/business/service/impl/BusinessMergeNoticeServiceImpl.java

@@ -207,12 +207,14 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
 	public Map<String, Object> findByIdList(String id) throws Exception {
 		BusinessMergeNoticeDetail obj = new BusinessMergeNoticeDetail();
 		obj.setZid(id);
+		BusinessMergeNotice businessMergeNotice = businessMergeNoticeMapper.findByIdMergeNotice(id);
 		List<BusinessMergeNoticeDetail> list = businessMergeNoticeMapper.findByZidDetailList(obj);
 		List<BusinessMergeNoticeDetail> y_list = list.stream().filter(BusinessMergeNoticeDetail -> BusinessMergeNoticeDetail.getDatatype().equals("0")).collect(Collectors.toList());
 		List<BusinessMergeNoticeDetail> x_list = list.stream().filter(BusinessMergeNoticeDetail -> BusinessMergeNoticeDetail.getDatatype().equals("1")).collect(Collectors.toList());
 		Map<String, Object> map = new HashMap<>();
 		map.put("y_list", y_list);
 		map.put("x_list", x_list);
+		map.put("obj", businessMergeNotice);
 		return map;
 	}