BJ_FS / urbanops

Commit 023ddf7e8d244f22f936db23eb9808609618cd6c

Authored by wangqian
2 parents 2ae777c6 dea31e5f

Merge branch 'dev'

Inline Side-by-side
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
  View file @023ddf7
... ... @@ -127,7 +127,7 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService {
127 127 @Override
128 128 public MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId, Long companyId) {
129 129 if (materialId == null) {
130   - throw exception0(BAD_REQUEST.getCode(),"更新库存失败：typeDetailId为空！");
  130 + throw exception0(BAD_REQUEST.getCode(),"更新库存失败：materialId为空！");
131 131 }
132 132 LambdaQueryWrapper<MaterialInventoryDO> queryWrapper = Wrappers.lambdaQuery();
133 133 queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialId);
... ...
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
  View file @023ddf7
... ... @@ -536,7 +536,7 @@
536 536 ) AS rn
537 537 FROM act_hi_taskinst t
538 538 LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0
539   - WHERE t.END_TIME_ IS NOT NULL
  539 + WHERE t.state_ ='completed'
540 540 <if test="beginTime != null and beginTime != ''">
541 541 and t.END_TIME_ >= #{beginTime}
542 542 </if>
... ... @@ -544,6 +544,7 @@
544 544 and t.END_TIME_ &lt;= #{endTime}
545 545 </if>
546 546 ) t
  547 + WHERE t.rn = 1
547 548 group by t.userId
548 549 </select>
549 550 </mapper>
... ...