java110
2021-09-08 c27370dd7819dad0aad5314a4268b172092b3dca
优化bug
8个文件已修改
125 ■■■■ 已修改文件
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/dao/IReportFeeMonthStatisticsServiceDao.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/dao/IReportFeeYearCollectionServiceDao.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthStatisticsServiceDaoImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeYearCollectionServiceDaoImpl.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -89,9 +89,7 @@
        update report_fee_month_statistics t set
        t.owe_amount= #{oweAmount}
        where 1=1
        <if test="statisticsId !=null and statisticsId != ''">
            and t.statistics_id= #{statisticsId}
        </if>
        <if test="curMaxTime !=null ">
            and t.cur_max_time &lt;= #{curMaxTime}
        </if>
@@ -160,6 +158,26 @@
    </update>
    <!-- 修改费用月统计信息 add by wuxw 2018-07-03 -->
    <update id="deleteReportFeeMonthStatisticsInfo" parameterType="Map">
        update report_fee_month_statistics t set t.status_cd = '1'
        where 1=1
        <if test="statisticsId !=null and statisticsId != ''">
            and t.statistics_id= #{statisticsId}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>
        <if test="configId !=null and configId != ''">
            and t.config_id= #{configId}
        </if>
    </update>
    <!-- 查询费用月统计数量 add by wuxw 2018-07-03 -->
    <select id="queryReportFeeMonthStatisticssCount" parameterType="Map" resultType="Map">
        select count(1) count
java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionServiceDaoImplMapper.xml
@@ -178,6 +178,21 @@
    </update>
    <update id="deleteReportFeeYearCollectionInfo" parameterType="Map">
        update report_fee_year_collection t set t.status_cd = '1'
        where 1=1
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="collectionId !=null and collectionId != ''">
            and t.collection_id= #{collectionId}
        </if>
    </update>
    <!-- 查询费用年收费数量 add by wuxw 2018-07-03 -->
    <select id="queryReportFeeYearCollectionsCount" parameterType="Map" resultType="Map">
        select count(DISTINCT t.collection_id) count
