From 41f24b362a02e4a8a2cfffb7e81884659edfbf98 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 04 二月 2024 14:55:51 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 106 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 41 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 b81bc0a..a3dee36 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) {
@@ -150,6 +152,8 @@
queryWrapper.leftJoin(Taxes.class,Taxes::getId,TaxDetial::getDelTaxId);
queryWrapper.eq( TaxDetial::getTaxId,id);
List<TaxDetial> detialList = taxDetailJoinMapper.selectJoinList(TaxDetial.class,queryWrapper.orderByAsc(TaxDetial::getType));
+
+
return detialList;
}
@@ -184,6 +188,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
@@ -337,6 +347,7 @@
queryWrapper.selectAll(Taxes.class);
queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);
+
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
Taxes queryModel = pageWrap.getModel();
@@ -363,6 +374,37 @@
return result;
}
+
+
+ @Override
+ public List<Taxes> findListForCompany(Taxes queryModel) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Taxes.class);
+ queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);
+
+ queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
+ if(!user.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱敤鎴锋棤娉曡繘琛岃涓氬姟鏌ヨ");
+ }
+ if(!Objects.isNull(queryModel)){
+ queryWrapper.ge(queryModel.getStartDate() != null,Taxes::getCreateDate, (queryModel.getStartDate()));
+ queryWrapper.le(queryModel.getEndDate() != null,Taxes::getCreateDate, (queryModel.getEndDate()));
+ queryWrapper.eq(!Objects.isNull(queryModel.getInsuranceApplyId()),Taxes::getInsuranceApplyId,queryModel.getInsuranceApplyId());
+ queryWrapper.eq(!Objects.isNull(queryModel.getStatus()),Taxes::getStatus,queryModel.getStatus());
+ }
+ queryWrapper.orderByAsc(Taxes::getCreateDate);
+
+ List<Taxes> result = taxesJoinMapper.selectJoinList(Taxes.class, queryWrapper);
+ String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.TAXES_FILE).getCode();
+ for(Taxes t : result){
+ if(StringUtils.isNotBlank(t.getImgurl())){
+ t.setImgurlFull(path + t.getImgurl());
+ }
+ }
+ return result;
+ }
@@ -430,6 +472,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);
+
+
}
@@ -622,43 +675,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