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

半月报功能优化

Browse Source
This commit is contained in:
xy
2025-07-10 13:23:29 +08:00
parent 0ce5840d02
commit 660925df31
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,13 +111,17 @@
count(1) count(1)
from from
cs_equipment_delivery cs_equipment_delivery
where <where>
process = #{queryParam.process} 1=1
<if test="queryParam.runStatus != null and queryParam.runStatus !=''"> <if test="queryParam.process != null and queryParam.process !=''">
and run_status = #{queryParam.runStatus} and process = #{queryParam.process}
</if> </if>
<if test="queryParam.searchValue != null and queryParam.searchValue !=''"> <if test="queryParam.runStatus != null and queryParam.runStatus !=''">
and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%')) and run_status = #{queryParam.runStatus}
</if> </if>
<if test="queryParam.searchValue != null and queryParam.searchValue !=''">
and (name like concat('%',#{queryParam.searchValue},'%') or ndid like concat('%',#{queryParam.searchValue},'%'))
</if>
</where>
</select> </select>
</mapper> </mapper>

12
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
View File

@@ -3,10 +3,8 @@ package com.njcn.csharmonic.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.njcn.access.api.CsLineLatestDataFeignClient; import com.njcn.access.api.CsLineLatestDataFeignClient;
import com.njcn.access.pojo.po.CsLineLatestData; import com.njcn.access.pojo.po.CsLineLatestData;
import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.*;
import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.pojo.dto.DevDetailDTO;
import com.njcn.csdevice.api.IntegrityFeignClient;
import com.njcn.csdevice.api.OnlineRateFeignClient;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.po.CsLinePO;
import com.njcn.csdevice.pojo.po.RStatIntegrityD; import com.njcn.csdevice.pojo.po.RStatIntegrityD;
@@ -43,6 +41,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
private final IntegrityFeignClient integrityFeignClient; private final IntegrityFeignClient integrityFeignClient;
private final OnlineRateFeignClient onlineRateFeignClient; private final OnlineRateFeignClient onlineRateFeignClient;
private final CsLineLatestDataFeignClient csLineLatestDataFeignClient; private final CsLineLatestDataFeignClient csLineLatestDataFeignClient;
private final CsLedgerFeignClient csLedgerFeignClient;
@Override @Override
public List<DataVo> getLineIntegrity(StatisticsDataParam param) { public List<DataVo> getLineIntegrity(StatisticsDataParam param) {
@@ -111,11 +110,12 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
equipmentDeliveryList.forEach(dev->{ equipmentDeliveryList.forEach(dev->{
List<CsLinePO> list = devMap.get(dev.getId()); List<CsLinePO> list = devMap.get(dev.getId());
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(dev.getId()).getData();
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
list.forEach(line->{ list.forEach(line->{
HalfMonthReportVO vo = new HalfMonthReportVO(); HalfMonthReportVO vo = new HalfMonthReportVO();
vo.setEngineeringName("工程名称"); vo.setEngineeringName(devDetail.getEngineeringName());
vo.setProjectName("项目名称"); vo.setProjectName(devDetail.getProjectName());
vo.setDevName(dev.getName()); vo.setDevName(dev.getName());
vo.setDevType(dev.getDevModel()); vo.setDevType(dev.getDevModel());
vo.setMac(dev.getMac()); vo.setMac(dev.getMac());