From 9b3b652cfb16b09a6f9c79c5d1d8f7b2b855f22e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 二月 2025 13:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectInfoController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
index 375f5ad..33bd028 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -1,17 +1,25 @@
package com.ycl.controller;
+import com.alibaba.excel.EasyExcel;
import com.ycl.common.base.Result;
import com.ycl.common.exception.base.BaseException;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.common.utils.ProjectCodeGenerator;
+import com.ycl.common.utils.bean.BeanUtils;
import com.ycl.common.utils.excel.OutputExcelUtils;
+import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.excel.ProjectExcelTemplate;
+import com.ycl.domain.excel.ProjectTempImport;
import com.ycl.domain.form.DocumentInfoForm;
+import com.ycl.domain.form.ProjectForm;
import com.ycl.domain.form.ProjectInfoForm;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
+import com.ycl.listener.excel.CurrencyDataListener;
import com.ycl.service.ProjectInfoService;
+import com.ycl.system.mapper.SysDeptMapper;
+import com.ycl.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -22,8 +30,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Consumer;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛� 鍓嶇鎺у埗鍣�
@@ -39,6 +49,28 @@
public class ProjectInfoController {
private final ProjectInfoService projectInfoService;
+ private final SysDeptMapper deptMapper;
+
+ @PostMapping("/import/temp")
+ @ApiOperation(value = "涓存椂瀵煎叆", notes = "涓存椂瀵煎叆")
+// @PreAuthorize("hasAuthority('projectInfo:add')")
+ public Result importTemp(@RequestPart("file") MultipartFile file) throws IOException {
+ Consumer<List<ProjectTempImport>> consumer = (data) -> {
+ for (ProjectTempImport project : data) {
+ ProjectInfo projectInfo = new ProjectInfo();
+ BeanUtils.copyProperties(project, projectInfo);
+ projectInfo.setYearInvestAmount(project.getTzje());
+ // 澶勭悊涓氫富鍗曚綅銆佷富绠￠儴闂╥d
+ Long yzId = deptMapper.selectByName(project.getProjectOwnerUnit());
+ projectInfo.setProjectOwnerUnit(yzId);
+ Long zgId = deptMapper.selectByName(project.getCompetentDepartment());
+ projectInfo.setCompetentDepartment(zgId + "");
+ projectInfoService.save(projectInfo);
+ }
+ };
+ EasyExcel.read(file.getInputStream(), ProjectTempImport.class, new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
+ return Result.ok();
+ }
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
@@ -113,7 +145,10 @@
return Result.ok().data(ProjectCodeGenerator.generateProjectCode());
}
- ;
+ @GetMapping("/searchByKey")
+ public Result searchByKey(@RequestParam(required = false) String wordKey) {
+ return projectInfoService.searchByKey(wordKey);
+ }
@GetMapping("/getManagerFlag/{recordId}")
public Result getManagerFlag(@PathVariable("recordId") Integer recordId) {
@@ -156,11 +191,19 @@
* @return
*/
@PostMapping("/import")
- public Result importProject(@RequestPart("file") MultipartFile file) {
+ public Result importProject(MultipartFile file) {
if (file.getSize() > 100 * 1024 * 1024) {
throw new BaseException("鏂囦欢杩囧ぇ锛屾枃浠朵笉寰楄秴杩�100MB");
}
projectInfoService.importProject(file);
return Result.ok();
}
+
+ @PostMapping("/editProject")
+ public Result editProject(@RequestBody ProjectForm form) {
+ return projectInfoService.editProject(form);
+ }
+
+
+
}
--
Gitblit v1.8.0