Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App消息推送调整

Browse Source
This commit is contained in:
xy
2026-04-07 09:15:25 +08:00
parent c0cccc3479
commit e7ba886b94
9 changed files with 222 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -99,9 +99,14 @@
<if test="queryParam.process != null and queryParam.process !=''">
and process = #{queryParam.process}
</if>
<if test="queryParam.runStatus != null and queryParam.runStatus !=''">
and run_status = #{queryParam.runStatus}
</if>
<choose>
<when test="queryParam.runStatus != null and queryParam.runStatus != ''">
AND run_status = #{queryParam.runStatus}
</when>
<otherwise>
AND run_status IN (1,2)
</otherwise>
</choose>
<if test="queryParam.searchValue != null and queryParam.searchValue !=''">
and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
</if>

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
View File

@@ -572,8 +572,10 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
.eq(CsDeviceUserPO::getSubUserId, param.getUserId())
);
}
queryWrapper.in(CsDeviceUserPO::getDeviceId, param.getList())
.eq(CsDeviceUserPO::getStatus, "1");
if (CollectionUtil.isNotEmpty(param.getList())) {
queryWrapper.in(CsDeviceUserPO::getDeviceId, param.getList());
}
queryWrapper.eq(CsDeviceUserPO::getStatus, "1");
return this.list(queryWrapper);
}
}

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java
View File

@@ -659,9 +659,6 @@ class IcdServiceImpl implements IcdService {
if (Objects.isNull(item.getLineNo())) {
item.setLineNo(item.getClDid() == 0 ? null:item.getClDid());
}
if (CollectionUtil.isNotEmpty(csEquipmentDeliveryPOS)) {
item.setRunStatus(csEquipmentDeliveryPOS.get(0).getRunStatus());
}
});
}
vo.setLineInfoList(line);