Merge branch 'dev'

wangqian
2 parents 2ae777c6 dea31e5f
Showing 2 changed files with 3 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -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<MaterialInventoryDO> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialId);
@@ -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'
             <if test="beginTime != null and beginTime != ''">
                 and t.END_TIME_ >= #{beginTime}
             </if>
@@ -544,6 +544,7 @@
                 and t.END_TIME_ &lt;= #{endTime}
             </if>
          ) t
+        WHERE t.rn = 1
         group by t.userId
     </select>
 </mapper>