总后台订单档期查询

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -5,6 +5,7 @@ import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
@@ -140,9 +141,21 @@ public class FsStoreOrderController extends BaseController
             list = fsStoreOrderService.selectFsStoreOrderListVOByErpAccount(fsStoreOrder);
         } else {
             list = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
+            if (CollectionUtil.isNotEmpty(list)){
+                for(FsStoreOrderListVO vo : list){
+                    if (StringUtils.isNotEmpty(vo.getTagNames())) {
+                        vo.setTags(JSON.parseArray(vo.getTagNames(), String.class));
+                    }
+                }
+            }
         }
         //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
         TableDataInfo dataTable = getDataTable(list);
+
+        //处理档期标签数据总数问题
+        if (StringUtils.isNotEmpty(fsStoreOrder.getTag())) {
+            dataTable.setTotal(list.size());
+        }
         if ("金牛明医".equals(cloudHostProper.getCompanyName())){
             if (fsStoreOrder.getStatus() !=null && fsStoreOrder.getStatus() != 1){
                 list.forEach(vo->{

fs-service/src/main/java/com/fs/his/param/FsStoreOrderParam.java

@@ -246,4 +246,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable {
 
     //erp账户
     private String erpAccount;
+
+    private String tag;
 }

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

@@ -72,6 +72,9 @@ public class FsStoreOrderListVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
 
+    //标签名称JSON数据
+    private String tagNames;
+
     //档期标签名称
-    private List<String> tagNames;
+    private List<String> tags;
 }

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

@@ -750,6 +750,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company c on c.company_id =so.company_id
         LEFT JOIN company_user cu on cu.user_id=so.company_user_id
         <where>
+            <if test="maps.tag != null and maps.tag != ''">
+                and find_in_set(#{maps.tag}, REGEXP_REPLACE(so.tag_names, '["\\[\\]]', ''))
+            </if>
             <if test="maps.packageSecondName != null and maps.packageSecondName != ''">
                 and so.package_second_name like concat('%', #{maps.packageSecondName}, '%')
             </if>