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

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
@@ -32,6 +32,13 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
List<PayMailBill> selectInvoicingStage(@Param("projectId")String projectId);
/**
* @Description 查询月份邮寄数量
* @Author lqt
* @Date 2021/9/25
* @Param time 年月
* @Return
* @Exception
*/
Integer getMonthMailCount(String time);
}
@@ -49,6 +49,7 @@
inner JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id
where pmbp.project_id=#{projectId}
</select>
<select id="getMonthMailCount" resultType="java.lang.Integer">
SELECT count(*) FROM pay_mail_bill WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
</select>
</mapper>
@@ -1,14 +1,9 @@
package com.jero.mail.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.mail.PayMailBillVO;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import java.util.List;
@@ -56,4 +51,13 @@ public interface IPayMailBillService extends IService<PayMailBill> {
* @param payMailBill
*/
void addFromStandards(PayMailBill payMailBill);
/**
* @Description 查询月份邮寄数量
* @Author lqt
* @Date 2021/9/25
* @Param time 年月
* @Return
* @Exception
*/
Integer getMonthMailCount(String time);
}
@@ -242,6 +242,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
payMailBillProjectService.save(bmp);
}
@Override
public Integer getMonthMailCount(String time) {
return payMailBillMapper.getMonthMailCount(time);
}
//校验不同项目是否属于同一个公司
private String checkCompanyProject(List<PayMailBillProject> bmpList) {