Commit 7d3d1256 by huluobin

# update

parent fe89a9f5
...@@ -94,7 +94,6 @@ public class CostController { ...@@ -94,7 +94,6 @@ public class CostController {
searchKeysVo.getParams().getKeys().setIsLend(2); searchKeysVo.getParams().getKeys().setIsLend(2);
} }
return costListSearchService.searchByKeys(searchKeysVo); return costListSearchService.searchByKeys(searchKeysVo);
} }
@ApiOperation("获取借支单列表") @ApiOperation("获取借支单列表")
...@@ -143,7 +142,6 @@ public class CostController { ...@@ -143,7 +142,6 @@ public class CostController {
return resp; return resp;
} }
@ApiOperation("修改费用单信息") @ApiOperation("修改费用单信息")
@PostMapping({"reset/resetFile", "reset/resetNoFile"}) @PostMapping({"reset/resetFile", "reset/resetNoFile"})
public UpdateCostResp resetFile(@RequestBody CostDomain costDomain) { public UpdateCostResp resetFile(@RequestBody CostDomain costDomain) {
...@@ -154,7 +152,6 @@ public class CostController { ...@@ -154,7 +152,6 @@ public class CostController {
return resp; return resp;
} }
@ApiOperation("提交费用单") @ApiOperation("提交费用单")
@PostMapping("submitAudit") @PostMapping("submitAudit")
public UpdateCostResp submitAudit(@RequestParam String costNo) { public UpdateCostResp submitAudit(@RequestParam String costNo) {
......
...@@ -18,6 +18,7 @@ import com.blt.other.module.cost.service.impl.costcheck.*; ...@@ -18,6 +18,7 @@ import com.blt.other.module.cost.service.impl.costcheck.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
/** /**
* <p> * <p>
...@@ -97,4 +98,18 @@ public class AppCostServiceImpl implements AppCostService { ...@@ -97,4 +98,18 @@ public class AppCostServiceImpl implements AppCostService {
throw new BizRuntimeException("invalid cost status"); throw new BizRuntimeException("invalid cost status");
} }
} }
public static BigDecimal rece(BigDecimal amount, int months) {
if (months > 1) {
return rece(amount.add(new BigDecimal("10000")).multiply(new BigDecimal("1.1")), months - 1);
} else {
return amount.add(new BigDecimal("10000")).multiply(new BigDecimal("1.1"));
}
}
public static void main(String[] args) {
System.out.println(rece(new BigDecimal("50000"), 12));
}
} }
package com.blt.other.module.cost.service.impl; package com.blt.other.module.cost.service.impl;
import com.blt.other.module.auth.dao.UserDao; import com.bailuntec.cost.api.dto.CostDto;
import com.blt.other.common.util.PathUtil; import com.blt.other.common.util.PathUtil;
import com.blt.other.database.model.CostExpDomain;
import com.blt.other.database.model.UserDomain;
import com.blt.other.module.auth.dao.UserDao;
import com.blt.other.module.cost.dao.CostDao; import com.blt.other.module.cost.dao.CostDao;
import com.blt.other.module.cost.dao.CostDetailDao; import com.blt.other.module.cost.dao.CostDetailDao;
import com.blt.other.module.cost.dao.CostExpDao; import com.blt.other.module.cost.dao.CostExpDao;
import com.bailuntec.cost.api.dto.CostDto; import com.blt.other.module.cost.model.CostDetailDomain;
import com.blt.other.module.cost.service.CostDetailService; import com.blt.other.module.cost.service.CostDetailService;
import com.blt.other.module.cost.service.CostExportService; import com.blt.other.module.cost.service.CostExportService;
import com.blt.other.module.cost.service.CostService; import com.blt.other.module.cost.service.CostService;
import com.blt.other.module.cost.vo.CostExportVo; import com.blt.other.module.cost.vo.CostExportVo;
import com.blt.other.module.cost.model.CostDetailDomain;
import com.blt.other.database.model.CostExpDomain;
import com.blt.other.database.model.UserDomain;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -53,7 +53,7 @@ public class CostExportServiceImpl implements CostExportService { ...@@ -53,7 +53,7 @@ public class CostExportServiceImpl implements CostExportService {
} }
// 设置表头 // 设置表头
String[] headers = {"费用单号", "费用类型", "费用单大类", "费用单小类", "费用单状态", "借支/借还", "关联借支单号", "借支单状态", "是否抵个税", "付款主体", "收款单位", "付款理由", "付款金额", "币种", "创建人名称", "下单时间", "用途", "付款时间", "发票状态" String[] headers = {"费用单号", "费用类型", "费用单大类", "费用单小类", "费用单状态", "借支/借还", "关联借支单号", "借支单状态", "是否抵个税", "付款主体", "收款单位", "付款理由", "付款金额", "币种", "创建人名称", "下单时间", "用途", "付款时间", "发票状态"
, "项目", "客户编号"}; , "项目", "客户编号", "会计科目"};
HSSFRow row0 = sheet.createRow(0); HSSFRow row0 = sheet.createRow(0);
for (int i = 0; i < headers.length; i++) { for (int i = 0; i < headers.length; i++) {
HSSFCell cell = row0.createCell(i); HSSFCell cell = row0.createCell(i);
...@@ -116,6 +116,7 @@ public class CostExportServiceImpl implements CostExportService { ...@@ -116,6 +116,7 @@ public class CostExportServiceImpl implements CostExportService {
} }
row.createCell(19).setCellValue(costDto.getProjectType()); row.createCell(19).setCellValue(costDto.getProjectType());
row.createCell(20).setCellValue(costDto.getCustomerNum()); row.createCell(20).setCellValue(costDto.getCustomerNum());
row.createCell(21).setCellValue(costDto.getAccountingSubjectName());
rows++; rows++;
} }
// 保存到本地,并且返回路径 // 保存到本地,并且返回路径
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment