From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 19 Aug 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java
index f0c9021..60d22be 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java
@@ -4,15 +4,51 @@
import com.gkhy.safePlatform.targetDuty.annotation.Query;
public class TargetExamineQueryCriteria {
- //关联的目标指标/外键
+ //安全目标指标
+ @Query(type = Query.Type.INNER_LIKE)
+ private String qName;
+ //目标指标编号
+ @Query(type = Query.Type.INNER_LIKE)
+ private String indexNum;
+ //指标类型 1:年指标 2:月指标 3:半年 4:季度
@Query()
- private Long targetId;
- //关联的目标指标/外键
- public Long getTargetId() {
- return targetId;
+ private Integer targetType;
+ //分解状态 1:已分解 2:未分解
+ @Query()
+ private Integer divideStatus;
+
+ public Integer getDivideStatus() {
+ return divideStatus;
}
- public void setTargetId(Long targetId) {
- this.targetId = targetId;
+ public void setDivideStatus(Integer divideStatus) {
+ this.divideStatus = divideStatus;
+ }
+
+ //安全目标指标
+
+ public String getqName() {
+ return qName;
+ }
+
+ public void setqName(String qName) {
+ this.qName = qName;
+ }
+
+ //目标指标编号
+ public String getIndexNum() {
+ return indexNum;
+ }
+
+ public void setIndexNum(String indexNum) {
+ this.indexNum = indexNum;
+ }
+ //指标类型 1:年指标 2:月指标
+ public Integer getTargetType() {
+ return targetType;
+ }
+
+ public void setTargetType(Integer targetType) {
+ this.targetType = targetType;
}
}
\ No newline at end of file
--
Gitblit v1.9.2