Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java

@@ -3,6 +3,7 @@ package com.glxp.api.controller.basic;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicCollectPointEntity;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
 import com.glxp.api.req.basic.BasicCollectRequest;
@@ -28,13 +29,16 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-public class BasicCollectUserController {
+public class BasicCollectUserController extends BaseController {
 
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
+        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
+            request.setUserId(String.valueOf(getUserId()));
+        }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);
         PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java

@@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest {
     private String userKey;
     private String workKey;
 
+    private Integer autoUserId;
+
 
 }

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

@@ -13,7 +13,7 @@
                 and invCode = #{invCode}
             </if>
         </where>
-        ORDER BY id DESC
+        ORDER BY code
     </select>
     <select id="selectAll" resultType="com.glxp.api.entity.basic.BasicCollectPointCategory">
         SELECT *

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

@@ -5,8 +5,8 @@
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
         SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory,bp.bzgg
         FROM io_collect_order_biz icob
-                     left join basic_udirel bu on icob.relId = bu.id
+                 left join basic_udirel bu on icob.relId = bu.id
-                     left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="thrCode != '' and thrCode != null">
                 AND icob.thrCode LIKE concat('%', #{thrCode}, '%')
@@ -23,12 +23,13 @@
             <if test="unionCode != '' and unionCode != null">
                 and (
                         bp.nameCode LIKE concat('%', #{unionCode}, '%')
-                                or bp.ybbm LIKE concat('%', #{unionCode}, '%')
+                        or bp.ybbm LIKE concat('%', #{unionCode}, '%')
-                                or bp.sptm LIKE concat('%', #{unionCode}, '%'))
+                        or bp.sptm LIKE concat('%', #{unionCode}, '%'))
             </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
         </where>
+        group by icob.id
     </select>
 </mapper>

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

@@ -4,14 +4,14 @@
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderCodeManRequest"
             resultType="com.glxp.api.res.collect.CollectOrderCodeManResponse">
         SELECT icocm.*,
-        bp.cpmctymc,
+               bp.cpmctymc,
-        COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
+               COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
-        bp.bzgg,
+               bp.bzgg,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        bp.manufactory
+               bp.manufactory
         FROM io_collect_order_code_man icocm
-        left join basic_udirel bu on icocm.relId = bu.id
+                 left join basic_udirel bu on icocm.relId = bu.id
-        left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND icocm.orderIdFk = #{orderIdFk}
@@ -26,5 +26,6 @@
                 AND icocm.bizIdFk = #{bizIdFk}
             </if>
         </where>
+        group by icocm.id
     </select>
 </mapper>