From 6a90b2d87cf32bdc2fdafb96e979e7b9cfdebb40 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 19:23:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 87 ++++++++++++++++++++-----------------------
1 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index b88ae19..f3fa62b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -8,10 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
-import com.doumee.dao.business.SolutionsMapper;
-import com.doumee.dao.business.TaxDetialMapper;
-import com.doumee.dao.business.TaxesMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.DirectInvoicingDTO;
import com.doumee.dao.business.dto.DirectInvoicingDetailDTO;
import com.doumee.dao.business.dto.EntrustInvoicingDTO;
@@ -67,7 +64,8 @@
private ApplyChangeJoinMapper applyChangeJoinMapper;
@Autowired
private SolutionsMapper solutionsMapper;
-
+ @Autowired
+ private NoticesMapper noticesMapper;
@Override
public Integer create(Taxes taxes) {
taxesMapper.insert(taxes);
@@ -118,6 +116,10 @@
}
}
}
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.TAXES;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
}
private List<TaxDetial> getDetailListById(Integer id) {
@@ -147,6 +149,8 @@
queryWrapper.leftJoin(ApplyChange.class,ApplyChange::getId,TaxDetial::getApplyChangeId);
queryWrapper.leftJoin(Taxes.class,Taxes::getId,TaxDetial::getDelTaxId);
List<TaxDetial> detialList = taxDetailJoinMapper.selectJoinList(TaxDetial.class,queryWrapper.orderByAsc(TaxDetial::getType));
+
+
return detialList;
}
@@ -181,6 +185,12 @@
update.setDoneDate(update.getEditDate());
update.setImgurl(taxes.getImgurl());
taxesMapper.updateById(update);
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.TAXES;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,taxes.getId()));
+
}
@Override
@@ -290,8 +300,8 @@
queryWrapper.eq(Taxes::getCompanyId,-1);//璁剧疆鏃犳晥璁块棶
}else{
queryWrapper.in(Taxes::getCompanyId,user.getCompanyIdList());
- queryWrapper.ge(pageWrap.getModel().getStartDate() != null,Taxes::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
- queryWrapper.le(SignRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+ queryWrapper.ge(pageWrap.getModel().getStartDate() != null,Taxes::getCreateDate, pageWrap.getModel().getStartDate());
+ queryWrapper.le(pageWrap.getModel().getEndDate() != null,Taxes::getCreateDate, pageWrap.getModel().getEndDate());
queryWrapper.eq(pageWrap.getModel().getTaxBank() != null,Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
queryWrapper.eq(pageWrap.getModel().getTaxBank() != null,Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
queryWrapper.eq(pageWrap.getModel().getRemark() != null,Taxes::getRemark, pageWrap.getModel().getRemark());
@@ -340,8 +350,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱敤鎴锋棤娉曡繘琛岃涓氬姟鏌ヨ");
}
if(!Objects.isNull(queryModel)){
- queryWrapper.ge(pageWrap.getModel().getStartDate() != null,Taxes::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
- queryWrapper.le(SignRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+ queryWrapper.ge(pageWrap.getModel().getStartDate() != null,Taxes::getCreateDate, (pageWrap.getModel().getStartDate()));
+ queryWrapper.le(pageWrap.getModel().getEndDate() != null,Taxes::getCreateDate, (pageWrap.getModel().getEndDate()));
queryWrapper.eq(!Objects.isNull(queryModel.getInsuranceApplyId()),Taxes::getInsuranceApplyId,queryModel.getInsuranceApplyId());
queryWrapper.eq(!Objects.isNull(queryModel.getStatus()),Taxes::getStatus,queryModel.getStatus());
}
@@ -426,6 +436,17 @@
taxDetial.setType(Constants.ZERO);
}
taxDetailJoinMapper.insertBatchSomeColumn(taxDetialList);
+
+
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.TAXES;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,taxes.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,taxes.getId(),taxes.getPrice().toString(),
+ taxes.getCompanyId(), Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
+
+
}
@@ -472,6 +493,7 @@
.selectAll(InsuranceApply.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.select(" ( select count(1) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.notExists(" select 1 from taxes t1 inner join tax_detial t2 on t1.id = t2.tax_id where t2.type = 0 and t1.status != 2 and t.id = t2.INSURANCE_APPLY_ID ")
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
.eq(InsuranceApply::getId,id)
@@ -495,7 +517,7 @@
if(CollectionUtils.isNotEmpty(applyChangeList)){
for (ApplyChange applyChange:applyChangeList) {
insuranceApply.setFee(insuranceApply.getFee().subtract(applyChange.getFee()));
- TaxesInvoicingVO taxesInvoicingVO = applyChange.getTaxesInvoicingVO();
+ TaxesInvoicingVO taxesInvoicingVO = applyChange.toTaxesInvoicingVO();
if(!Objects.isNull(insuranceApply)){
taxesInvoicingVO.setAmount(BigDecimal.ZERO);
}
@@ -521,7 +543,7 @@
|| Objects.isNull(directInvoicingDTO.getInvoicingMoney())
|| Objects.isNull(directInvoicingDTO.getType())
|| Objects.isNull(directInvoicingDTO.getInvoicingDetailDTOList())
- || StringUtils.isNotBlank(directInvoicingDTO.getAddress())
+ || StringUtils.isBlank(directInvoicingDTO.getAddress())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -617,43 +639,14 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犲彲寮�绁ㄦ暟鎹紝鎿嶄綔澶辫触");
}
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.TAXES;
+ //鍒犻櫎鍏朵粬寰呭姙
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,taxes.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,taxes.getId(),taxes.getPrice().toString(),
+ taxes.getCompanyId(), Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
-// List<DirectInvoicingDetailDTO> directInvoicingDetailDTOList = directInvoicingDTO.getDirectInvoicingDetailDTOList();
-// for (DirectInvoicingDetailDTO directInvoicingDetailDTO:directInvoicingDetailDTOList) {
-// if(Objects.isNull(directInvoicingDetailDTO)
-// || Objects.isNull(directInvoicingDetailDTO.getId())
-// || Objects.isNull(directInvoicingDetailDTO.getType())
-// || Objects.isNull(directInvoicingDetailDTO.getFee())
-// ){
-// throw new BusinessException(ResponseStatus.BAD_REQUEST);
-// }
-//
-// if(directInvoicingDetailDTO.getType().equals(Constants.ZERO)){
-// //淇濆崟
-// InsuranceApply insuranceApply = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
-// new MPJLambdaWrapper<InsuranceApply>()
-// .selectAll(InsuranceApply.class)
-// .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
-// .select(" ( select count(1) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
-// .notExists(" select 1 from taxes t1 inner join tax_detial t2 on t1.id = t2.tax_id where t2.type = 0 and t1.status != 2 and t.id = t2.INSURANCE_APPLY_ID ")
-// .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
-// .eq(InsuranceApply::getId,directInvoicingDetailDTO.getId())
-// );
-// if(Objects.isNull(insuranceApply)){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"淇濆崟鍙枫��"+insuranceApply.getCode()+"銆戞湭鏌ヨ鍒颁繚鍗曚俊鎭�");
-// }
-//
-//
-//
-// }else if(directInvoicingDetailDTO.getType().equals(Constants.ZERO)){
-// //鍔犲噺淇�
-// }else{
-// //鍐茬孩鍗�
-// }
-//
-//
-// }
-// taxDetailJoinMapper.insertBatchSomeColumn(taxDetialList);
}
--
Gitblit v1.9.3