Commit 4fbcd402 by huluobin

update

parent a8737f4b
...@@ -239,7 +239,9 @@ public class CostTypeController { ...@@ -239,7 +239,9 @@ public class CostTypeController {
@ApiOperation("导入 excel 文件") @ApiOperation("导入 excel 文件")
@PostMapping("/import") @PostMapping("/import")
public Map<String, Object> upload(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) { public Map<String, Object> upload(@RequestParam("file") MultipartFile file,
HttpServletResponse response, HttpServletRequest request) {
AxiosUtil.setCors(response, request); AxiosUtil.setCors(response, request);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
......
...@@ -265,5 +265,22 @@ public class CostDomain implements Serializable { ...@@ -265,5 +265,22 @@ public class CostDomain implements Serializable {
return costDto; return costDto;
} }
public void setCostTemplateIdByFrom() {
if (costForm == 1) {
this.costTemplateId = 3;
}
if (costForm == 2) {
this.costTemplateId = 5;
}
if (costForm == 3) {
if (lendStatus == 1) {
this.costTemplateId = 6;
}
if (lendStatus == 2) {
this.costTemplateId = 7;
}
}
}
} }
...@@ -152,6 +152,7 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -152,6 +152,7 @@ public class CostApiServiceImpl implements CostApiService {
costDetailDomain.setDetailNo(costNo + "-1"); costDetailDomain.setDetailNo(costNo + "-1");
costDetailDao.insert(costDetailDomain); costDetailDao.insert(costDetailDomain);
} }
costDomain.setCostTemplateIdByFrom();
return costNo; return costNo;
} }
...@@ -333,6 +334,7 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -333,6 +334,7 @@ public class CostApiServiceImpl implements CostApiService {
costDomain.setCreateUsername(user.getUsername()); costDomain.setCreateUsername(user.getUsername());
costDomain.setCreateTime(new Date()); costDomain.setCreateTime(new Date());
} }
costDomain.setCostTemplateIdByFrom();
//写入费用单 //写入费用单
costDao.insert(costDomain); costDao.insert(costDomain);
......
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