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-17 16:50:55 +08:00
parent 6aade37dcd
commit e3c794d173
14 changed files with 322 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java
+33
View File
@@ -0,0 +1,33 @@
package com.jero.mail.commont;
/**
* @author zql
* @date 2021/9/17 15:06
*/
public interface constant {
/**
* 邮寄状态标识√，应收金额等于开票金额，开票次数等于邮寄次数。
*/
public static final int ONE=1;
/**
* 半满状态，邮寄次数小于开票次数大于零
*/
public static final int TWO=2;
/**
* 用户角色(科长)
*/
public static final String KZ="kz";
/**
* 用户角色(所领导)
*/
public static final String SLD="sld";
/**
* 用户角色(职员)
*/
public static final String ZY="zy";
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+77 -73
View File
@@ -1,17 +1,10 @@
package com.jero.mail.controller;
import java.math.BigDecimal;
import java.security.PrivateKey;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,18 +14,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.common.ProjectCommon;
import com.jero.common.constant.GlobalConstants;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.vo.ProjectDetailVO;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.mapper.PayContactsManagementMapper;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.data.entity.PayFileDownloadRecord;
import com.jero.mail.commont.constant;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingSituation;
@@ -165,19 +156,31 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
ProjectDetailVO projectDetailVO = projectDetailService.getProjectDetail(one1.getProjectId());
return Result.OK(projectDetailVO);
}
/**
* 编辑
*
*/
@ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
@PostMapping(value = "/editTwo")
public Result<?> editTwo(@RequestBody PayMailBill payMailBill
) {
payMailBill.setPostStatus(1);
payMailBillService.updateById(payMailBill);
return Result.OK("操作成功!");
}
/**
* 编辑
*
*/
@ApiOperation(value="邮寄票据-邮寄和修改", notes="邮寄票据-邮寄和修改")
@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
@Transactional
@PostMapping(value = "/edit2")
public Result<?> edit2(@RequestBody PayMailBill payMailBill) {
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailBill payMailBill) {
payMailBill.setPostStatus(1);
payMailBillService.updateById(payMailBill);
//变更5种项目的邮寄状态
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject);
@@ -204,67 +207,68 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
//获取项目应收金额
BigDecimal receivableAmount = new BigDecimal("0.00");
if(GlobalConstants.ONE.equals(one.getProjectType())){
receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();}
PayCommonProject payCommonProject = new PayCommonProject();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payCommonProject.setId(one.getProjectId());
payCommonProject.setMail(1);
payCommonProjectService.updateById(payCommonProject);
}else if(y<c&&y>0){
payCommonProject.setId(one.getProjectId());
payCommonProject.setMail(2);
payCommonProjectService.updateById(payCommonProject);
}
else if(GlobalConstants.TWO.equals(one.getProjectType())) {
receivableAmount= payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payWorkingGroupSubItem.setId(one.getProjectId());
payWorkingGroupSubItem.setMail(1);
payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
}else if(y<c&&y>0){
payWorkingGroupSubItem.setId(one.getProjectId());
payWorkingGroupSubItem.setMail(2);
payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
}
}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payMeetingSituation.setId(one.getProjectId());
payMeetingSituation.setMail(1);
payMeetingSituationService.updateById(payMeetingSituation);
}else if(y<c&&y>0){
payMeetingSituation.setId(one.getProjectId());
payMeetingSituation.setMail(2);
payMeetingSituationService.updateById(payMeetingSituation);
}
}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payMemberProjectSubitem.setId(one.getProjectId());
payMemberProjectSubitem.setMail(1);
payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
}else if(y<c&&y>0){
payMemberProjectSubitem.setId(one.getProjectId());
payMemberProjectSubitem.setMail(2);
payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
}
}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
//判断变更那个项目的邮寄状态
if(GlobalConstants.ONE.equals(one.getProjectType())){
receivableAmount= payCommonProjectService.getById(one.getProjectId()).getReceivableAmount();
PayCommonProject payCommonProject = new PayCommonProject();
if(receivableAmount.compareTo(invoice)==0 && c==y){
tbMemberProjectSubitem.setId(one.getProjectId());
tbMemberProjectSubitem.setMail(1);
tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
}else if(y<c&&y>0){
tbMemberProjectSubitem.setId(one.getProjectId());
tbMemberProjectSubitem.setMail(2);
tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
payCommonProject.setId(one.getProjectId());
payCommonProject.setMail(constant.ONE);
payCommonProjectService.updateById(payCommonProject);
}else if(y<=c&&y>0){
payCommonProject.setId(one.getProjectId());
payCommonProject.setMail(constant.TWO);
payCommonProjectService.updateById(payCommonProject);
}
}else if(GlobalConstants.TWO.equals(one.getProjectType())) {
receivableAmount=payWorkingGroupSubItemService.getById(one.getProjectId()).getReceivableAmount();
PayWorkingGroupSubItem payWorkingGroupSubItem = new PayWorkingGroupSubItem();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payWorkingGroupSubItem.setId(one.getProjectId());
payWorkingGroupSubItem.setMail(constant.ONE);
payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
}else if(y<=c&&y>0){
payWorkingGroupSubItem.setId(one.getProjectId());
payWorkingGroupSubItem.setMail(constant.TWO);
payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
}
}else if (GlobalConstants.THERE.equals(one.getProjectType())) {
receivableAmount= payMeetingSituationService.getById(one.getProjectId()).getAmountReceivable();
PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payMeetingSituation.setId(one.getProjectId());
payMeetingSituation.setMail(constant.ONE);
payMeetingSituationService.updateById(payMeetingSituation);
}else if(y<=c&&y>0){
payMeetingSituation.setId(one.getProjectId());
payMeetingSituation.setMail(constant.TWO);
payMeetingSituationService.updateById(payMeetingSituation);
}
}else if (GlobalConstants.FORE.equals(one.getProjectType())) {
receivableAmount= payMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
PayMemberProjectSubitem payMemberProjectSubitem = new PayMemberProjectSubitem();
if(receivableAmount.compareTo(invoice)==0 && c==y){
payMemberProjectSubitem.setId(one.getProjectId());
payMemberProjectSubitem.setMail(constant.ONE);
payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
}else if(y<=c&&y>0){
payMemberProjectSubitem.setId(one.getProjectId());
payMemberProjectSubitem.setMail(constant.TWO);
payMemberProjectSubitemService.updateById(payMemberProjectSubitem);
}
}else if (GlobalConstants.FIVE.equals(one.getProjectType())){
receivableAmount=tbMemberProjectSubitemService.getById(one.getProjectId()).getAmountReceivable();
TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
if(receivableAmount.compareTo(invoice)==0 && c==y){
tbMemberProjectSubitem.setId(one.getProjectId());
tbMemberProjectSubitem.setMail(constant.ONE);
tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
}else if(y<=c&&y>0){
tbMemberProjectSubitem.setId(one.getProjectId());
tbMemberProjectSubitem.setMail(constant.TWO);
tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
}
//推送邮寄数据到会员系统
payMailBillService.pushSendToStandards(payMailBill,one.getProjectId());
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+2 -2
View File
@@ -70,11 +70,11 @@ public class PayMailBill implements Serializable {
/**邮寄状态(0:未邮寄，1::已邮寄)*/
@Dict(dicCode = "mail_type")
@Excel(name = "邮寄状态", width = 15,dicCode = "mail_type")
@ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)")
@ApiModelProperty(value = "邮寄状态")
private java.lang.Integer postStatus;
/**快递公司(1:EMS,2:顺丰)*/
@Dict(dicCode = "mail_send")
@ApiModelProperty(value = "快递公司(1:EMS,2:顺丰)")
@ApiModelProperty(value = "快递公司")
private java.lang.Integer sendMethod;
/**快递单号*/
@Excel(name = "快递单号", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java
+5 -5
View File
@@ -14,18 +14,18 @@ public class PayMailBillList {
private java.lang.String id;
@Dict(dicCode ="mail_type" )
@Excel(name = "邮寄状态", width = 15)
@ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)")
@ApiModelProperty(value = "邮寄状态")
private java.lang.String postStatus;
@Excel(name = "邮寄方式", width = 15)
@ApiModelProperty(value = "邮寄方式(1:EMS,2:顺丰)")
@ApiModelProperty(value = "邮寄方式")
private java.lang.String sendMethod;
@Excel(name = "邮寄单号", width = 15)
@ApiModelProperty(value = "邮寄单号")
private java.lang.String postNo;
@Excel(name = "负责人", width = 15)
@Excel(name = "邮寄联系人", width = 15)
@ApiModelProperty(value = "邮寄联系人")
private java.lang.String liaisonMan;
@Excel(name = "负责人手机号", width = 15)
@Excel(name = "邮寄联系人手机号", width = 15)
@ApiModelProperty(value = "邮寄联系人手机号")
private java.lang.String mobile;
@Excel(name = "合同编号", width = 15)
@@ -37,7 +37,7 @@ public class PayMailBillList {
@Excel(name = "签订单位", width = 15)
@ApiModelProperty(value = "签订单位")
private java.lang.String signedCompanyTemporaryName;
@Excel(name = "邮寄联系人", width = 15)
@Excel(name = "负责人", width = 15)
@ApiModelProperty(value = "负责人")
private java.lang.String principalName;
@ApiModelProperty(value = "负责人id")
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+2
View File
@@ -9,6 +9,8 @@ pc.send_method as sendMethod,
pc.post_no as postNo,
pc.liaison_man as liaisonMan,
pc.mobile,
pc.remark,
pc.send_date as sendDate,
pic.contract_num as contractNum,
pic.contract_name as contractName,
pic.signed_company_temporary_name as signedCompanyTemporaryName,