9/9 根据当前用户工位查看单据

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -155,7 +155,7 @@ public class SysWorkplaceController extends BaseController {
             return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除");
         }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
-        workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId()));
+        workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId());
         List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
         if (sysWorkplaceDocumentResponses.size() > 0) {
             return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除");

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

@@ -16,6 +16,7 @@ import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
 import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
 import com.glxp.api.req.basic.PrescribeBindWorkRequest;
 import com.glxp.api.req.collect.CollectOrderBindWorkRequest;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
@@ -23,8 +24,10 @@ import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.collect.CollectOrderSaveRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
+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.*;
 import com.glxp.api.util.IntUtil;
@@ -41,6 +44,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 public class IoCollectOrderController extends BaseController {
@@ -51,8 +55,27 @@ public class IoCollectOrderController extends BaseController {
     @Resource
     IoCollectOrderBizService collectOrderBizService;
 
+    @Resource
+    private BasicCollectUserService basicCollectUserService;
     @GetMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
+
+        List<Long> workPlaceCodes = null;
+        List<UserWorkResponse> page;
+        if (collectOrderRequest.getWorkPlaceCode() == null){
+            Long userId = getUserId();
+            BasicCollectUserRequest request = new BasicCollectUserRequest();
+            request.setPage(1);
+            request.setLimit(100);
+            request.setUserId(userId.toString());
+            page = basicCollectUserService.filterList(request);
+            if (page != null){
+                workPlaceCodes = page.stream()
+                        .map(UserWorkResponse::getWorkplaceId)
+                        .collect(Collectors.toList());
+            }
+            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
+        }
         List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(collectOrderRequest);
         PageInfo<IoCollectOrderResponse> pageInfo = new PageInfo<>(orderResponses);
         PageSimpleResponse<IoCollectOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -63,6 +63,8 @@ public class CollectOrderRequest extends ListPageRequest {
      */
     private Long workPlaceCode;
 
+    private List<Long> workPlaceCodes;
+
     /**
      * 备注
      */

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

@@ -24,7 +24,6 @@
                ico.tagMsg,
                sys_workplace_document.busName                       busTypeName,
                bc.name                                              fromCorpName,
-               sw.workplaceId                                       workPlaceCode,
                sw.workplaceName,
                ico.id,
                ico.orderTime,
@@ -84,6 +83,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="workPlaceCodes != null and workPlaceCodes.size() > 0">
+                and ico.workPlaceCode in
+                <foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="invAlert != null">
                 and ico.invAlert =#{invAlert}
             </if>
@@ -97,6 +102,8 @@
                 and ico.uploadStatus = #{uploadStatus}
             </if>
         </where>
+        GROUP BY
+        ico.billNo
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>