CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MARK FOR PULL

Browse Source
This commit is contained in:
闫阳
2022-12-07 11:07:31 +08:00
parent ab35b10130
commit b515eacbab
38 changed files with 828 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java
View File

@@ -144,4 +144,12 @@ public class MachineController {
return new Result().ok(true);
}
@PostMapping(value = "list")
@ApiOperation(value = "获取机台列表")
@LogOperation("获取机台列表")
@ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
public List<MachineDTO> list(@ApiIgnore @RequestParam Map<String, Object> params) {
return machineService.list(params);
}
}

7
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
View File

@@ -129,4 +129,11 @@ public class ProductController {
return new Result();
}
@PostMapping(value = "list")
@ApiOperation(value = "获取产品列表")
@LogOperation("获取产品列表")
public List<ProductDTO> list() {
return productService.list();
}
}

7
ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java
View File

@@ -114,4 +114,11 @@ public class ShiftController {
ExcelUtils.exportExcelToTarget(response, null, list, ShiftExcel.class);
}
@PostMapping(value = "list")
@ApiOperation(value = "获取班次列表")
@LogOperation("获取班次列表")
public List<ShiftDTO> list() {
return shiftService.list();
}
}

6
ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java
View File

@@ -1,6 +1,7 @@
package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.basic.dto.ShiftDTO;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
@@ -114,4 +115,9 @@ public class TeamController {
ExcelUtils.exportExcelToTarget(response, null, list, TeamExcel.class);
}
@PostMapping(value = "list")
@ApiOperation(value = "获取班组列表")
@LogOperation("获取班组列表")
public List<TeamDTO> list() { return teamService.list(); }
}

2
ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java
View File

@@ -7,6 +7,7 @@ import com.cnbm.basic.entity.Product;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
@@ -18,4 +19,5 @@ import java.util.Map;
@Mapper
public interface ProductMapper extends BaseDao<Product> {
// IPage<ProductDTO> page(Map<String, Object> params);
List<ProductDTO> list();
}

6
ym-baisc/src/main/java/com/cnbm/basic/mapper/ShiftMapper.java
View File

@@ -1,9 +1,12 @@
package com.cnbm.basic.mapper;
import com.cnbm.basic.dto.ShiftDTO;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.basic.entity.Shift;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 班次 表
*
@@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ShiftMapper extends BaseDao<Shift> {
List<ShiftDTO> list();
}

6
ym-baisc/src/main/java/com/cnbm/basic/mapper/TeamMapper.java
View File

@@ -1,9 +1,12 @@
package com.cnbm.basic.mapper;
import com.cnbm.basic.dto.TeamDTO;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.basic.entity.Team;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 班组 表
*
@@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface TeamMapper extends BaseDao<Team> {
List<TeamDTO> list();
}

3
ym-baisc/src/main/java/com/cnbm/basic/service/IProductService.java
View File

@@ -6,6 +6,7 @@ import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.entity.Product;
import com.cnbm.common.vo.IdVo;
import java.util.List;
import java.util.Map;
/**
@@ -27,4 +28,6 @@ public interface IProductService extends CrudService<Product, ProductDTO> {
boolean changeStatus(Long id);
List<ProductDTO> list();
}

3
ym-baisc/src/main/java/com/cnbm/basic/service/IShiftService.java
View File

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.ShiftDTO;
import com.cnbm.basic.entity.Shift;
import java.util.List;
import java.util.Map;
/**
@@ -23,4 +24,6 @@ public interface IShiftService extends CrudService<Shift, ShiftDTO> {
void update(ShiftDTO dto);
void delete(Long[] ids);
List<ShiftDTO> list();
}

3
ym-baisc/src/main/java/com/cnbm/basic/service/ITeamService.java
View File

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.TeamDTO;
import com.cnbm.basic.entity.Team;
import java.util.List;
import java.util.Map;
/**
@@ -23,4 +24,6 @@ public interface ITeamService extends CrudService<Team, TeamDTO> {
void update(TeamDTO dto);
void delete(Long[] ids);
List<TeamDTO> list();
}

7
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
View File

@@ -125,4 +125,11 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<ProductDTO> list() {
List<ProductDTO> list = mapper.list();
return list;
}
}

12
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java
View File

@@ -10,10 +10,12 @@ import com.cnbm.basic.entity.Shift;
import com.cnbm.basic.service.IShiftService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -25,6 +27,9 @@ import java.util.Map;
@Service
public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftDTO> implements IShiftService {
@Autowired
private ShiftMapper mapper;
@Override
public QueryWrapper<Shift> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
@@ -72,4 +77,11 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<ShiftDTO> list() {
List<ShiftDTO> list = mapper.list();
return list;
}
}

14
ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java
View File

@@ -2,8 +2,6 @@ package com.cnbm.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.basic.dto.ProductTypeDTO;
import com.cnbm.basic.entity.ProductType;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.TeamDTO;
@@ -12,11 +10,13 @@ import com.cnbm.basic.entity.Team;
import com.cnbm.basic.service.ITeamService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -28,6 +28,9 @@ import java.util.Map;
@Service
public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO> implements ITeamService {
@Autowired
private TeamMapper mapper;
@Override
public QueryWrapper<Team> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
@@ -74,4 +77,11 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<TeamDTO> list() {
List<TeamDTO> list = mapper.list();
return list;
}
}