增加项目置顶功能

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java

@@ -242,8 +242,8 @@ public class OrgSelfAppraisalManage {
      */
     private Boolean checkCanSelfAppraisal(PerformanceAppraisalProject appraisalProject) {
         // 在自评时间段内，且是首次自评(打分时间为空)
-        if (LocalDateTime.now().compareTo(appraisalProject.getSelfAppraisalStart()) > 0 &&
-                LocalDateTime.now().compareTo(appraisalProject.getSelfAppraisalEnd()) < 0 &&
+        if (LocalDateTime.now().isAfter(appraisalProject.getSelfAppraisalStart()) &&
+                LocalDateTime.now().isBefore(appraisalProject.getSelfAppraisalEnd()) &&
                 Objects.isNull(appraisalProject.getSelfAppraisalScoreTime())) {
             return Boolean.TRUE;
         }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml

@@ -301,7 +301,8 @@
         is_higher_super_org,
         pre_plan_project_id,
         create_on,
-        update_on
+        update_on,
+        topped
         from
         (SELECT
         1 as from_type,
@@ -324,7 +325,8 @@
         is_higher_super_org,
         pre_plan_project_id,
         create_on,
-        update_on
+        update_on,
+        topped
         FROM nd_project p
         WHERE p.newest = 1
         <if test="req.id != null">
@@ -396,7 +398,8 @@
         NULL is_higher_super_org,
         NULL pre_plan_project_id,
         b.tong_time create_on,
-        b.biz_time update_on
+        b.biz_time update_on,
+        0 as topped
         FROM gov_operation_project_baseinfo b
         LEFT JOIN gov_biz_project_apply apply ON b.base_proj_id = apply.base_proj_id
         LEFT JOIN gov_biz_project_approve approve ON b.base_proj_id = approve.base_proj_id
@@ -446,6 +449,6 @@
         <if test="req.userType != null and req.userType == 'org'">
             and b.base_build_deprt_ding = #{req.userValue}
         </if>)
-        ) ORDER BY update_on DESC
+        ) ORDER BY topped desc, update_on DESC
     </select>
 </mapper>

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/Project.java

@@ -549,4 +549,7 @@ public class Project implements Serializable {
     @ApiModelProperty("申报单位领域")
     private Integer unitStrip;
 
+    @ApiModelProperty("置顶")
+    private Integer topped;
+
 }