service-report/src/main/java/com/java110/report/dao/IReportFeeMonthStatisticsServiceDao.java
@@ -325,4 +325,6 @@
    int queryHuaningOweFeeDetailCount(Map paramInfo);
    List<Map> queryHuaningOweFeeDetail(Map beanCovertMap);
    void deleteReportFeeMonthStatisticsInfo(Map beanCovertMap);
}
service-report/src/main/java/com/java110/report/dao/IReportFeeYearCollectionServiceDao.java
@@ -50,6 +50,13 @@
     */
    void updateReportFeeYearCollectionInfo(Map info) throws DAOException;
    /**
     * 修改费用年收费信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void deleteReportFeeYearCollectionInfo(Map info) throws DAOException;
    /**
     * 查询费用年收费总数
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthStatisticsServiceDaoImpl.java
@@ -75,6 +75,18 @@
        }
    }
    @Override
    public void deleteReportFeeMonthStatisticsInfo(Map info) {
        logger.debug("deleteReportFeeMonthStatisticsInfo 入参 info : {}", info);
        int saveFlag = sqlSessionTemplate.update("reportFeeMonthStatisticsServiceDaoImpl.deleteReportFeeMonthStatisticsInfo", info);
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用月统计信息Instance数据失败:" + JSONObject.toJSONString(info));
        }
    }
    /**
     * 修改费用月统计信息
     *
@@ -333,6 +345,7 @@
        return businessReportFeeMonthStatisticsInfos;
    }
    @Override
    public Map queryPayFeeDetailCount(Map info) {
        logger.debug("查询费用月统计数据 入参 info : {}", info);
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeYearCollectionServiceDaoImpl.java
@@ -1,15 +1,13 @@
package com.java110.report.dao.impl;
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.report.dao.IReportFeeYearCollectionServiceDao;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -25,51 +23,52 @@
    private static Logger logger = LoggerFactory.getLogger(ReportFeeYearCollectionServiceDaoImpl.class);
    /**
     * 保存费用年收费信息 到 instance
     * @param info   bId 信息
     *
     * @param info bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void saveReportFeeYearCollectionInfo(Map info) throws DAOException {
        logger.debug("保存费用年收费信息Instance 入参 info : {}",info);
        logger.debug("保存费用年收费信息Instance 入参 info : {}", info);
        int saveFlag = sqlSessionTemplate.insert("reportFeeYearCollectionServiceDaoImpl.saveReportFeeYearCollectionInfo",info);
        int saveFlag = sqlSessionTemplate.insert("reportFeeYearCollectionServiceDaoImpl.saveReportFeeYearCollectionInfo", info);
        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存费用年收费信息Instance数据失败:"+ JSONObject.toJSONString(info));
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存费用年收费信息Instance数据失败:" + JSONObject.toJSONString(info));
        }
    }
    /**
     * 查询费用年收费信息(instance)
     *
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getReportFeeYearCollectionInfo(Map info) throws DAOException {
        logger.debug("查询费用年收费信息 入参 info : {}",info);
        logger.debug("查询费用年收费信息 入参 info : {}", info);
        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo",info);
        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo", info);
        return businessReportFeeYearCollectionInfos;
    }
    /**
     * 查询费用年收费信息(instance)
     *
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getReportFeeYearCollectionInfos(Map info) throws DAOException {
        logger.debug("查询费用年收费信息 入参 info : {}",info);
        logger.debug("查询费用年收费信息 入参 info : {}", info);
        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfos",info);
        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfos", info);
        return businessReportFeeYearCollectionInfos;
    }
@@ -77,28 +76,47 @@
    /**
     * 修改费用年收费信息
     *
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updateReportFeeYearCollectionInfo(Map info) throws DAOException {
        logger.debug("修改费用年收费信息Instance 入参 info : {}",info);
        logger.debug("修改费用年收费信息Instance 入参 info : {}", info);
        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo",info);
        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo", info);
        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改费用年收费信息Instance数据失败:"+ JSONObject.toJSONString(info));
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用年收费信息Instance数据失败:" + JSONObject.toJSONString(info));
        }
    }
     /**
    /**
     * 修改费用年收费信息
     *
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void deleteReportFeeYearCollectionInfo(Map info) throws DAOException {
        logger.debug("deleteReportFeeYearCollectionInfo 入参 info : {}", info);
        int saveFlag = sqlSessionTemplate.update("reportFeeYearCollectionServiceDaoImpl.deleteReportFeeYearCollectionInfo", info);
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改费用年收费信息Instance数据失败:" + JSONObject.toJSONString(info));
        }
    }
    /**
     * 查询费用年收费数量
     *
     * @param info 费用年收费信息
     * @return 费用年收费数量
     */
    @Override
    public int queryReportFeeYearCollectionsCount(Map info) {
        logger.debug("查询费用年收费数据 入参 info : {}",info);
        logger.debug("查询费用年收费数据 入参 info : {}", info);
        List<Map> businessReportFeeYearCollectionInfos = sqlSessionTemplate.selectList("reportFeeYearCollectionServiceDaoImpl.queryReportFeeYearCollectionsCount", info);
        if (businessReportFeeYearCollectionInfos.size() < 1) {
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
@@ -56,7 +56,7 @@
    public int deleteReportFeeMonthStatistics(@RequestBody ReportFeeMonthStatisticsPo reportFeeMonthStatisticsPo) {
        int saveFlag = 1;
        reportFeeMonthStatisticsPo.setStatusCd("1");
        reportFeeMonthStatisticsServiceDaoImpl.updateReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
        reportFeeMonthStatisticsServiceDaoImpl.deleteReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
        return saveFlag;
    }
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeYearCollectionInnerServiceSMOImpl.java
@@ -54,7 +54,7 @@
    public int deleteReportFeeYearCollection(@RequestBody ReportFeeYearCollectionPo reportFeeYearCollectionPo) {
        int saveFlag = 1;
        reportFeeYearCollectionPo.setStatusCd("1");
        reportFeeYearCollectionServiceDaoImpl.updateReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionPo));
        reportFeeYearCollectionServiceDaoImpl.deleteReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionPo));
        return saveFlag;
    }