消息修改,添加日志,权限

This commit is contained in:
梁琦涛
2021-09-26 09:20:35 +08:00
parent 83c31ceba7
commit 964fa0edb4
46 changed files with 928 additions and 279 deletions
@@ -2,11 +2,13 @@ package com.jero.payment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.home.vo.DataStatisticsVO;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.vo.PayCommonProjectOutput;
import io.lettuce.core.dynamic.annotation.Param;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -36,4 +38,14 @@ public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
@Param("payCommonProject")PayCommonProject payCommonProject,
@Param("projectType") String projectType,
@Param("paymentDate") String paymentDate);
/**
* @Description 查询月份应收总额
* @Author lqt
* @Date 2021/9/25
* @Param time 年-月
* @Return
* @Exception
*/
BigDecimal getMonthAmountCount(String time);
}
@@ -201,4 +201,7 @@
</if>
GROUP BY p.id ORDER BY p.create_time
</select>
<select id="getMonthAmountCount" resultType="java.math.BigDecimal">
SELECT sum(amount_received) AS nowMonthAmount FROM pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time}
</select>
</mapper>
@@ -1,9 +1,9 @@
package com.jero.payment.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.home.vo.DataStatisticsVO;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.vo.TbCheckVo;
import com.jero.project.entity.PayCommonProject;
@@ -11,6 +11,7 @@ import com.jero.project.vo.PayCommonProjectOutput;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -55,4 +56,13 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
* @return
*/
public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject,String projectType, String paymentDate, Class<PayCommonProjectOutput> clazz, String title);
/**
* @Description 查询月份应收总额
* @Author lqt
* @Date 2021/9/25
* @Param time 年-月
* @Return
* @Exception
*/
BigDecimal getMonthAmountCount(String time);
}
@@ -1,6 +1,5 @@
package com.jero.payment.service.impl;
import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,6 +8,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.oConvertUtils;
import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.home.vo.DataStatisticsVO;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.mapper.PayMeetingSituationMapper;
import com.jero.member.entity.PayMemberProjectSubitem;
@@ -25,7 +25,6 @@ import com.jero.project.mapper.PayCommonProjectMapper;
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
import com.jero.common.util.AuthenticationUtils;
import com.jero.project.vo.PayCommonProjectOutput;
import io.lettuce.core.dynamic.annotation.Param;
import org.apache.commons.beanutils.PropertyUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -38,7 +37,6 @@ import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.beans.Transient;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -424,6 +422,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
return mv;
}
@Override
public BigDecimal getMonthAmountCount(String time) {
return payPaymentRecordMapper.getMonthAmountCount(time);
}
/**
* 获取对象ID
*