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

fix bug

dev
luotaiqian 2026-07-30 09:43:37 +08:00
parent 5d9be3ecbf
commit 48744a4165
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,10 +181,9 @@ public class EvalProjectExecutor implements EvalProjectApi {
@Override
public PageResponse<RiskWarningCO> riskWarningPage(RiskWarningPageQuery query) {
EvalProjectQuery domainQuery = new EvalProjectQuery();
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
query.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
Page<RiskWarningCO> page = new Page<>( query.getCurrent(), query.getSize());
IPage<RiskWarningCO> result = evalProjectMapper.selectRiskWarningPage(page, domainQuery);
IPage<RiskWarningCO> result = evalProjectMapper.selectRiskWarningPage(page, query);
return PageResponse.of(result.getRecords(), result.getTotal());
}

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/RiskWarningPageQuery.java
View File

@ -18,6 +18,9 @@ public class RiskWarningPageQuery extends BasePageQuery {
@ApiModelProperty("风险等级：HIGH高风险 MIDDLE中风险 LOW低风险")
private String riskLevel;
@ApiModelProperty(hidden = true)
private Long orgId;
@ApiModelProperty("预警类型：PROGRESS进度 CYCLE周期 QUALITY质量 PERSONNEL人员 ARCHIVE归档")
private String warningType;
}

3
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalProjectMapper.java
View File

@ -13,6 +13,7 @@ import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorStatC
import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyPageCO;
import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyStatCO;
import org.qinan.safetyeval.client.co.regulator.RegulatorEvalSurveyClockInCO;
import org.qinan.safetyeval.client.dto.institution.RiskWarningPageQuery;
import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorRealtimePageQuery;
import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectSurveyPageQuery;
import org.qinan.safetyeval.domain.query.EvalProjectQuery;
@ -34,7 +35,7 @@ public interface EvalProjectMapper extends BaseMapper<EvalProjectDO> {
/**
* 风险预警管理分页查询（暂只查项目编号、项目/客户、责任人）
*/
IPage<RiskWarningCO> selectRiskWarningPage(Page<RiskWarningCO> page, @Param("query") EvalProjectQuery query);
IPage<RiskWarningCO> selectRiskWarningPage(Page<RiskWarningCO> page, @Param("query") RiskWarningPageQuery query);
long onSiteTaskSum(@Param("pIds") List<Long> pIds, @Param("val") String val);

4
safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml
View File

@ -60,6 +60,10 @@
<if test="query.orgId != null">
AND p.org_id = #{query.orgId}
</if>
<if test="query.projectOrCustomer != null and query.projectOrCustomer != ''">
AND (p.project_name LIKE CONCAT('%', #{query.projectOrCustomer}, '%')
OR c.customer_name LIKE CONCAT('%', #{query.projectOrCustomer}, '%'))
</if>
ORDER BY p.id DESC
</select>
<select id="onSiteTaskSum" resultType="java.lang.Long">