修改问题

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

@@ -128,4 +128,6 @@ public interface BusinessDeliveryStorageNoticeMapper {
 	Integer getcw(Integer orgId);
 
 	Integer selectCustomer(Map<String, Object> mapCustomer);
+
+    List<BusinessDeliveryStorageNotice> selectByExampleDetails(Map<String,Object> map);
 }

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

@@ -148,11 +148,6 @@
     change_reason, change_time, change_content, jhbzwh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 20 15:07:25 CST 2021.
-    -->
     select
     <if test="distinct" >
       distinct
@@ -1252,4 +1247,22 @@
   	select id from business_customer where name = #{deliveryCustomer} and 
   	identification = #{identification} and org_id = #{orgId}
   </select>
+
+  <select id="selectByExampleDetails" resultMap="BaseResultMap" parameterType="java.util.Map" >
+    SELECT
+      notice.id,
+      group_concat(case de.house_id when 0 then de.warehouse_name else de.house_name end) house_name,
+      group_concat(case de.in_price when ISNULL(de.in_price) then de.out_price else de.in_price end) quantity,
+      group_concat(case de.in_count when ISNULL(de.in_count) then de.out_count else de.in_count end) price
+    FROM
+      business_delivery_storage_notice notice
+        LEFT JOIN business_store_ware_detail de ON de.zid = notice.id
+    WHERE
+      notice.org_id = #{orgId}
+      and notice.id in
+    <foreach collection="ids" item="id" open="(" close=")" separator="," >
+      #{id}
+    </foreach>
+    group by notice.id
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -1776,4 +1776,23 @@ public class BusinessDeliveryStorageNotice {
     public void setJhbzwh(String jhbzwh) {
         this.jhbzwh = jhbzwh == null ? null : jhbzwh.trim();
     }
+
+    public String quantity;//数量
+    public String price;//单价
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
 }

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

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.chinaitop.depot.utils.ParameterUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1122,6 +1123,27 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             PageHelper.startPage(pageNum, pageSize);
         }
         List<BusinessDeliveryStorageNotice> list = businessDeliveryStorageNoticeMapper.selectByExample(example);
+        if (list.size() > 0) {
+            Map<String, Object> returnMap = new HashMap<String, Object>();
+            returnMap.put("orgId",notice.getOrgId());
+            List<Integer> ids = new ArrayList<>();
+            for (BusinessDeliveryStorageNotice notices : list) {
+                ids.add(notices.getId());
+            }
+            returnMap.put("orgId",notice.getOrgId());
+            returnMap.put("ids",ids);
+
+            List<BusinessDeliveryStorageNotice> details = businessDeliveryStorageNoticeMapper.selectByExampleDetails(returnMap);
+            for (BusinessDeliveryStorageNotice detail : details) {
+                for (BusinessDeliveryStorageNotice notices : list) {
+                    if (ParameterUtil.isequal(detail.getId(),notices.getId())) {
+                        notices.setHouseName(detail.getHouseName());
+                        notices.setQuantity(detail.getQuantity());
+                        notices.setPrice(detail.getPrice());
+                    }
+                }
+            }
+        }
         return list;
     }