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-20 18:55:44 +08:00
parent c07a27df76
commit c835733147
1 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java
View File

@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -590,45 +589,50 @@ public class IssuesServiceImpl implements IssuesService {
String report_process_status = ""; String report_process_status = "";
String reportProcess = electricityQualityCheckParam.getReportProcess(); String reportProcess = electricityQualityCheckParam.getReportProcess();
String checkResult = electricityQualityCheckParam.getCheckResult(); String checkResult = electricityQualityCheckParam.getCheckResult();
if (DicDataEnum.CAUSE_ANALYSIS.getCode().equals(reportProcess)) { // if (DicDataEnum.CAUSE_ANALYSIS.getCode().equals(reportProcess)) {
// if (Objects.equals("1", checkResult)) {
// report_process_status = DicDataEnum.SUCCESS.getCode();
// report_process = DicDataEnum.PLAN_MEASURES.getCode();
// } else {
// report_process_status = DicDataEnum.FAIL.getCode();
// report_process = DicDataEnum.CAUSE_ANALYSIS.getCode();
// }
// } else if (DicDataEnum.PLAN_MEASURES.getCode().equals(reportProcess)) {
// if (Objects.equals("1", checkResult)) {
// report_process_status = DicDataEnum.SUCCESS.getCode();
// report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
// } else {
// report_process_status = DicDataEnum.FAIL.getCode();
// report_process = DicDataEnum.PLAN_MEASURES.getCode();
// }
//
// } else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(reportProcess)) {
// if (Objects.equals("1", checkResult)) {
// report_process_status = DicDataEnum.AUDITT.getCode();
// report_process = DicDataEnum.INSIGHTS.getCode();
// } else {
// report_process_status = DicDataEnum.FAIL.getCode();
// report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
// }
//
// } else if (DicDataEnum.INSIGHTS.getCode().equals(reportProcess)) {
//
// if (Objects.equals("1", checkResult)) {
// report_process_status = DicDataEnum.AUDITT.getCode();
// report_process = DicDataEnum.ARCHIVED.getCode();
// } else {
// report_process_status = DicDataEnum.FAIL.getCode();
// report_process = DicDataEnum.INSIGHTS.getCode();
// }
// }
if (Objects.equals ("1", checkResult)) { if (Objects.equals ("1", checkResult)) {
report_process_status = DicDataEnum.AUDITT.getCode(); report_process_status = DicDataEnum.SUCCESS.getCode ( );
report_process = DicDataEnum.PLAN_MEASURES.getCode();
} else { } else {
report_process_status = DicDataEnum.FAIL.getCode ( ); report_process_status = DicDataEnum.FAIL.getCode ( );
report_process = DicDataEnum.CAUSE_ANALYSIS.getCode();
}
} else if (DicDataEnum.PLAN_MEASURES.getCode().equals(reportProcess)) {
if (Objects.equals("1", checkResult)) {
report_process_status = DicDataEnum.AUDITT.getCode();
report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
} else {
report_process_status = DicDataEnum.FAIL.getCode();
report_process = DicDataEnum.PLAN_MEASURES.getCode();
}
} else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(reportProcess)) {
if (Objects.equals("1", checkResult)) {
report_process_status = DicDataEnum.AUDITT.getCode();
report_process = DicDataEnum.INSIGHTS.getCode();
} else {
report_process_status = DicDataEnum.FAIL.getCode();
report_process = DicDataEnum.ACTUAL_MEASURES.getCode();
}
} else if (DicDataEnum.INSIGHTS.getCode().equals(reportProcess)) {
if (Objects.equals("1", checkResult)) {
report_process_status = DicDataEnum.AUDITT.getCode();
report_process = DicDataEnum.ARCHIVED.getCode();
} else {
report_process_status = DicDataEnum.FAIL.getCode();
report_process = DicDataEnum.INSIGHTS.getCode();
}
} }
UpdateWrapper<RStatElectricQualityProblemFlow> updateWrapper = new UpdateWrapper(); UpdateWrapper<RStatElectricQualityProblemFlow> updateWrapper = new UpdateWrapper();
updateWrapper.eq("power_quality_problem_no", electricityQualityCheckParam.getPowerQualityProblemNo()); updateWrapper.eq("power_quality_problem_no", electricityQualityCheckParam.getPowerQualityProblemNo());
updateWrapper.set("report_process", report_process); // updateWrapper.set("report_process", report_process);
updateWrapper.set("report_process_status", report_process_status); updateWrapper.set("report_process_status", report_process_status);
int i = issuesMapper.update(null, updateWrapper); int i = issuesMapper.update(null, updateWrapper);
result = insert == 1 && i == 1; result = insert == 1 && i == 1;