From 71defc2e0b91de7d89e0984751a3e3e0715cf04e Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Thu, 7 May 2026 14:03:20 +0800 Subject: [PATCH] =?UTF-8?q?OMS-GW-=E4=BC=81=E4=B8=9A=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpEnterpriseUnitApplicationService.java | 33 +++++++++++++++++++ .../ErpEnterpriseUnitApi.java | 16 +++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java index c688eafc6..5c956715e 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java @@ -1,15 +1,20 @@ package com.mhd.oms.application.service.erpEnterpriseUnit; +import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.oms.domain.erpEnterpriseUnit.entity.ErpEnterpriseUnit; import com.mhd.oms.domain.erpEnterpriseUnit.repository.mapper.ErpEnterpriseUnitMapper; import com.mhd.oms.domain.erpEnterpriseUnit.repository.po.ErpEnterpriseUnitPO; import com.mhd.oms.domain.erpEnterpriseUnit.repository.todo.ErpEnterpriseUnitDO; import com.mhd.oms.interfaces.dto.erpEnterpriseUnit.ErpEnterpriseUnitDTO; +import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -27,4 +32,32 @@ public class ErpEnterpriseUnitApplicationService { tableDataInfo.setCode(200); return tableDataInfo; } + + public int update(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) { + ErpEnterpriseUnit erpEnterpriseUnit = new ErpEnterpriseUnit(); + BeanUtils.copyProperties(erpEnterpriseUnitDTO,erpEnterpriseUnit); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if(loginUser != null){ + erpEnterpriseUnit.setUpdateBy(loginUser.getUserid()); + erpEnterpriseUnit.setUpdateTime(new Date()); + } + return erpEnterpriseUnitMapper.updateById(erpEnterpriseUnit); + } + + public int insert(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) { + ErpEnterpriseUnit erpEnterpriseUnit = new ErpEnterpriseUnit(); + BeanUtils.copyProperties(erpEnterpriseUnitDTO,erpEnterpriseUnit); + erpEnterpriseUnit.setPushStatus(1); + erpEnterpriseUnit.setDelFlag(1); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if(loginUser != null){ + erpEnterpriseUnit.setCreateBy(loginUser.getUserid()); + //erpEnterpriseUnit.setCreateTime(new Date()); + erpEnterpriseUnit.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + erpEnterpriseUnit.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + erpEnterpriseUnit.setCreateTime(new Date()); + return erpEnterpriseUnitMapper.insert(erpEnterpriseUnit); + + } } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java index ccca9f8c5..c5ce46abd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/erpEnterpriseUnit/ErpEnterpriseUnitApi.java @@ -2,6 +2,7 @@ package com.mhd.oms.interfaces.facade.erpEnterpriseUnit; import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.oms.application.service.erpEnterpriseUnit.ErpEnterpriseUnitApplicationService; import com.mhd.oms.domain.erpEnterpriseUnit.repository.todo.ErpEnterpriseUnitDO; @@ -10,9 +11,7 @@ import com.mhd.oms.interfaces.dto.erpEnterpriseUnit.ErpEnterpriseUnitDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -40,4 +39,15 @@ public class ErpEnterpriseUnitApi extends BaseController { } + + @ApiOperation("编辑企业单位") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody ErpEnterpriseUnitDTO erpEnterpriseUnitDTO){ + if(erpEnterpriseUnitDTO.getId() !=null){ + return toAjax(erpEnterpriseUnitApplicationService.update(erpEnterpriseUnitDTO)); + }else{ + return toAjax(erpEnterpriseUnitApplicationService.insert(erpEnterpriseUnitDTO)); + } + } + }