diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java index f111e66..fcc6521 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java @@ -127,7 +127,7 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { @Override public MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId, Long companyId) { if (materialId == null) { - throw exception0(BAD_REQUEST.getCode(),"更新库存失败:typeDetailId为空!"); + throw exception0(BAD_REQUEST.getCode(),"更新库存失败:materialId为空!"); } LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialId); diff --git a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml index 61b1929..5415c45 100644 --- a/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml @@ -536,7 +536,7 @@ ) AS rn FROM act_hi_taskinst t LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0 - WHERE t.END_TIME_ IS NOT NULL + WHERE t.state_ ='completed' and t.END_TIME_ >= #{beginTime} @@ -544,6 +544,7 @@ and t.END_TIME_ <= #{endTime} ) t + WHERE t.rn = 1 group by t.userId