From 1519a7c81e6566dd0cbc6acfb1b5e92c3aaba7df Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 10:53:57 +0800
Subject: [PATCH] 赋码定时任务只判断超时,且用红码时间判断

---
 business/src/main/resources/mapper/PlanMapper.xml |   76 ++++++++++++++++++++++++++++----------
 1 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/business/src/main/resources/mapper/PlanMapper.xml b/business/src/main/resources/mapper/PlanMapper.xml
index f257919..d25ab8e 100644
--- a/business/src/main/resources/mapper/PlanMapper.xml
+++ b/business/src/main/resources/mapper/PlanMapper.xml
@@ -9,14 +9,25 @@
         <result column="month_status" property="monthStatus" />
         <result column="season_status" property="seasonStatus" />
         <result column="year_status" property="yearStatus" />
-        <result column="gmt_create_time" property="gmtCreateTime" />
-        <result column="gmt_update_time" property="gmtUpdateTime" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_update" property="gmtUpdate" />
     </resultMap>
 
-
-
-
-
+    <!-- 鍒嗛〉鏉′欢鏌ヨ椤圭洰璁″垝璁板綍鏄犲皠缁撴灉 -->
+    <resultMap id="PageResultMap" type="com.ycl.domain.vo.ProjectPlanResponseVO">
+        <id property="id" column="id" />
+        <result property="projectName" column="project_name" />
+        <result property="reportStatus" column="report_status" />
+        <result property="projectCode" column="project_code" />
+        <result property="projectType" column="project_type" />
+        <result property="projectPhase" column="project_phase" />
+        <result property="monthStatus" column="month_status" />
+        <result property="seasonStatus" column="season_status" />
+        <result property="yearStatus" column="year_status" />
+        <result property="projectStatus" column="project_status" />
+        <result property="investType" column="invest_type" />
+        <result property="exception" column="exception" />
+    </resultMap>
 
 
     <select id="getById" resultMap="BaseResultMap">
@@ -36,20 +47,45 @@
     </select>
 
 
-    <select id="getPage" resultMap="BaseResultMap">
-        SELECT
-            TP.project_info_id,
-            TP.report_status,
-            TP.month_status,
-            TP.season_status,
-            TP.year_status,
-            TP.gmt_create_time,
-            TP.gmt_update_time,
-            TP.id
-        FROM
-            t_plan TP
-        WHERE
-            TP.deleted = 0
+    <select id="getPage" resultMap="PageResultMap">
+        SELECT DISTINCT
+            pi.id,
+            pi.project_name,
+            p.report_status,
+            pi.project_code,
+            pi.project_type,
+            pi.project_phase,
+            p.month_status,
+            p.season_status,
+            p.year_status,
+            p.exception,
+            pi.project_status,
+            pi.invest_type
+        FROM t_project_info AS pi
+        LEFT JOIN t_plan AS p ON p.project_info_id = pi.id
+        LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
+        <where>
+            pi.deleted = 0 AND pi.used_status = 2
+            <if test="query.projectName!= null and query.projectName!= ''">
+                AND pi.project_name LIKE CONCAT('%', #{query.projectName}, '%')
+            </if>
+            <if test="query.projectCode!= null and query.projectCode!= ''">
+                AND pi.project_code LIKE CONCAT('%', #{query.projectCode}, '%')
+            </if>
+            <if test="query.reportStatus!= null">
+                AND p.report_status = #{query.reportStatus}
+            </if>
+            <if test="query.monthStatus!= null">
+                AND p.month_status = #{query.monthStatus}
+            </if>
+            <if test="query.seasonStatus!= null">
+                AND p.season_status = #{query.seasonStatus}
+            </if>
+            <if test="query.yearStatus!= null">
+                AND p.year_status = #{query.yearStatus}
+            </if>
+            ${query.params.dataScope}
+        </where>
     </select>
 
 </mapper>

--
Gitblit v1.8.0