Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

删除母线信息

Browse Source
This commit is contained in:
huangzj
2023-03-23 15:05:15 +08:00
parent 49744fdf85
commit d9f4958b52
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java
View File

@@ -38,8 +38,8 @@ public class SurveyPlanExcel implements Serializable {
@Excel(name = "变电站数量", width = 15) @Excel(name = "变电站数量", width = 15)
private Long subCount; private Long subCount;
@Excel(name = "母线数量", width = 15) // @Excel(name = "母线数量", width = 15)
private Long busCount; // private Long busCount;
@Excel(name = "计划状态", width = 15) @Excel(name = "计划状态", width = 15)
private String status; private String status;

32
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java
View File

@@ -325,22 +325,46 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel ( ); SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel ( );
BeanUtils.copyProperties (temp, surveyPlanExcel); BeanUtils.copyProperties (temp, surveyPlanExcel);
long Busbarcount = rGeneralSurveyPlanDetails.stream ( ). // long Busbarcount = rGeneralSurveyPlanDetails.stream ( ).
filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). // filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( ); // map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( );
long Subcount = rGeneralSurveyPlanDetails.stream ( ). long Subcount = rGeneralSurveyPlanDetails.stream ( ).
filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( ); map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( );
surveyPlanExcel.setBusCount (Busbarcount); // surveyPlanExcel.setBusCount (Busbarcount);
surveyPlanExcel.setSubCount (Subcount); surveyPlanExcel.setSubCount (Subcount);
surveyPlanExcel.setOrgNo (pvTerminalTreeVOMap.get (surveyPlanExcel.getOrgNo ( ))); surveyPlanExcel.setOrgNo (pvTerminalTreeVOMap.get (surveyPlanExcel.getOrgNo ( )));
surveyPlanExcel.setStatus (getPlanStatus(temp.getStatus ()));
surveyPlanExcels.add (surveyPlanExcel); surveyPlanExcels.add (surveyPlanExcel);
}); });
return surveyPlanExcels; return surveyPlanExcels;
} }
private String getPlanStatus(int status) {
String result = "";
switch (status) {
case 0:
result = "新建";
break;
case 1:
result = "待审核";
break;
case 2:
result = "审核未通过";
break;
case 3:
result = "已发布";
break;
case 4:
result = "已完成";
break;
default:
result = "";
}
return result;
}
/** /**
* @param questionQueryParm * @param questionQueryParm
* @Description: querySurveyPlanOnQuestion * @Description: querySurveyPlanOnQuestion