订单导出增加统计数量字段

fs-service/src/main/java/com/fs/his/service/impl/FsExportTaskServiceImpl.java

@@ -5,9 +5,15 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.utils.ParseUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.config.cloud.CloudHostProper;
 import com.fs.his.mapper.FsStoreOrderMapper;
@@ -228,6 +234,11 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
                 if (vo.getUserAddress() != null && !isCheckAddress) {
                     vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
                 }
+
+                if (StringUtils.isNotEmpty(vo.getCountGoods())){
+                    JSONObject jsonInfo = JSONObject.parseObject(vo.getCountGoods());
+                    vo.setCountGoods(jsonInfo.getString("productName") + "*" + vo.getGoodsNum());
+                }
             }
         }
 

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderExportVO.java

@@ -227,4 +227,7 @@ public class FsStoreOrderExportVO implements Serializable
     private String miniProgramName;
     @Excel(name = "订单来源" , dictType = "sys_order_source")
     private Integer source;
+    @Excel(name = "统计商品数量")
+    private String countGoods;
+    private String goodsNum;
 }

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -1410,6 +1410,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cu.nick_name AS company_user_nick_name,
         cts.name AS schedule_name,
         st.store_name,df.login_account as erp_account,
+        soi.json_info countGoods,
+        soi.num goodsNum,
         csc.name miniProgramName
         FROM fs_store_order so
         LEFT JOIN fs_store st ON so.store_id = st.store_id
@@ -1421,6 +1423,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company_tcm_schedule cts ON cts.id = so.schedule_id
         LEFT JOIN fs_patient pat ON pat.patient_id = p.patient_id
         LEFT JOIN fs_store_order_df df on df.order_id=so.order_id
+        LEFT JOIN fs_store_order_item soi on soi.order_id=so.order_id
         LEFT JOIN (
         SELECT
         sp.*,