|
@@ -1,16 +1,8 @@
|
|
|
package com.ruoyi.project.business.service.impl;
|
|
|
|
|
|
-import java.io.File;
|
|
|
-import java.io.IOException;
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.text.DecimalFormat;
|
|
|
-import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.ExcelWriter;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
@@ -20,7 +12,10 @@ import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.*;
|
|
|
import com.ruoyi.common.utils.office.doc.CommonDocUtils;
|
|
|
import com.ruoyi.framework.redis.RedisCache;
|
|
|
-import com.ruoyi.project.business.domain.*;
|
|
|
+import com.ruoyi.project.business.domain.TbCountry;
|
|
|
+import com.ruoyi.project.business.domain.TbFile;
|
|
|
+import com.ruoyi.project.business.domain.TqContract;
|
|
|
+import com.ruoyi.project.business.domain.TqContractLift;
|
|
|
import com.ruoyi.project.business.domain.bo.TqContractBo;
|
|
|
import com.ruoyi.project.business.domain.bo.contract.TqContractLiftBo;
|
|
|
import com.ruoyi.project.business.domain.flow.Flow;
|
|
@@ -40,9 +35,7 @@ import com.ruoyi.project.business.mapper.TbFileMapper;
|
|
|
import com.ruoyi.project.business.mapper.contract.TqContractLiftHistoryMapper;
|
|
|
import com.ruoyi.project.business.mapper.contract.TqContractLiftMapper;
|
|
|
import com.ruoyi.project.business.mapper.contract.TqContractMapper;
|
|
|
-import com.ruoyi.project.business.service.ITbContractCurrencyService;
|
|
|
-import com.ruoyi.project.business.service.ITbFileService;
|
|
|
-import com.ruoyi.project.business.service.ITqContractHistoryService;
|
|
|
+import com.ruoyi.project.business.service.*;
|
|
|
import com.ruoyi.project.business.service.flow.IFlowService;
|
|
|
import com.ruoyi.project.system.domain.SysDictData;
|
|
|
import com.ruoyi.project.system.mapper.SysDictDataMapper;
|
|
@@ -50,15 +43,22 @@ import fr.opensagres.xdocreport.document.images.FileImageProvider;
|
|
|
import fr.opensagres.xdocreport.template.formatter.NullImageBehaviour;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.ruoyi.project.business.service.ITqContractService;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.io.File;
|
|
|
+import java.io.IOException;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.text.DecimalFormat;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.ruoyi.common.utils.DecimalUtils.add;
|
|
|
-import static com.ruoyi.project.business.enums.AuditFlowEnum.*;
|
|
|
+import static com.ruoyi.project.business.enums.AuditFlowEnum.CONTRACT_FINANCE_NO;
|
|
|
+import static com.ruoyi.project.business.enums.AuditFlowEnum.CONTRACT_FINANCE_YES;
|
|
|
import static java.math.BigDecimal.ZERO;
|
|
|
import static java.util.Objects.nonNull;
|
|
|
import static org.apache.commons.lang3.StringUtils.EMPTY;
|
|
@@ -87,6 +87,8 @@ public class TqContractServiceImpl implements ITqContractService
|
|
|
private ITbFileService tbFileService;
|
|
|
|
|
|
@Resource
|
|
|
+ private ITqContractLiftService tqContractLiftService;
|
|
|
+ @Resource
|
|
|
private ITqContractHistoryService tqContractHistoryService;
|
|
|
|
|
|
@Resource
|
|
@@ -182,7 +184,9 @@ public class TqContractServiceImpl implements ITqContractService
|
|
|
}
|
|
|
@Override
|
|
|
public List<TqContractVo> selectTqContractBoListApp(TqContractBo tqContract){
|
|
|
- return tqContractMapper.selectTqContractBoListApp(tqContract);
|
|
|
+ tqContract.setUserId(SecurityUtils.getUserId());
|
|
|
+ List<TqContractVo> tqContractVoList = tqContractMapper.selectTqContractBoListApp(tqContract);
|
|
|
+ return tqContractVoList;
|
|
|
}
|
|
|
/**
|
|
|
* 新增合同列表
|
|
@@ -230,6 +234,23 @@ public class TqContractServiceImpl implements ITqContractService
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public String selectApproveStatus(TqContractDto tqContractDto){
|
|
|
+ TqContractLiftBo tqContractLiftBo = new TqContractLiftBo();
|
|
|
+ tqContractLiftBo.setVersion(tqContractDto.getVersion());
|
|
|
+ tqContractLiftBo.setContractNo(tqContractDto.getContractNo());
|
|
|
+ List<TqContractLiftVo> tqContractLiftVoList = tqContractLiftService.selectTqContractLiftList(tqContractLiftBo);
|
|
|
+ if(CollectionUtils.isNotEmpty(tqContractLiftVoList)){
|
|
|
+ if("toVoid".equals(tqContractLiftVoList.get(0).getType())){
|
|
|
+ //作废
|
|
|
+ return "4";
|
|
|
+ }else{
|
|
|
+ //通过
|
|
|
+ return "2";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return "2";
|
|
|
+ }
|
|
|
/**
|
|
|
* 修改合同列表
|
|
|
*
|