修改bug

liujie

7 天以前 38731b1ba57e2f0205e428189fb5b776ca9d85c5

修改bug

 ruoyi-system/src/main/java/com/ruoyi/system/dto/WarehouseGoodsDto.java

@@ -12,6 +12,7 @@
    @ApiModelProperty("1草稿")
    private Integer status;


    @ApiModelProperty("商品信息")
    private List<clinicWarehouseGoodsDto> dtos;
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java

@@ -364,6 +364,12 @@
//        Map<String, List<clinicWarehouseGoodsDto>> collect = dtos.stream().collect(Collectors.groupingBy(clinicWarehouseGoodsDto::getSupplierId));

//        for (Map.Entry<String, List<clinicWarehouseGoodsDto>> stringListEntry : collect.entrySet()) {
        if(dtos.getStatus()==null || dtos.getStatus()!=1 ){
            // 草稿-》正式 移除所有草稿
            this.baseMapper.delete(new LambdaQueryWrapper<TErpClinicWarehousing>().eq(TErpClinicWarehousing::getClinicId,supplierClinicId).eq(TErpClinicWarehousing::getStatus,1));
        }


        TErpClinicWarehousing tErpClinicWarehousing = new TErpClinicWarehousing();
        tErpClinicWarehousing.setClinicId(supplierClinicId);
        tErpClinicWarehousing.setCreateId(user.getUserId().toString());

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java

@@ -38,6 +38,10 @@
    @Override
    public PageInfo<TErpIssueReportingVO> pageList(TErpIssueReportingQuery query) {
        PageInfo<TErpIssueReportingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(query.getReportStartTime()!=null && !query.getReportStartTime().isEmpty() && query.getReportEndTime()!=null && !query.getReportEndTime().isEmpty()){
            query.setReportStartTime(query.getReportStartTime()+" 00:00:00");
            query.setReportEndTime(query.getReportEndTime()+" 23:59:59");
        }
        List<TErpIssueReportingVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml

@@ -38,8 +38,11 @@
            <if test="query.status != null">
                AND status = #{query.status}
            </if>
            <if test="query.reportType != null and query.reportUserId !=null">
                AND report_type = #{query.reportType} and report_user_id =#{query.reportUserId}
            <if test="query.reportType != null ">
                AND report_type = #{query.reportType}
            </if>
            <if test="query.reportUserId !=null">
                and report_user_id =#{query.reportUserId}
            </if>
            <if test="query.createBy != null and query.createBy != ''">
                AND create_by LIKE concat('%',#{query.createBy},'%')

 ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml

@@ -36,7 +36,7 @@
        left join (select id,app_user_id, max(check_time) as lastInspectionTime from t_sys_inspection limit 1) tsi on tsi.app_user_id = tsau.id
        <where>
            <if test="query.phone != null and query.phone != ''">
                and tsau.phone = #{query.phone}
                and tsau.phone  like concat('%',#{query.phone},'%')
            </if>
            <if test="query.nickName != null and query.nickName != ''">
                and tsau.nick_name like concat('%',#{query.nickName},'%')
@@ -65,7 +65,7 @@
        left join (select id,app_user_id, max(check_time) as lastInspectionTime from t_sys_inspection limit 1) tsi on tsi.app_user_id = tsau.id
        <where>
            <if test="query.phone != null and query.phone != ''">
                and tsau.phone = #{query.phone}
                and tsau.phone like concat('%',#{query.phone},'%')
            </if>
            <if test="query.nickName != null and query.nickName != ''">
                and tsau.nick_name like concat('%',#{query.nickName},'%')