wuxw
2022-11-28 6f9bc05e8ac7952d8043832cb99f8a7928114193
优化紧急采购时 入库没有写 times bug
2个文件已修改
7 ■■■■■ 已修改文件
java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml
@@ -503,7 +503,8 @@
    <!-- 查询资源信息 add by wuxw 2018-07-03 -->
    <select id="queryResourceStoresTotalPrice" parameterType="Map" resultType="Map">
        select IFNULL(sum(total_price),0) as totalPrice from(
        select rsts.res_code ,sum(rsts.stock*rsts.price) total_price from resource_store t
        select rsts.times_id,rsts.res_code,rsts.stock,rsts.price,rsts.stock*rsts.price total_price
        from resource_store t
        inner join resource_store_times rsts on t.res_code = rsts.res_code and rsts.status_cd = '0'
        left join resource_store_type rst on t.rst_id = rst.rst_id and rst.status_cd = '0'
        left join resource_store_type rst1 on t.parent_rst_id = rst1.rst_id and rst1.status_cd = '0'
@@ -609,7 +610,7 @@
        <if test="resOrderType == '20000'">
            and t.stock > 0
        </if>
        group by rsts.res_code
        group by rsts.times_id,rsts.res_code,rsts.stock,rsts.price
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java
@@ -52,7 +52,7 @@
        basePrivilegeDto.setResource("/viewGroupResource");
        basePrivilegeDto.setUserId(userId);
        List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
        if (reqJson.containsKey("operationType") && reqJson.getString("operationType").equals("1000") && privileges.size() > 0) {
        if ("1000".equals(reqJson.getString("operationType")) && privileges.size() > 0) {
            resourceStoreDto.setShType("");
            resourceStoreDto.setShObjIds(new String[]{reqJson.getString("communityId"), reqJson.getString("storeId")});
        } else if (StorehouseDto.SH_TYPE_COMMUNITY.equals(resourceStoreDto.getShType()) || privileges.size() == 0) {