cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app,我的项目修改

dev
zhanglei 2026-08-05 17:30:43 +08:00
parent 13e238f1f9
commit 9289d76d09
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
View File

@ -224,10 +224,12 @@ public class EvalProjectExecutor implements EvalProjectApi {
for (Long peId : myPIds) { for (Long peId : myPIds) {
if (!pIds.contains(peId)) { if (!pIds.contains(peId)) {
unfinishedIds.add(peId); unfinishedIds.add(peId);
wrapper.apply("JSON_CONTAINS(project_node, JSON_OBJECT('type', {0}, 'state', {1}))", ProjectStageEnum.SITE_SURVEY.getVal(), 0);
} }
} }
} else { } else {
unfinishedIds.addAll(myPIds); unfinishedIds.addAll(myPIds);
wrapper.apply("JSON_CONTAINS(project_node, JSON_OBJECT('type', {0}, 'state', {1}))", ProjectStageEnum.SITE_SURVEY.getVal(), 0);
} }
wrapper.in(EvalProjectDO::getId, CollectionUtils.isEmpty(unfinishedIds) ? Collections.singletonList(0L) : unfinishedIds); wrapper.in(EvalProjectDO::getId, CollectionUtils.isEmpty(unfinishedIds) ? Collections.singletonList(0L) : unfinishedIds);
} else { } else {
@ -265,6 +267,10 @@ public class EvalProjectExecutor implements EvalProjectApi {
surveyType = 1; surveyType = 1;
break; break;
} }
if (pIds.contains(Long.valueOf(evalProjectCO.getId()))) {
surveyType = 1;
break;
}
} }
evalProjectCO.setSurveyType(surveyType); evalProjectCO.setSurveyType(surveyType);
} }
@ -291,12 +297,20 @@ public class EvalProjectExecutor implements EvalProjectApi {
query.setPageSize(200L); query.setPageSize(200L);
query.setProjectIds(data.stream().map(EvalProjectCO::getId).map(Long::valueOf).collect(Collectors.toList())); query.setProjectIds(data.stream().map(EvalProjectCO::getId).map(Long::valueOf).collect(Collectors.toList()));
List<Long> pIds = evalProjectMemberGateway.page(query).getRecords().stream().map(EvalProjectMemberEntity::getProjectId).distinct().collect(Collectors.toList()); List<Long> pIds = evalProjectMemberGateway.page(query).getRecords().stream().map(EvalProjectMemberEntity::getProjectId).distinct().collect(Collectors.toList());
List<Long> completeIds = evalSurveyMapper.selectList(new LambdaQueryWrapper<EvalSurveyDO>()
.eq(EvalSurveyDO::getPersonnelId, AuthUserContextAdapter.getCurrentUserId())
.isNotNull(EvalSurveyDO::getSignOutTime)).stream().map(EvalSurveyDO::getProjectId)
.distinct()
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(completeIds)) {
pIds.removeAll(completeIds);
}
if (!CollectionUtils.isEmpty(pIds)) { if (!CollectionUtils.isEmpty(pIds)) {
long onSiteTaskSum = evalProjectMapper.onSiteTaskSum(pIds, ProjectStageEnum.SITE_SURVEY.getVal()); long onSiteTaskSum = evalProjectMapper.onSiteTaskSum(pIds, ProjectStageEnum.SITE_SURVEY.getVal());
co.setOnSiteTaskSum(onSiteTaskSum); co.setOnSiteTaskSum(onSiteTaskSum);
} }
} }
co.setPendingMyHandlingSum(data.stream().filter(item -> "NORMAL".equals(item.getProjectPhaseCode()) && item.getArchiveFlag() == 0).count()); co.setPendingMyHandlingSum((long) data.size());
co.setParticipatingProjectSum(co.getPendingMyHandlingSum()); co.setParticipatingProjectSum(co.getPendingMyHandlingSum());
return SingleResponse.success(co); return SingleResponse.success(co);
} }

4
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java
View File

@ -98,7 +98,9 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
EvalSignTaskCO evalSignTaskCO = evalSignTaskCmdConvertor.convertEToCO(item); EvalSignTaskCO evalSignTaskCO = evalSignTaskCmdConvertor.convertEToCO(item);
evalSignTaskCO.setProjectId(String.valueOf(item.getProjectId())); evalSignTaskCO.setProjectId(String.valueOf(item.getProjectId()));
EvalProjectDO evalProjectDO = evalProjectMapper.selectById(evalSignTaskCO.getProjectId()); EvalProjectDO evalProjectDO = evalProjectMapper.selectById(evalSignTaskCO.getProjectId());
evalSignTaskCO.setProjectName(evalProjectDO.getProjectName()); if (evalProjectDO != null) {
evalSignTaskCO.setProjectName(evalProjectDO.getProjectName());
}
evalSignTaskCO.setNodeName(Objects.requireNonNull(ProjectStageEnum.fromVal(evalSignTaskCO.getNodeCode())).getMsg()); evalSignTaskCO.setNodeName(Objects.requireNonNull(ProjectStageEnum.fromVal(evalSignTaskCO.getNodeCode())).getMsg());
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>() List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
.eq(EvalProjectMemberDO::getProjectId, evalSignTaskCO.getProjectId()) .eq(EvalProjectMemberDO::getProjectId, evalSignTaskCO.getProjectId())

10
safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
View File

@ -62,7 +62,7 @@
<select id="qualificationMonitoringPage" resultMap="QualFilingCOResultMap"> <select id="qualificationMonitoringPage" resultMap="QualFilingCOResultMap">
select info.credit_code as orgInfoCreditCode, info.unit_name as unitName, filing.* from org_info as info select info.credit_code as orgInfoCreditCode, info.unit_name as unitName, filing.* from org_info as info
left join qual_filing as filing on info.id = filing.org_id left join qual_filing as filing on info.id = filing.org_id
where info.delete_enum = 'false' and filing.filing_status_code = 1 where info.delete_enum = 'false' and filing.filing_status_code = 1 and info.filing_record_status_code = 1
<if test="query.keyword != null"> <if test="query.keyword != null">
and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%')) and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%'))
</if> </if>
@ -76,12 +76,12 @@
</select> </select>
<select id="qualificationMonitoringPageStatistics" <select id="qualificationMonitoringPageStatistics"
resultType="org.qinan.safetyeval.client.co.QualFilingStatisticsCO"> resultType="org.qinan.safetyeval.client.co.QualFilingStatisticsCO">
select count(*) as orgInfoSum, select count(info.id) as orgInfoSum,
SUM(CASE WHEN alert_status = 'normal' THEN 1 ELSE 0 END) AS normalSum, SUM(CASE WHEN filing.alert_status = 'normal' THEN 1 ELSE 0 END) AS normalSum,
SUM(CASE WHEN alert_status = 'person_rate' THEN 1 ELSE 0 END) AS earlyWarningSum SUM(CASE WHEN filing.alert_status = 'person_rate' THEN 1 ELSE 0 END) AS earlyWarningSum
from org_info as info from org_info as info
left join qual_filing as filing on info.id = filing.org_id left join qual_filing as filing on info.id = filing.org_id
where info.delete_enum = 'false'; where info.delete_enum = 'false' and info.filing_record_status_code = 1 and filing.filing_status_code = 1;
</select> </select>
<select id="selectByOrgIdLastOne" resultMap="BaseResultMap"> <select id="selectByOrgIdLastOne" resultMap="BaseResultMap">