功能修改-sjx

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -65,7 +65,7 @@
             AND release_date <![CDATA[ >= ]]> to_date(concat(#{entity.releaseDateStart},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS')
         </if>
         <if test = "entity.releaseDateEnd != null and entity.releaseDateEnd != ''">
-            AND release_date <![CDATA[ <= ]]> to_date(concat(#{entity.releaseDateStart},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
+            AND release_date <![CDATA[ <= ]]> to_date(concat(#{entity.releaseDateEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
         </if>
 		order by release_date desc
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml

@@ -37,8 +37,45 @@
     </resultMap>
 
 
-    <select id="selectFmProjectMilestonePage" resultMap="fmProjectMilestoneResultMap">
+    <select id="selectFmProjectMilestonePage" resultType="org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO">
-        select * from FM_PROJECT_MILESTONE where is_deleted = 0
+        SELECT
+            a.*,
+            b.pa_code,
+            b.project_name,
+            b.project_head,
+            b.approval_status,
+            b.project_start_time,
+            b.project_desired_end
+        FROM
+            FM_PROJECT_MILESTONE a
+            LEFT JOIN FM_PROJECT_APPLICATION b ON a.pa_id = b.id
+        <where>
+            a.is_deleted = 0
+            <if test="fmProjectMilestone.paCode!=null">
+                and b.PA_CODE LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.paCode}, '%'))
+            </if>
+            <if test="fmProjectMilestone.projectName != null and fmProjectMilestone.projectName != ''">
+                and b.project_name LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.projectName}, '%'))
+            </if>
+            <if test="fmProjectMilestone.milestonePlan != null and fmProjectMilestone.milestonePlan != ''">
+                and a.milestone_plan LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.milestonePlan}, '%'))
+            </if>
+            <if test="fmProjectMilestone.executeType != null and fmProjectMilestone.executeType != ''">
+                and a.execute_type LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.executeType}, '%'))
+            </if>
+            <if test="fmProjectMilestone.checkResult != null and fmProjectMilestone.checkResult != ''">
+                and a.check_result LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.checkResult}, '%'))
+            </if>
+            <if test="fmProjectMilestone.grade != null and fmProjectMilestone.grade != ''">
+                and a.grade LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.grade}, '%'))
+            </if>
+            <if test = "fmProjectMilestone.milestoneNodeStart != null and fmProjectMilestone.milestoneNodeStart != ''">
+                AND a.milestone_node <![CDATA[ >= ]]> to_date(concat(#{fmProjectMilestone.milestoneNodeStart},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS')
+            </if>
+            <if test = "fmProjectMilestone.milestoneNodeEnd != null and fmProjectMilestone.milestoneNodeEnd != ''">
+                AND a.milestone_node <![CDATA[ <= ]]> to_date(concat(#{fmProjectMilestone.milestoneNodeEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
+            </if>
+        </where>
     </select>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java

@@ -25,11 +25,15 @@
  */
 package org.springblade.desk.process.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 项目里程碑 视图实体类
@@ -43,4 +47,24 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private String paCode;
+
+	private String projectName;
+
+	private String projectHead;
+
+	private String approveStatus;
+
+	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
+	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
+	private Date projectStartTime;
+
+	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
+	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
+	private Date projcetDesireEnd;
+
+	private String milestoneNodeStart;
+
+	private String milestoneNodeEnd;
+
 }