WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

虚拟清单查询

Browse Source
This commit is contained in:
zhn
2022-04-11 10:54:05 +08:00
parent ef582b1b57
commit 1732d31f0c
6 changed files with 92 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+6 -2
View File
@@ -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<DummyInventor
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
// dummyInventoryBaseEO.setName("*发*");
QueryWrapper<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.page(page, queryWrapper);
IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper);
return Result.OK(pageList);
}
@@ -81,6 +83,8 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
@ApiOperation(value="虚拟清单基础表-添加", notes="虚拟清单基础表-添加")
@PostMapping(value = "/add")
public Result<?> 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<DummyInventor
*/
@AutoLog(value = "虚拟清单基础表-编辑")
@ApiOperation(value="虚拟清单基础表-编辑", notes="虚拟清单基础表-编辑")
@GetMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody DummyInventoryBaseEO dummyInventoryBaseEO) {
dummyInventoryBaseEOService.editById(dummyInventoryBaseEO);
return Result.OK("编辑成功!");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
+9 -7
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/InventoryStateEnum.java
+37
View File
@@ -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;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryBaseEOMapper.xml
+2 -1
View File
@@ -11,5 +11,6 @@
<result column="name" property="name" />
<result column="use_explain" property="useExplain" />
<result column="state" property="state" />
<result column="dummy_inventory_info_id" property="dummyInventoryInfoId" />
</resultMap>
</mapper>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
+5
View File
@@ -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<DummyInventoryBas
* @return
*/
List<DummyInventoryBaseEO> queryList();
IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page,QueryWrapper<DummyInventoryBaseEO> queryWrapper);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+33
View File
@@ -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<DummyInventoryBaseEOMapper, DummyInventoryBaseEO> implements IDummyInventoryBaseEOService {
@Autowired
private ISysUserService sysUserService;
/**
* 保存
*
@@ -86,4 +99,24 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
public List<DummyInventoryBaseEO> queryList() {
return list();
}
@Override
public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page,QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
IPage<DummyInventoryBaseEO> pageList = this.page(page,queryWrapper);
if(pageList.getRecords().size() != 0){
List<DummyInventoryBaseEO> records = pageList.getRecords();
List<String> createByList = records.stream().map(DummyInventoryBaseEO::getCreateBy).collect(Collectors.toList());
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.in(SysUser::getUsername,createByList);
List<SysUser> userList = sysUserService.list(lambdaQueryWrapper);
for (DummyInventoryBaseEO record : pageList.getRecords()) {
String createBy = record.getCreateBy();
List<SysUser> sysUserList = userList.stream().filter(e -> createBy.equals(e.getUsername())).collect(Collectors.toList());
if(sysUserList.size() == 1){
record.setCreateBy(sysUserList.get(0).getRealname());
}
}
}
return pageList;
}
}