明细扣除

yujian

2019-08-22 686cb7a025823c7750ecdf4520f8060fc5ec05d5

明细扣除

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java

@@ -95,5 +95,5 @@
     * @param uid

     * @return

     */

    int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") Date date);

    int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") String date);

}


 fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml

@@ -174,12 +174,13 @@
        <if test="maxTime!=null">
            and #{maxTime}>ir_create_time
        </if>
    </select>

    </select>




    <select id="countByTaskIdTodayNum" resultType="Integer">

        SELECT IFNULL(COUNT(tr.`ir_id`),0) FROM yeshi_ec_integral_task_record tr

        WHERE tr.ir_uid = #{uid} AND tr.`ir_task_id`= #{tid} 

              AND TO_DAYS(tr.ir_create_time) = TO_DAYS(${date}) AND tr.ir_create_time <![CDATA[<=]]>${date}

              AND TO_DAYS(tr.ir_create_time) = TO_DAYS('${date}') AND tr.ir_create_time <![CDATA[<=]]>'${date}'

    </select>

    

</mapper>

</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java

@@ -160,8 +160,8 @@
                BigDecimal income = new BigDecimal(voList.get(p).getIncome());

                

                // 去除支出负号

                finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", ""));

                finalList.get(key).getMonth().setIncome(income.setScale(2).toString());

                finalList.get(key).getMonth().setExpend(expend.setScale(0).toString().replace("-", ""));

                finalList.get(key).getMonth().setIncome(income.setScale(0).toString());

                p++;

            }

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -254,7 +254,7 @@
        int num = 0;

        FrequencyEnum frequency = integralTask.getFrequency();

        if (frequency == FrequencyEnum.everyday) {

            num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, record.getCreateTime());

            num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, TimeUtil.getWholeTime(record.getCreateTime().getTime()));

        } else if (frequency == FrequencyEnum.onlyOne) {

            num = 1;

        }