From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取
---
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java | 13 +++++++++++++
src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml | 15 +++++++++++++++
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java | 2 ++
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java | 1 +
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java | 3 +++
src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml | 7 ++++++-
src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml | 13 ++++++++++++-
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java | 1 +
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java | 2 ++
9 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
index c9ff5ba..f070aa6 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
@@ -13,7 +13,9 @@
private String id;
private String taskId;
+ private String checkItemId;
+ private String companyCode;
private String checkName;
private String checkContent;
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
index dab2f2c..79865e4 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.specialCheck.domin;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -10,25 +11,37 @@
@TableName("tb_base_check_score")
public class TbBaseCheckScore {
+ @TableField(value = "id")
private String id;
+ @TableField( value = "score_id", exist = false)
+ private String scoreId;
+ @TableField(value = "check_item_id")
private String checkItemId;
+ @TableField(value = "is_reject")
private String isReject;
+ @TableField(value = "deduct_point")
private String deductPoint;
+ @TableField(value = "deduct_illustrate")
private String deductIllustrate;
+ @TableField(value = "deleted")
private Byte deleted;
+ @TableField(value = "create_by")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "create_date")
private LocalDateTime createDate;
+ @TableField(value = "update_by")
private String updateBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "update_date")
private LocalDateTime updateDate;
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
index 9e87bfe..31b09a7 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
@@ -12,6 +12,8 @@
private String id;
+ private String taskId;
+
private String taskName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
index 1fb0288..b375190 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
@@ -19,4 +19,5 @@
TbBaseCheckItem getBaseItemByStatus(Date date);
int updateStatusById(String id);
+ int insertBatch(TbBaseCheckItem tbBaseCheckItems);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
index e15190e..f6453db 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
@@ -16,4 +16,5 @@
TbBaseCheckScore getBaseCheckScoreByScoreId(String checkScoreId);
List<TbBaseCheckTask> listTbBaseCheckTask();
+ int save(TbBaseCheckScore tbBaseCheckScore);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
index f5201aa..d9623e3 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
@@ -20,4 +20,7 @@
TbBaseCheckTask getBaseCheckTaskByStatus(Date date);
int updateStatusById(String id);
+
+ @Override
+ int insert(TbBaseCheckTask tbBaseCheckTask);
}
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
index 40225a3..7f54a85 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
@@ -21,8 +21,19 @@
<result property="updateDate" column="update_date"/>
<result property="status" column="status"/>
</resultMap>
+ <insert id="insertBatch" parameterType="com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem">
+ INSERT INTO tb_base_check_item (
+ id, task_id, check_name, check_content, check_way, check_basis, applicable_place,
+ deleted, create_by, create_date, update_by, update_date, status
+ )
+ VALUES (
+ #{id}, #{taskId}, #{checkName}, #{checkContent}, #{checkWay}, #{checkBasis}, #{applicablePlace},
+ #{deleted}, #{createBy}, #{createDate}, #{updateBy}, #{updateDate}, #{status}
+ )
-<!-- List<TbBaseCheckItem> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);-->
+ </insert>
+
+ <!-- List<TbBaseCheckItem> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);-->
<select id="selectTbBaseCheckItemPage" resultMap="BaseResultMap">
select * from tb_base_check_item
<where>
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
index 7db3cd4..7e30393 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
@@ -18,8 +18,13 @@
<result property="updateBy" column="update_by"/>
<result property="updateDate" column="update_date"/>
</resultMap>
+ <insert id="save" parameterType="com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore">
+ insert into tb_base_check_score ( id, check_item_id, is_reject, deduct_point, deduct_illustrate, deleted, create_by, create_date, update_by, update_date)
+ values (#{id}, #{checkItemId}, #{isReject}, #{deductPoint}, #{deductIllustrate}, #{deleted}, #{createBy}, #{createDate}, #{updateBy}, #{updateDate})
-<!-- List<TbBaseCheckScore> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);-->
+ </insert>
+
+ <!-- List<TbBaseCheckScore> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);-->
<select id="selectTbBaseCheckScorePage" resultMap="BaseResultMap">
select * from tb_base_check_score
<where>
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
index c5fce79..ea8fa33 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
@@ -59,4 +59,19 @@
status = 2
where id = #{id}
</update>
+
+
+
+ <insert id="insert" parameterType="com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask">
+ INSERT INTO tb_base_check_task (
+ id, task_name, task_start_time, task_end_time, task_type_name, task_content,
+ deleted, create_by, create_date, update_by, update_date, status
+ )
+ VALUES (
+ #{id}, #{taskName}, #{taskStartTime}, #{taskEndTime}, #{taskTypeName}, #{taskContent},
+ #{deleted}, #{createBy}, #{createDate}, #{updateBy}, #{updateDate}, #{status}
+ )
+ </insert>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2