#

zyx

2024-04-16 90ed250a3395aff654b8020212f32ab2c3f921a2

#

 src/main/java/com/zy/asrs/controller/ManPakOutController.java

@@ -81,7 +81,12 @@
            etime = DateUtils.convert(dates[1]);
        }

        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,getUserId());
        Long userId = getUserId();
        if(getUser().getRoleId() == 2 || getUser().getRoleId() == 24){
            userId = null;
        }

        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId);
        for (PakOutDTO pakOutDTO:pakOutDTOS){
            List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
            for (ManPakOut manPakOut:manPakOuts){
@@ -96,7 +101,7 @@

        }

        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,getUserId());
        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId);
        Page<PakOutDTO> page = new Page<>();
        // 最后按状态未出库->已出库排序
//        page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));

 src/main/resources/mapper/ManPakOutMapper.xml

@@ -12,7 +12,9 @@
        <if test="etime != null">
            and create_time &lt;= #{etime}
        </if>
        and (create_by = #{userId} or create_by is null)
        <if test="userId != null">
            and (create_by = #{userId} or create_by is null)
        </if>

    </sql>