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

冀北电能质量问题流程修改

Browse Source
This commit is contained in:
hzj
2024-11-04 09:46:54 +08:00
parent b49ba0e06f
commit c343e5765c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml
View File

@@ -24,7 +24,8 @@
supervision_warning_leaflet.create_time, supervision_warning_leaflet.create_time,
supervision_warning_leaflet.update_by, supervision_warning_leaflet.update_by,
supervision_warning_leaflet.update_time, supervision_warning_leaflet.update_time,
supervision_warning_leaflet.file_path supervision_warning_leaflet.file_path,
supervision_warning_leaflet.deal_state
FROM supervision_warning_leaflet supervision_warning_leaflet FROM supervision_warning_leaflet supervision_warning_leaflet
WHERE ${ew.sqlSegment} WHERE ${ew.sqlSegment}
</select> </select>
@@ -50,7 +51,8 @@
supervision_warning_leaflet.create_time, supervision_warning_leaflet.create_time,
supervision_warning_leaflet.update_by, supervision_warning_leaflet.update_by,
supervision_warning_leaflet.update_time, supervision_warning_leaflet.update_time,
supervision_warning_leaflet.file_path supervision_warning_leaflet.file_path,
supervision_warning_leaflet.deal_state
FROM supervision_warning_leaflet supervision_warning_leaflet FROM supervision_warning_leaflet supervision_warning_leaflet
WHERE ${ew.sqlSegment} WHERE ${ew.sqlSegment}
</select> </select>
@@ -76,7 +78,8 @@
supervision_warning_leaflet.create_time, supervision_warning_leaflet.create_time,
supervision_warning_leaflet.update_by, supervision_warning_leaflet.update_by,
supervision_warning_leaflet.update_time, supervision_warning_leaflet.update_time,
supervision_warning_leaflet.file_path supervision_warning_leaflet.file_path,
supervision_warning_leaflet.deal_state
FROM supervision_warning_leaflet supervision_warning_leaflet FROM supervision_warning_leaflet supervision_warning_leaflet
WHERE ${ew.sqlSegment} WHERE ${ew.sqlSegment}
</select> </select>

7
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -29,6 +29,7 @@ import com.njcn.supervision.enums.*;
import com.njcn.supervision.mapper.survey.SurveyTestMapper; import com.njcn.supervision.mapper.survey.SurveyTestMapper;
import com.njcn.supervision.pojo.param.leaflet.WarningAddParam; import com.njcn.supervision.pojo.param.leaflet.WarningAddParam;
import com.njcn.supervision.pojo.param.survey.SurveyTestParam; import com.njcn.supervision.pojo.param.survey.SurveyTestParam;
import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
import com.njcn.supervision.pojo.po.survey.SurveyPlan; import com.njcn.supervision.pojo.po.survey.SurveyPlan;
import com.njcn.supervision.pojo.po.survey.SurveyTest; import com.njcn.supervision.pojo.po.survey.SurveyTest;
import com.njcn.supervision.pojo.vo.survey.SurveyTestVO; import com.njcn.supervision.pojo.vo.survey.SurveyTestVO;
@@ -361,6 +362,12 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
surveyTestVO.setPlanName(surveyPlan.getPlanName()); surveyTestVO.setPlanName(surveyPlan.getPlanName());
surveyTestVO.setSupvType(surveyPlan.getSupvType()); surveyTestVO.setSupvType(surveyPlan.getSupvType());
surveyTestVO.setSupvObjectName(surveyPlan.getSupvObjectName()); surveyTestVO.setSupvObjectName(surveyPlan.getSupvObjectName());
WarningLeaflet one = warningLeafletService.lambdaQuery().eq(WarningLeaflet::getProblemId, id).one();
if(Objects.nonNull(one)){
surveyTestVO.setReformAdvice(one.getReformAdvice());
surveyTestVO.setTakeStep(one.getTakeStep());
surveyTestVO.setReportPath(one.getReportPath());
}
//负责单位 //负责单位
surveyTestVO.setDeptName(deptFeignClient.getDeptById(surveyTestVO.getDeptId()).getData().getName()); surveyTestVO.setDeptName(deptFeignClient.getDeptById(surveyTestVO.getDeptId()).getData().getName());
//变电站名称 //变电站名称