From 0ef39b8062c67eeab10d368d8942ea82a83bcb3e Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期五, 12 七月 2024 10:56:16 +0800 Subject: [PATCH] 森林防火 供应商管理 --- ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java index aef9f56..f4812c1 100644 --- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java +++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.management.domain.*; import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO; @@ -103,7 +104,7 @@ wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState()); wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus()); if (goodsSkuIdList.size()>0){ - wrapper1.in(SlVolumeProductionRkgl::getSupplierId,goodsSkuIdList); + wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList); } wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0); wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime); @@ -123,6 +124,7 @@ @Override public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) { + Long userid = SecurityUtils.getUserId(); if (volumeProductionRkglDTO.getId()!=null){ SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl(); slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl()); @@ -133,9 +135,9 @@ slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId()); slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource()); slVolumeProductionRkgl.setStartiTime(new Date()); - slVolumeProductionRkgl.setSysId(volumeProductionRkglDTO.getSysId()); + slVolumeProductionRkgl.setSysId(userid); slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark()); - this.updateById(slVolumeProductionRkgl); + this.save(slVolumeProductionRkgl); }else{ SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId()); if (volumeProductionRkglDTO.getSource()!=null){ @@ -253,6 +255,11 @@ managementGoodsMaterialsMapper.insert(managementGoodsMaterials1); } } + SlVolumeProductionRkgl byId = this.getById(id); + byId.setPresentState(4); + byId.setAuditStatus(6); + byId.setEndTime(new Date()); + this.updateById(byId); } } -- Gitblit v1.7.1