diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java index b71a25e2a..26cc38d12 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; +import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -52,9 +53,10 @@ public class DummyInventoryBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = dummyInventoryBaseEOService.page(page, queryWrapper); + IPage pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper); return Result.OK(pageList); } @@ -81,6 +83,8 @@ public class DummyInventoryBaseEOController extends JeroController add(@Validated @RequestBody DummyInventoryBaseEO dummyInventoryBaseEO) { + //InventoryStateEnum + dummyInventoryBaseEO.setState(InventoryStateEnum.DRAFT.getValue()); dummyInventoryBaseEOService.add(dummyInventoryBaseEO); return Result.OK("添加成功!"); } @@ -93,7 +97,7 @@ public class DummyInventoryBaseEOController extends JeroController edit(@Validated @RequestBody DummyInventoryBaseEO dummyInventoryBaseEO) { dummyInventoryBaseEOService.editById(dummyInventoryBaseEO); return Result.OK("编辑成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java index ff943fb9b..407b7277b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java @@ -1,21 +1,19 @@ package com.jero.modules.dummy.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -77,4 +75,8 @@ public class DummyInventoryBaseEO implements Serializable { @Dict(dicCode ="dummy_inventory_state") private java.lang.String state; + /**虚拟清单详情id*/ + @ApiModelProperty(value = "虚拟清单详情id") + private java.lang.String dummyInventoryInfoId; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java new file mode 100644 index 000000000..9e144a470 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java @@ -0,0 +1,37 @@ +package com.jero.modules.dummy.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum InventoryStateEnum { + ISSUE("已发布","1"), + DRAFT("草稿","2"); + + + + String name; + String value; + + private InventoryStateEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryBaseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryBaseEOMapper.xml index 736544d21..4e4c76458 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryBaseEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryBaseEOMapper.xml @@ -11,5 +11,6 @@ + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java index f48b327cc..a277b7b60 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java @@ -1,5 +1,8 @@ package com.jero.modules.dummy.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +61,6 @@ public interface IDummyInventoryBaseEOService extends IService queryList(); + + IPage getPageInfo(Page page,QueryWrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 3adb8f0c5..6c7c7aac8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -1,11 +1,20 @@ package com.jero.modules.dummy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.mapper.DummyInventoryBaseEOMapper; import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** @@ -17,6 +26,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class DummyInventoryBaseEOServiceImpl extends ServiceImpl implements IDummyInventoryBaseEOService { + @Autowired + private ISysUserService sysUserService; + + /** * 保存 * @@ -86,4 +99,24 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage getPageInfo(Page page,QueryWrapper queryWrapper) { + IPage pageList = this.page(page,queryWrapper); + if(pageList.getRecords().size() != 0){ + List records = pageList.getRecords(); + List createByList = records.stream().map(DummyInventoryBaseEO::getCreateBy).collect(Collectors.toList()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.in(SysUser::getUsername,createByList); + List userList = sysUserService.list(lambdaQueryWrapper); + for (DummyInventoryBaseEO record : pageList.getRecords()) { + String createBy = record.getCreateBy(); + List sysUserList = userList.stream().filter(e -> createBy.equals(e.getUsername())).collect(Collectors.toList()); + if(sysUserList.size() == 1){ + record.setCreateBy(sysUserList.get(0).getRealname()); + } + } + } + return pageList; + } }