hanfucheng 8 months ago
parent
commit
c9d94f6bc1

+ 12 - 4
data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -10,11 +10,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开复工时间" prop="startTime">
+<!--      <el-form-item label="开复工时间" prop="startTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.startTime"-->
+<!--          type="month"-->
+<!--          value-format="yyyy-MM"-->
+<!--          placeholder="请选择开复工时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+      <el-form-item label="开复工时间" prop="year">
         <el-date-picker
-          v-model="queryParams.startTime"
-          type="month"
-          value-format="yyyy-MM"
+          v-model="queryParams.year"
+          type="year"
+          value-format="yyyy"
           placeholder="请选择开复工时间">
         </el-date-picker>
       </el-form-item>

+ 20 - 0
src/main/java/com/sooka/sponest/data/generalbusiness/domain/CenterdataTKeyProjects.java

@@ -323,6 +323,26 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
     @NotBlank(message = "项目id不能为空")
     private String projectId;
 
+    private String year;
+
+    private String month;
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
     public String getAdministrativeRegion() {
         return administrativeRegion;
     }

+ 6 - 0
src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -193,6 +193,12 @@
             <if test="params.startTime != null and params.startTime != ''"><!--开复工时间-->
                 AND DATE_FORMAT(start_time,'%Y-%m') = #{params.startTime}
             </if>
+            <if test="params.year != null and params.year != ''"><!--开复工时间-->
+                AND DATE_FORMAT(start_time,'%Y') = #{params.year}
+            </if>
+            <if test="params.month != null and params.month != ''"><!--开复工时间-->
+                AND DATE_FORMAT(start_time,'%m') = #{params.month}
+            </if>
         </where>
         GROUP BY a.id
         <if test="state != null and state != ''" >

+ 2 - 0
src/main/resources/mapper/generalbusiness/CenterdataTKeyProjectsMapper.xml

@@ -104,6 +104,8 @@
             <if test="territoriality != null  and territoriality != ''">and territoriality like concat('%', #{territoriality},'%')</if>
             <if test="park != null  and park != ''">and park = #{park}</if>
             <if test="startTime != null">and DATE_FORMAT(start_time,'%Y-%m')  = DATE_FORMAT( #{startTime}, '%Y-%m' )</if>
+            <if test="year != null">and DATE_FORMAT(start_time,'%Y')  =  #{year}</if>
+            <if test="month != null">and DATE_FORMAT(start_time,'%m')  = #{month}</if>
             ${params.dataScope}
         </where>
         order by a.order_num,a.create_time desc