From 601bb38a72ec10d43962cdcf1bd7b51835e8b011 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:32:45 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 272 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 195 insertions(+), 77 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 ccd6223..ed4cc96 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
@@ -1,19 +1,36 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.TaxDetialMapper;
import com.doumee.dao.business.TaxesMapper;
-import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.join.TaxDetailJoinMapper;
+import com.doumee.dao.business.join.TaxesJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TaxesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jdk.nashorn.internal.runtime.options.LoggingOption;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.yaml.snakeyaml.scanner.Constant;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -26,11 +43,128 @@
@Autowired
private TaxesMapper taxesMapper;
+ @Autowired
+ private TaxDetialMapper taxDetialMapper;
+ @Autowired
+ private TaxesJoinMapper taxesJoinMapper;
+ @Autowired
+ private TaxDetailJoinMapper taxDetailJoinMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Taxes taxes) {
taxesMapper.insert(taxes);
return taxes.getId();
+ }
+
+ /**
+ * 閫�鍥炵敵璇�
+ * @param taxes
+ */
+ @Override
+ @Transactional
+ public void backApply(Taxes taxes) {
+ if(taxes.getId() == null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Taxes model = taxesMapper.selectById(taxes.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(taxes.getStatus(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鍙戠エ鐘舵�佷笉鏀寔鎾ゅ洖鐢宠锛�");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Taxes update = new Taxes();
+ update.setId(taxes.getId());
+ update.setImgurl(taxes.getImgurl());
+ update.setEditDate(new Date());
+ update.setStatus(Constants.TWO);
+ update.setEditor(user.getId());
+ update.setCancelUserId(user.getId());
+ update.setCancelDate(update.getEditDate());
+ update.setCancelInfo(taxes.getCancelInfo());
+ taxesMapper.updateById(update);
+
+ List<TaxDetial> detialList = getDetailListById(taxes.getId());
+ if(detialList!=null && detialList.size()>0){
+ for(TaxDetial detial :detialList){
+ //绫诲瀷 0淇濆崟鐢宠 1鍔犲噺淇濈敵璇� 2鍐茬孩鍗�
+ if(Constants.equalsInteger(detial.getType(),Constants.TWO)){
+ //濡傛灉鏄啿绾㈠崟锛岃繕鍘熻鐢宠涓哄凡寮�绁�
+ Taxes tu = new Taxes();
+ tu.setId(detial.getDelTaxId());
+ tu.setEditDate(new Date());
+ tu.setStatus(Constants.ONE);
+ tu.setEditor(user.getId());
+ taxesMapper.updateById(tu);
+ }
+ }
+ }
+ }
+
+ private List<TaxDetial> getDetailListById(Integer id) {
+ List<TaxDetial> detialList = taxDetialMapper.selectList(new QueryWrapper<TaxDetial>().lambda().eq(TaxDetial::getTaxId,id).eq(TaxDetial::getIsdeleted,Constants.ZERO));
+ return detialList;
+ }
+ private List<TaxDetial> getJoinDetailListById(Integer id) {
+ MPJLambdaWrapper<TaxDetial> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(TaxDetial.class);
+ queryWrapper.selectAs(Taxes::getDoneCode,TaxDetial::getTaxDoneCode);
+ queryWrapper.selectAs(Taxes::getCreateDate,TaxDetial::getTaxCreateDate);
+ queryWrapper.selectAs(InsuranceApply::getCode,TaxDetial::getApplyCode);
+ queryWrapper.selectAs(ApplyChange::getCode,TaxDetial::getChangApplyCode);
+ queryWrapper.select("(CASE t.type\n" +
+ "WHEN 0 THEN (select count(1) from apply_detail c where c.APPLY_ID=t.INSURANCE_APPLY_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyNum,\n" +
+ "(CASE t.type \n" +
+ "WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.INSURANCE_APPLY_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyChangeAddNum,\n" +
+ "(CASE t.type \n" +
+ "WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.APPLY_CHANGE_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyChangeAddNum");
+ queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,TaxDetial::getInsuranceApplyId);
+ 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;
+ }
+
+
+ /**
+ * 涓婁紶鍙戠エ鍑瘉
+ * @param taxes
+ */
+ @Override
+ public void doneApply(Taxes taxes) {
+ if(taxes.getId() == null
+ ||StringUtils.isBlank(taxes.getImgurl())
+ ||StringUtils.isBlank(taxes.getDoneCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Taxes model = taxesMapper.selectById(taxes.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(taxes.getStatus(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鍙戠エ鐘舵�佷笉鏀寔涓婁紶鍙戠エ淇℃伅锛�");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Taxes update = new Taxes();
+ update.setId(taxes.getId());
+ update.setImgurl(taxes.getImgurl());
+ update.setEditDate(new Date());
+ update.setStatus(Constants.ONE);
+ update.setEditor(user.getId());
+ update.setDoneCode(taxes.getDoneCode());
+ update.setDoneUserId(user.getId());
+ update.setDoneDate(update.getEditDate());
+ update.setImgurl(taxes.getImgurl());
+ taxesMapper.updateById(update);
}
@Override
@@ -69,7 +203,33 @@
@Override
public Taxes findById(Integer id) {
- return taxesMapper.selectById(id);
+ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Taxes.class);
+ queryWrapper.selectAs(Solutions::getName,Taxes::getSolutionName);
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,Taxes::getSolutionId);
+ Taxes model =taxesJoinMapper.selectById(id);
+ if(model==null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //鏌ヨ鏄庣粏鍒楄〃
+ List<TaxDetial> detialList = getJoinDetailListById(id);
+ List<TaxDetial> applyList = new ArrayList<>();//鎶曚繚鍜屽姞鍑忎繚
+ List<TaxDetial> delList = new ArrayList<>();//鍐茬孩鍗�
+ if(detialList!=null){
+ for(TaxDetial d :delList){
+ d.setSolutionName(model.getSolutionName());
+ d.setFee(Constants.formatBigdecimal(d.getFee()));
+ d.setTotalFee(Constants.formatBigdecimal(d.getTotalFee()));
+ if(Constants.equalsInteger(d.getType(),Constants.ZERO) || Constants.equalsInteger(d.getType(),Constants.ONE)){
+ applyList.add(d);
+ }else if(Constants.equalsInteger(d.getType(),Constants.TWO)){
+ delList.add(d);
+ }
+ }
+ }
+ model.setApplyList(applyList);
+ model.setDelTaxList(delList);
+ return model;
}
@Override
@@ -86,86 +246,44 @@
@Override
public PageData<Taxes> findPage(PageWrap<Taxes> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPage<Taxes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Taxes> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Taxes.class);
+ queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Taxes::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ 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.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());
+ queryWrapper.eq(pageWrap.getModel().getStatus() != null,Taxes::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(pageWrap.getModel().getCompanyId() != null,Taxes::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(pageWrap.getModel().getType() != null,Taxes::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(pageWrap.getModel().getTaxCode() != null,Taxes::getTaxCode, pageWrap.getModel().getTaxCode());
+ queryWrapper.eq(pageWrap.getModel().getTaxAccount() != null,Taxes::getTaxAccount, pageWrap.getModel().getTaxAccount());
+ queryWrapper.eq(pageWrap.getModel().getTaxAddr() != null,Taxes::getTaxAddr, pageWrap.getModel().getTaxAddr());
+ queryWrapper.eq(pageWrap.getModel().getAddr() !=null,Taxes::getAddr, pageWrap.getModel().getAddr());
+ queryWrapper.like(pageWrap.getModel().getCompanyName() != null,Taxes::getCompanyName, pageWrap.getModel().getCompanyName());
+ queryWrapper.eq(pageWrap.getModel().getApplyType() != null,Taxes::getApplyType, pageWrap.getModel().getApplyType());
+ queryWrapper.orderByDesc(Taxes::getCreateDate);
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Taxes::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Taxes::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Taxes::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Taxes::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Taxes::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Taxes::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getTaxBank() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Taxes::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Taxes::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Taxes::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(Taxes::getCompanyId, pageWrap.getModel().getCompanyId());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(Taxes::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Taxes::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getTaxCode() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxCode, pageWrap.getModel().getTaxCode());
- }
- if (pageWrap.getModel().getTaxAccount() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxAccount, pageWrap.getModel().getTaxAccount());
- }
- if (pageWrap.getModel().getTaxAddr() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxAddr, pageWrap.getModel().getTaxAddr());
- }
- if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(Taxes::getAddr, pageWrap.getModel().getAddr());
- }
- if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.lambda().eq(Taxes::getCompanyName, pageWrap.getModel().getCompanyName());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Taxes::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getApplyType() != null) {
- queryWrapper.lambda().eq(Taxes::getApplyType, pageWrap.getModel().getApplyType());
- }
- if (pageWrap.getModel().getCancelDate() != null) {
- queryWrapper.lambda().ge(Taxes::getCancelDate, Utils.Date.getStart(pageWrap.getModel().getCancelDate()));
- queryWrapper.lambda().le(Taxes::getCancelDate, Utils.Date.getEnd(pageWrap.getModel().getCancelDate()));
- }
- if (pageWrap.getModel().getCancelInfo() != null) {
- queryWrapper.lambda().eq(Taxes::getCancelInfo, pageWrap.getModel().getCancelInfo());
- }
- if (pageWrap.getModel().getCancelUserId() != null) {
- queryWrapper.lambda().eq(Taxes::getCancelUserId, pageWrap.getModel().getCancelUserId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ PageData<Taxes> result =PageData.from(taxesJoinMapper.selectJoinPage(page,Taxes.class, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.TAXES_FILE).getCode();
+ for(Taxes t : result.getRecords()){
+ if(StringUtils.isNotBlank(t.getImgurl())){
+ t.setImgurlFull(path + t.getImgurl());
+ }
}
}
- return PageData.from(taxesMapper.selectPage(page, queryWrapper));
+ return result;
}
@Override
--
Gitblit v1.9.3