fix: 修复

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -19,6 +19,7 @@ import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
 import com.glxp.api.service.basic.BasicCollectUserService;
+import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.collect.DownloadFactory;
 import com.glxp.api.service.collect.IoCollectOrderBizOriginService;
 import com.glxp.api.service.collect.IoCollectOrderOriginService;
@@ -29,7 +30,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -49,6 +53,8 @@ public class IoCollectOriginController extends BaseController {
     IoCollectOrderBizOriginService collectOrderBizOriginService;
     @Resource
     SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
+    @Resource
+    SysWorkplaceDocumentService sysWorkplaceDocumentService;
 
 
     @PostMapping("/udiwms/basic/collect/origin/order/download")
@@ -73,7 +79,9 @@ public class IoCollectOriginController extends BaseController {
     public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
+        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses  = null;
         List<UserWorkResponse> page;
+        WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
         if (collectOrderRequest.getWorkPlaceCode() == null) {
             Long userId = getUserId();
             BasicCollectUserRequest request = new BasicCollectUserRequest();
@@ -86,8 +94,24 @@ public class IoCollectOriginController extends BaseController {
                         .map(UserWorkResponse::getWorkplaceId)
                         .collect(Collectors.toList());
             }
-            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
+            //通过工位列表 获取出 业务列表
+            workBindBusTypeRequest.setWorkPlaceCodes(workPlaceCodes);
+            sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest);
+        }else {
+            workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode());
+            sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest);
+            collectOrderRequest.setWorkPlaceCode(null);
         }
+
+        if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)){
+            Set<String> uniqueDocumentTypeCodesLinkedHashSet = sysWorkplaceDocumentResponses.stream()
+                    .map(SysWorkplaceDocumentResponse::getDocumentTypeCode)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+            List<String> documentTypeCodes = new ArrayList<>(uniqueDocumentTypeCodesLinkedHashSet);
+
+            collectOrderRequest.setDocumentTypeCodes(documentTypeCodes);
+        }
+
         List<IoCollectOrderResponse> orderResponses = collectOrderOriginService.filterList(collectOrderRequest);
         PageInfo<IoCollectOrderResponse> pageInfo = new PageInfo<>(orderResponses);
         PageSimpleResponse<IoCollectOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java

@@ -12,6 +12,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
 import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
+import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.exception.JsonException;
@@ -54,6 +55,8 @@ public class IoCollectOriginService {
     private DownloadFactory downloadFactory;
     @Resource
     private SysWorkplaceDocumentDao sysWorkplaceDocumentDao;
+    @Resource
+    private SysWorkplaceDocumentService sysWorkplaceDocumentService;
 
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
@@ -101,12 +104,10 @@ public class IoCollectOriginService {
         String busType = collectOrderRequest.getBusType();
         if (StrUtil.isBlank(busType)) {
             //下载工位下的类型
-            WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
+            List<SysWorkplaceDocumentEntity> list = sysWorkplaceDocumentService.list();
-            List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest);
+            if (CollUtil.isNotEmpty(list)) {
-            if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) {
+                for (SysWorkplaceDocumentEntity item : list) {
-                for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse : sysWorkplaceDocumentResponses) {
+                    collectOrderRequest.setBusType(item.getDocumentTypeCode());
-                    String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode();
-                    collectOrderRequest.setBusType(documentTypeCode);
                     downloadFactory.downloadOrder(collectOrderRequest);
                 }
             }else{

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -38,7 +38,6 @@
                  left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode
 
         <where>
-        and sys_workplace_document.workplaceCode is not null
             <if test="workplaceCode != '' and workplaceCode != null">
                 AND sys_workplace_bus.workplaceCode = #{workplaceCode}
             </if>

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -44,8 +44,12 @@
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
+
             <if test="fromCorp != '' and fromCorp != null">
-                AND fromCorp LIKE concat('%', #{fromCorp}, '%')
+                AND ( fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%') )
+            </if>
+            <if test="fromType != '' and fromType != null">
+                AND fromType LIKE concat('%', #{fromType}, '%')
             </if>
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}

src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml

@@ -46,7 +46,10 @@
                 AND busType = #{busType}
             </if>
             <if test="fromCorp != '' and fromCorp != null">
-                AND fromCorp LIKE concat('%', #{fromCorp}, '%')
+                AND ( fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%') )
+            </if>
+            <if test="fromType != '' and fromType != null">
+                AND fromType LIKE concat('%', #{fromType}, '%')
             </if>
             <if test="collectCode != null and collectCode != ''">
                 AND collectCode = #{collectCode}