Skip to content

J
jyzb_platformV2
Commit cc207154 by 赵剑炜
Options

Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

parents 5962e7aa f3a3744b
正在显示 包含 68 行增加 和 59 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
......@@ -49,7 +49,13 @@ public class TjController {
public ApiRes<PageResult<TjOrgEqsDto>> TjOrgEqs(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqs(req));
}
/**
@PostMapping("/TjOrgEqsSum")
@ApiOperation("/装备统计报表汇总")
public ApiRes<FinalTjOrgEqsDto> TjOrgEqsSum(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqsSum(req));
}
/**
* 根据组织机构统计装备的报表数据（外层数据）
*/
@PostMapping("/GetTjData")
......@@ -57,10 +63,11 @@ public class TjController {
public ApiRes<PageResult<TjOrgEqsDto>> GetTjData(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.GetTjData(req));
}
@PostMapping("/TjOrgEqsSum")
@PostMapping("/TjOrgDataSum")
@ApiOperation("/装备统计报表汇总")
public ApiRes<FinalTjOrgEqsDto> TjOrgEqsSum(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqsSum(req));
public ApiRes<FinalTjOrgEqsDto> TjOrgDataSum(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgDataSum(req));
}
//第二层数据
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
......@@ -60,4 +60,6 @@ public interface TjService {
List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req);
PageResult<TjOrgEqsDto> test1(TjOrgEqsReq req);
FinalTjOrgEqsDto TjOrgDataSum(TjOrgEqsReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -321,44 +321,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
public PageResult<InventoryDto> GetDetailByTerms(InventoryReq req) {
// //根据条件查询仓库下的所有装备
// LambdaQueryWrapper<Inventory> eq = new LambdaQueryWrapper<Inventory>()
// .eq(Inventory::getOrgId, req.getOrgId())
// .eq(ObjectUtil.isNotNull(req.getLocationType()),Inventory::getLocationType, req.getLocationType())
// .eq(ObjectUtil.isNotNull(req.getLocationState()) && !req.getLocationState().trim().isEmpty(), Inventory::getLocationState, req.getLocationState())
// .eq(ObjectUtil.isNotNull(req.getBussinessState()) && !req.getBussinessState().trim().isEmpty(), Inventory::getBussinessState, req.getBussinessState())
// .eq(ObjectUtil.isNotNull(req.getTermState()), Inventory::getTermState, req.getTermState())
// .eq(ObjectUtil.isNotNull(req.getSizeId()) && !req.getSizeId().trim().isEmpty(),Inventory::getSizeId,req.getSizeId())
// .eq(ObjectUtil.isNotNull(req.getTypeId()) && !req.getTypeId().trim().isEmpty(),Inventory::getTypeId,req.getTypeId())
// .eq(ObjectUtil.isNotNull(req.getPrice()),Inventory::getPrice,req.getPrice());
// if (req.getLocationType().equals("0")){
// eq.eq(ObjectUtil.isNotNull(req.getLocationId()) && !req.getLocationId().trim().isEmpty(), Inventory::getLocationId, req.getLocationId());
// }else {
// List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>().eq(CabinetBox::getCabinetId, req.getLocationId()));
// Set<String> cabinetList=list.stream().map(CabinetBox::getId).collect(Collectors.toSet());
// eq.in(Inventory::getLocationId,cabinetList);
// }
// long size = list(eq).size();
// Page<Inventory> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
// List<Inventory> records = page.getRecords();
// List<InventoryDto> collect = records.parallelStream()
// .map(inventory -> {
// InventoryDto inventoryDto = new InventoryDto();
// BeanPlusUtil.copyProperties(inventory, inventoryDto);
// Map<String, String> map = setNames(inventory.getTypeId(), inventory.getSizeId(), inventory.getSupplierId());
// //设置typeName
// inventoryDto.setTypeName(map.get("typeName"));
// //设置sizeName
// inventoryDto.setSizeName(map.get("sizeName"));
// //查询图片并返回
// inventoryDto.setPhoto(map.get("photo"));
// //如果有供应商id的前提下，设置supplierName
// if (ObjectUtil.isNotNull(inventory.getSupplierId())) {
// inventoryDto.setSupplierName(map.get("supplierName"));
// }
//
//
// return inventoryDto;
// }).collect(Collectors.toList());
int size=inventorySummaryMapper.selectSumByItemsCount(req);
List<InventoryDto> returnList=inventorySummaryMapper.GetDetailByTerms(req,(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
Page<InventoryDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -126,6 +126,7 @@ public class TjServiceImpl implements TjService {
public PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req) {
//先拿到符合条件的组织机构，再遍历组织机构组成数据
//（下一层数据组织机构数据）
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgEqsDto> allData=new ArrayList<>();
for (String orgId:orgList) {
......@@ -165,6 +166,40 @@ if (!req.getOrgId().equals("1369509498032808905"))
page.setTotal(allData.size());
return PageResultFactory.createPageResult(page);
}
@Override
public FinalTjOrgEqsDto TjOrgDataSum(TjOrgEqsReq req) {
FinalTjOrgEqsDto finalTjOrgEqsDto = new FinalTjOrgEqsDto();
finalTjOrgEqsDto.setTotalNumber(0);
finalTjOrgEqsDto.setCkStockNumber(0);
finalTjOrgEqsDto.setCkOutboundNumber(0);
finalTjOrgEqsDto.setDjgOutboundNumber(0);
finalTjOrgEqsDto.setDjgStockNumber(0);
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgEqsDto> allData=new ArrayList<>();
for (String orgId:orgList) {
TjOrgEqsDto OrgData=inventorySummaryMapper.GetInvSum( orgId,
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
allData.add(OrgData);
}
if (!req.getOrgId().equals("1369509498032808905"))
{
TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
allData.add(OrgData);//把本级数据加进去
}
for (TjOrgEqsDto tj:allData) {
finalTjOrgEqsDto.setTotalNumber(finalTjOrgEqsDto.getTotalNumber()+ tj.getTotalNumber());
finalTjOrgEqsDto.setCkStockNumber(finalTjOrgEqsDto.getCkStockNumber()+ tj.getCkStockNumber());
finalTjOrgEqsDto.setCkOutboundNumber(finalTjOrgEqsDto.getCkOutboundNumber()+ tj.getCkOutboundNumber());
finalTjOrgEqsDto.setDjgOutboundNumber(finalTjOrgEqsDto.getDjgOutboundNumber()+ tj.getDjgOutboundNumber());
finalTjOrgEqsDto.setDjgStockNumber(finalTjOrgEqsDto.getDjgStockNumber()+ tj.getDjgStockNumber());
}
return finalTjOrgEqsDto;
}
// @Override
public List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req) {
......@@ -173,7 +208,7 @@ if (!req.getOrgId().equals("1369509498032808905"))
List<TjOrgEqsDto> allData=new ArrayList<>();
List<TjOrgEqsDto> OrgData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum());
allData.addAll(OrgData);//把本级数据加进去
if (req.getRemoveEmpty())
if (req.getRemoveEmpty())//如果需要删除数据为0的话，前端传true，否则保留数据为0
{
allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
}
......@@ -301,6 +336,8 @@ if (!req.getOrgId().equals("1369509498032808905"))
return null;
}
private String setSql(TjOrgEqsReq req){
String sql="and 1=1";
......
jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml
......@@ -50,7 +50,7 @@
<if test="orgId!=null and orgId != ''">
org_id_int=#{orgId}
</if>
<if test="orgId==null and orgId == ''">
<if test="orgId==null or orgId == ''">
1=1
</if>
</delete>
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -737,31 +737,32 @@
) as a
</select>
<select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
select i.id,i.type_id,i.size_id,i.supplier_id,i.shelf_id,i.shelf_location,i.price,
i.epc,i.org_id_int as org_id,i.state,i.bussiness_state,i.location_state,
i.production_date,i.warranty_period,i.maintenance_period,i.location_id,
i.location_type,i.term_state,i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
SELECT wi.*, i.supplier_id, i.price, i.state, i.bussiness_state,
i.production_date, i.warranty_period, i.maintenance_period, i.term_state,
i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
es.photo as photo,es.instructions as instructions
FROM base_inventory i
JOIN base_equipment_type et on et.id=i.type_id
join base_equipment_size es on es.id=i.size_id
join pub_org po on i.org_id_int=po.org_id
left join base_supplier bs on bs.id=i.supplier_id
LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id and i.location_type=1
FROM base_warehouse_inventory wi
LEFT JOIN base_inventory i ON i.epc = wi.epc
JOIN base_equipment_type et ON et.id = i.type_id
JOIN base_equipment_size es ON es.id = i.size_id
JOIN pub_org po ON i.org_id_int = po.org_id
LEFT JOIN base_supplier bs ON bs.id = i.supplier_id
LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id AND i.location_type = 1
LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id
LEFT JOIN base_warehouse bw ON i.location_id = bw.id AND i.location_type = 0
WHERE i.org_id_int=#{req.orgId} and i.type_id=#{req.typeId}
WHERE wi.org_id_int=#{req.orgId} and wi.type_id=#{req.typeId}
<if test="req.locationType !='all' and req.locationType != null">
and i.location_type=#{req.locationType}
and wi.location_type=#{req.locationType}
</if>
<if test="req.sizeId !=null and req.sizeId != ''">
and i.size_id=#{req.sizeId}
and wi.size_id=#{req.sizeId}
</if>
<if test="req.price !=null and req.price != ''">
and i.price=#{req.price}
and wi.price=#{req.price}
</if>
ORDER BY i.type_id,i.size_id
ORDER BY wi.type_id,i.size_id
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论