LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组统计

Browse Source
This commit is contained in:
zhangqinlin
2021-09-15 13:44:36 +08:00
parent 26d7c30583
commit 79c4e0a003
10 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+28 -7
View File
@@ -7,6 +7,7 @@ import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,6 +23,7 @@ import com.jero.company.mapper.PayContactsManagementMapper;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.member.entity.PayMemberProjectSubitem;
@@ -59,21 +61,40 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
/**
* 分页列表查询
*
* @param payMailBill
* @param payMailBillSearch
* @param pageNo
* @param pageSize
* @param req
* @param
* @return
*/
@ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBill payMailBill,
public Result<?> queryPageList(PayMailBillSearch payMailBillSearch,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMailBill> queryWrapper = QueryGenerator.initQueryWrapper(payMailBill, req.getParameterMap());
queryWrapper.orderByAsc("post_status","create_time");
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
Page<PayMailBill> page = new Page<>(pageNo, pageSize);
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
queryWrapper.gt("send_date", payMailBillSearch.getStartTime());
queryWrapper.lt("send_date", payMailBillSearch.getEndTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
queryWrapper.gt("send_date", payMailBillSearch.getStartTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
queryWrapper.lt("send_date", payMailBillSearch.getEndTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalName())){
queryWrapper.like("principal_name",payMailBillSearch.getPrincipalName());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
}
IPage<PayMailBill> pageList = payMailBillService.page(page, queryWrapper);
return Result.OK(pageList);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+6
View File
@@ -112,4 +112,10 @@ public class PayMailBill implements Serializable {
@ApiModelProperty(value = "来款单位")
@NotNull(message = "来款单位不能为空")
private java.lang.String chargeCompanyName;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
@NotNull(message = "项目负责人不能为空")
private java.lang.String principalName;
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java
+39
View File
@@ -0,0 +1,39 @@
package com.jero.mail.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
/**
* @author zql
* @date 2021/9/15 11:47
*/
@Data
public class PayMailBillSearch {
@ApiModelProperty(value = "来款单位")
private java.lang.String chargeCompanyName;
@ApiModelProperty(value = "项目负责人")
private java.lang.String principalName;
@ApiModelProperty(value = "项目名称")
private java.lang.String projectName;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始时间")
private java.util.Date startTime;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "结束时间")
private java.util.Date endTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
+6
View File
@@ -1,8 +1,12 @@
package com.jero.mail.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillSearch;
import io.lettuce.core.dynamic.annotation.Param;
import java.math.BigDecimal;
@@ -27,4 +31,6 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
// 开票总额
BigDecimal sumInvoiceAmount(@Param("projectId") String projectId);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+1
View File
@@ -49,4 +49,5 @@
left join pay_mail_bill_project bp on b.id = bp.bill_id
where bp.project_id= #{projectId}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+7
View File
@@ -1,8 +1,12 @@
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.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillSearch;
import java.util.List;
@@ -30,4 +34,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
* @return
*/
Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+4
View File
@@ -2,6 +2,8 @@ package com.jero.mail.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
@@ -11,6 +13,7 @@ import com.jero.common.util.oConvertUtils;
import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.mapper.PayMailBillMapper;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
@@ -136,6 +139,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
return Result.OK("添加成功！");
}
//校验不同项目是否属于同一个公司
private String checkCompanyProject(String[] projectIdArray, String[] projectTypeArray) {
String standardCompanyId = null;//基准公司id
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+2 -2
View File
@@ -17,8 +17,8 @@ public class PayWorkGroupSubletStatistics {
private String id;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人id")
private String principalNameId;
@ApiModelProperty(value = "项目负责人")
private String principalName;
@Excel(name = "来款单位", width = 15)
@ApiModelProperty(value = "来款单位")
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+2 -2
View File
@@ -42,6 +42,6 @@ public class PayWorkingGroupSubletSearch {
@ApiModelProperty(value = "付款状态")
private int inAccountStatue;
@ApiModelProperty(value = "项目负责人")
private String principalName;
@ApiModelProperty(value = "项目负责人id")
private String principalNameId;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+1 -1
View File
@@ -92,7 +92,7 @@
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND date_format(ppr.payment_date,'%Y-%m-%d') LIKE concat('%',concat(#{payWorkingGroupSubletSearch.year},'%'))
</if>
<if test="payWorkingGroupSubletSearch.principalName != null and payWorkingGroupSubletSearch.principalName != ''">
<if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
</if>
<choose>