diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java index 7728aef..da33ad3 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java @@ -16,8 +16,6 @@ public class EvaluationListCO extends ClientObject { private Long corpId; @ApiModelProperty(value = "公司名称") private String corpName; - @ApiModelProperty(value = "待评分清单数量(清单分数为0或空的)") - private Integer pendingScoreCount; - @ApiModelProperty(value = "已评分清单数量(清单分数不为0且不为空的)") - private Integer scoredCount; + @ApiModelProperty(value = "清单数量") + private Integer listCount; } diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssuePageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssuePageQry.java index 758da46..7616552 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssuePageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssuePageQry.java @@ -29,6 +29,8 @@ public class TaskListIssuePageQry extends PageQuery { private Integer feedbackStatus; @ApiModelProperty(value = "0-未评分 1-已评分") private Integer scoreStatus; + @ApiModelProperty(value = "多状态筛选") + private List statusList; private String menuPath; } diff --git a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java index a114d2a..94ef46f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java @@ -17,8 +17,6 @@ public class EvaluationListDO implements Serializable { private Long corpId; @ApiModelProperty(value = "公司名称") private String corpName; - @ApiModelProperty(value = "待评分清单数量") - private Integer pendingScoreCount; - @ApiModelProperty(value = "已评分清单数量") - private Integer scoredCount; + @ApiModelProperty(value = "清单数量") + private Integer listCount; } diff --git a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java index ff31bf0..1095181 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java @@ -2,6 +2,8 @@ package com.zcloud.safetyDutyList.persistence.mapper.tasklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.CorpStatisticsDO; import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.EvaluationListDO; import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.IssueStatisticsDO; @@ -18,6 +20,9 @@ import java.util.Map; * 自定义方法对应的SQL在TaskListMapper.xml中实现。 */ @Mapper +@DataScopes( + @DataScope(method = "listPage", menuPerms = "jgd-rwqdgl") +) public interface TaskListMapper extends BaseMapper { IPage listPage(IPage iPage, Map params, String menuPath); diff --git a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java index 802f9c0..1b270f5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java @@ -35,11 +35,7 @@ public class TaskListRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { IPage iPage = new Query().getPage(params); - String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ - menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); - } - IPage result = taskListMapper.listPage(iPage, params, menuPerms); + IPage result = taskListMapper.listPage(iPage, params, ""); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListIssueMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListIssueMapper.xml index b21b0de..91eaf87 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListIssueMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListIssueMapper.xml @@ -73,6 +73,12 @@ AND (te_agg.has_abnormal = 0 OR te_agg.has_abnormal IS NULL) + + AND tli.status IN + + #{status} + + ORDER BY tli.create_time DESC diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml index 20738b7..388b96f 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml @@ -81,8 +81,12 @@