From a3d63a4a7199d346e63039a8fd6490b12387fa4e Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Thu, 07 May 2026 13:42:38 +0800
Subject: [PATCH] 增加查询条件
---
multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java | 3 +
multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml | 3 +
multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml | 4 ++
multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java | 4 ++
multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 3 +
multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java | 3 +
multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml | 6 ++
multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java | 5 ++
multi-system/src/main/resources/mapper/system/PostSalesMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java | 4 ++
multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml | 3 +
multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java | 4 ++
multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml | 3 +
multi-system/src/main/resources/mapper/system/ItemMapper.xml | 13 +++++-
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java | 4 ++
multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java | 4 ++
multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java | 5 +-
multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java | 4 ++
26 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java
index 30b30bb..2ca2087 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractLedger.java
@@ -61,5 +61,8 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "年份")
+ @TableField(exist = false)
+ private String year;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java
index cc43f75..bd4a5ac 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ContractReview.java
@@ -144,4 +144,7 @@
@TableField(exist = false)
private List<ContractReviewMess> reviewMesses;
+ @ApiModelProperty(value = "年份")
+ @TableField(exist = false)
+ private String year;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java
index c27483b..e99e336 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerCommunication.java
@@ -133,4 +133,8 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "年份")
+ @TableField(exist = false)
+ private String year;
+
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java
index e034798..9c29fe9 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/CustomerRecord.java
@@ -49,6 +49,9 @@
@TableField(exist = false)
private List<CustomerRecordNeed> customerRecordNeeds;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
index 6c1dfae..148663f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentBorrowCopy.java
@@ -82,6 +82,10 @@
@TableField("version")
private Integer version;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
+
@TableField(exist = false)
@ApiModelProperty("文件借阅复制申请容表")
private List<DocumentBorrowCopyRecord> documentBorrowCopyRecordList;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
index e579b63..5930b4e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentChangesInvalidated.java
@@ -178,6 +178,10 @@
@TableField("version")
private Integer version;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
+
@ApiModelProperty("发放表")
@TableField(exist = false)
private List<DocumentChangesInvalidatedIssue> documentChangesInvalidatedIssueList;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java
index 0a67912..5b7986d 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDestructionApply.java
@@ -131,6 +131,10 @@
@TableField("create_by")
private String createBy;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
+
@ApiModelProperty("更新时间")
@TableField("update_time")
private LocalDateTime updateTime;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java
index 006418a..d3bf35e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DocumentDistributionCollection.java
@@ -82,6 +82,9 @@
@TableField("version")
private Integer version;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
@TableField(exist = false)
@ApiModelProperty("文件发放回收内容表")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java
index 3a9c47f..b59c1f5 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/Item.java
@@ -42,6 +42,10 @@
@TableField("update_by")
private String updateBy;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
+
@TableField("update_time")
private LocalDateTime updateTime;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java
index eff591a..887ed88 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/PostSales.java
@@ -104,5 +104,8 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "年份")
+ @TableField(exist = false)
+ private String year;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java
index c340288..bee87e4 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectDelivery.java
@@ -87,6 +87,10 @@
@TableField("update_time")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
+
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java
index aa2294c..fc56162 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ProjectResearch.java
@@ -87,7 +87,8 @@
@TableField("update_time")
private LocalDateTime updateTime;
-
-
+ @ApiModelProperty(value = "年份")
+ @TableField("year")
+ private String year;
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java
index ed717dc..b268e17 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/SysNotice.java
@@ -78,6 +78,11 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "年份")
+ @TableField(exist = false)
+ private String year;
+
+
@ApiModelProperty("删除标志（0代表存在 1代表删除）")
private Integer delFlag;
}
diff --git a/multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml b/multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml
index 74d3616..b52b6ef 100644
--- a/multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ContractLedgerMapper.xml
@@ -24,6 +24,9 @@
<if test="companyId!=null">
and cl.company_id = #{companyId}
</if>
+ <if test="year != null and year != ''">
+ AND DATE_FORMAT(cl.sign_date, '%Y') = #{year}
+ </if>
ORDER BY
cl.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml b/multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml
index 4a87b73..dc2e600 100644
--- a/multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ContractReviewMapper.xml
@@ -55,6 +55,9 @@
<if test="type!=null">
and cr.type = #{type}
</if>
+ <if test="year != null and year != ''">
+ AND DATE_FORMAT(cr.record_time, '%Y') = #{year}
+ </if>
ORDER BY
cr.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml b/multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml
index 578526b..170c4f4 100644
--- a/multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CustomerCommunicationMapper.xml
@@ -44,6 +44,9 @@
<if test="companyId!=null">
and cc.company_id = #{companyId}
</if>
+ <if test="year != null and year != ''">
+ AND DATE_FORMAT(cc.com_time, '%Y') = #{year}
+ </if>
ORDER BY
cc.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml b/multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml
index 0a0e821..d39ab11 100644
--- a/multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/CustomerRecordMapper.xml
@@ -21,6 +21,9 @@
<if test="companyId!=null">
and cr.company_id = #{companyId}
</if>
+ <if test="year!=null">
+ and cr.year = #{year}
+ </if>
ORDER BY
cr.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml b/multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml
index c2a0f0b..ee482c9 100644
--- a/multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/DocumentBorrowCopyMapper.xml
@@ -9,6 +9,9 @@
<if test="companyId!=null ">
and company_id = #{companyId}
</if>
+ <if test="year!=null and year != '' ">
+ and year = #{year}
+ </if>
order by create_time desc
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml b/multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml
index 7bc1605..4e8ca8d 100644
--- a/multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/DocumentChangesInvalidatedMapper.xml
@@ -9,6 +9,9 @@
<if test="companyId!=null ">
and company_id = #{companyId}
</if>
+ <if test="year!=null and year != '' ">
+ and year = #{year}
+ </if>
order by create_time desc
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml b/multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml
index fd4dca9..58fab16 100644
--- a/multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/DocumentDestructionApplyMapper.xml
@@ -9,6 +9,9 @@
<if test="companyId!=null ">
and company_id = #{companyId}
</if>
+ <if test="year!=null and year != '' ">
+ and year = #{year}
+ </if>
ORDER BY create_time desc
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml b/multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml
index 6f6cc0a..2905449 100644
--- a/multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/DocumentDistributionCollectionMapper.xml
@@ -9,6 +9,10 @@
<if test="companyId!=null ">
and company_id = #{companyId}
</if>
+ <if test="year!=null and year != '' ">
+ and year = #{year}
+ </if>
+
order by create_time desc
</select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/ItemMapper.xml b/multi-system/src/main/resources/mapper/system/ItemMapper.xml
index 3d6341e..2c7d285 100644
--- a/multi-system/src/main/resources/mapper/system/ItemMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ItemMapper.xml
@@ -23,13 +23,18 @@
`create_by`,
`create_time`,
`update_by`,
- `update_time`
+ `update_time`,
+ `year`
FROM
`item`
where del_flag = 1
<if test="companyId!=null">
and company_id = #{companyId}
</if>
+ <if test="year != null and year != ''">
+ and year = #{year}
+ </if>
+
</select>
<select id="selectItemListAll" resultType="com.gkhy.exam.system.domain.Item">
SELECT
@@ -40,7 +45,8 @@
i.`create_by`,
i.`create_time`,
i.`update_by`,
- i.`update_time`
+ i.`update_time`,
+ i.`year`
FROM
`item` i
LEFT JOIN item_user iu ON i.id = iu.item_id
@@ -52,6 +58,9 @@
<if test="userId!=null">
and iu.user_id = #{userId}
</if>
+ <if test="year != null and year != ''">
+ and i.year = #{year}
+ </if>
GROUP BY
i.id
diff --git a/multi-system/src/main/resources/mapper/system/PostSalesMapper.xml b/multi-system/src/main/resources/mapper/system/PostSalesMapper.xml
index 62fe62f..0a2209b 100644
--- a/multi-system/src/main/resources/mapper/system/PostSalesMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/PostSalesMapper.xml
@@ -36,6 +36,9 @@
<if test="companyId!=null">
and ps.company_id = #{companyId}
</if>
+ <if test="year != null and year != ''">
+ AND DATE_FORMAT(ps.server_time, '%Y') = #{year}
+ </if>
ORDER BY
ps.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml b/multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml
index 6540b2c..3e92a92 100644
--- a/multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ProjectDeliveryMapper.xml
@@ -23,7 +23,8 @@
pd.`create_by`,
pd.`create_time`,
pd.`update_by`,
- pd.`update_time`
+ pd.`update_time`,
+ pd.`year`
FROM
`project_delivery` pd
LEFT JOIN sys_company sc ON pd.company_id = sc.id
@@ -32,6 +33,9 @@
<if test="companyId!=null">
AND pd.company_id = #{companyId}
</if>
+ <if test="year!=null and year != ''">
+ AND pd.year = #{year}
+ </if>
ORDER BY
pd.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml b/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
index 000e348..cd7cd93 100644
--- a/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ProjectResearchMapper.xml
@@ -31,6 +31,9 @@
<if test="companyId!=null">
and pr.company_id = #{companyId}
</if>
+ <if test="year!=null and year != ''">
+ AND pr.year = #{year}
+ </if>
ORDER BY
pr.create_time DESC
</select>
diff --git a/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 83c3af8..a34c84b 100644
--- a/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -56,6 +56,9 @@
<if test="createBy != null and createBy != ''">
AND a.create_by like concat('%', #{createBy}, '%')
</if>
+ <if test="year != null and year != ''">
+ AND DATE_FORMAT(a.publish_date, '%Y') = #{year}
+ </if>
order by a.create_time desc
</select>
--
Gitblit v1.9.2