From e4479a11ad9cd7052ed5555ac8c2d27e4dd27a09 Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 11 Feb 2025 23:08:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BF=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=92=8C=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/manage/domain/GreenCarbonItem.java | 8 +++---- .../controller/GreenCarbonItemController.java | 23 +++++++++++++++---- .../views/manage/greenCarbonItem/index.vue | 11 ++++++--- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java index aa6d5b90..5a296af4 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java @@ -21,17 +21,17 @@ public class GreenCarbonItem extends BaseEntity @Excel(name = "ID(有ID进行更新,无ID进行增加)") private Long id; - @Excel(name = "公司") + private String compName; /** 公司主键 */ - @Excel(name = "公司ID") + private Long comId; - @Excel(name = "分包单位") + private String projectName; /** $column.columnComment */ /** 分包单位 */ - @Excel(name = "分包单位ID") + private Long projectId; /** 碳因子类型 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java index 04ac91be..701c00e1 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java @@ -4,6 +4,7 @@ import java.io.*; import java.nio.file.Files; import java.util.List; +import cn.hutool.core.util.NumberUtil; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; @@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** @@ -80,12 +82,20 @@ public class GreenCarbonItemController extends BaseController @RequiresPermissions("manage:greenCarbonItem:import") @Log(title = "碳因子管理", businessType = BusinessType.IMPORT) @PostMapping("/import") - public AjaxResult importData(HttpServletResponse response,MultipartFile file) throws Exception { + public AjaxResult importData(HttpServletResponse response, MultipartFile file, HttpServletRequest request) throws Exception { ExcelUtil util = new ExcelUtil(GreenCarbonItem.class); List list= util.importExcel(file.getInputStream()); GreenCarbonItem where=new GreenCarbonItem(); List findList; + long prjId= NumberUtil.parseLong(request.getParameter("prjId"),0l); + long comId= NumberUtil.parseLong(request.getParameter("comId"),0l); for (GreenCarbonItem item : list){ + if(prjId==0||comId==0){ + item.setRemark("无效的项目ID或租户ID"); + continue; + } + item.setProjectId(prjId); + item.setComId(comId); if(item.getId()==null|| item.getId().equals(0l)){ where.setComId(item.getComId()); where.setProjectId(item.getProjectId()); @@ -93,7 +103,12 @@ public class GreenCarbonItemController extends BaseController where.setCarbonFactorType(item.getCarbonFactorType()); findList=greenCarbonItemService.selectGreenCarbonItemList(where); if(findList.size()>0){ - item.setRemark("当前项目已存在相同数据!"); + findList.stream().forEach(item1->{ + item1.setUnit(item.getUnit()); + item1.setCarbonFactor(item.getCarbonFactor()); + greenCarbonItemService.updateGreenCarbonItem(item1); + }); + item.setRemark("修改成功!当前项目已存在相同数据!"); } else{ greenCarbonItemService.insertGreenCarbonItem(item); item.setRemark("增加成功!"); @@ -103,8 +118,8 @@ public class GreenCarbonItemController extends BaseController if(old==null){ item.setRemark("无效ID"); }else{ - where.setComId(item.getComId()); - where.setProjectId(item.getProjectId()); + where.setComId(old.getComId()); + where.setProjectId(old.getProjectId()); where.setCarbonName(item.getCarbonName()); where.setCarbonFactorType(item.getCarbonFactorType()); findList = greenCarbonItemService.selectGreenCarbonItemList(where); diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue index 3b805a3b..9d4a60be 100644 --- a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue @@ -36,14 +36,14 @@ 删除 - + 导入 - + 导出 @@ -132,7 +132,7 @@ @@ -364,10 +364,15 @@ const handleFileSuccess = (response, file, fileList) => { } }; +function doImportOk(){ + data.openImport=false + getList(); +} getProjectList(()=>{ getList(); + upload.url=import.meta.env.VITE_APP_BASE_API + "/manage/greenCarbonItem/import?prjId="+userStore.currentPrjId+"&comId="+userStore.currentComId; });