计量消息提示

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/TaskRepealMessageDTO.java

@@ -1,7 +1,9 @@
 package org.springblade.meter.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 
@@ -27,9 +29,21 @@ public class TaskRepealMessageDTO {
     @ApiModelProperty("消息类型 1未读2已读")
     private Integer messageType;
 
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
     @ApiModelProperty("开始日期")
     private LocalDate startDate;
 
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
     @ApiModelProperty("结束日期")
     private LocalDate endDate;
 

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2665,7 +2665,7 @@ public class TaskController extends BladeController {
                         if (tableData.get((map.get("申请书收到时间："))) == null)
                         tableData.put(map.get("申请书收到时间："), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
                         //申请进度时间
-                        tableData.put(map.get("申请进度款摘录_摘录人_时间"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
+//                        tableData.put(map.get("申请进度款摘录_摘录人_时间"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
                         //电签单位日期
                         tableData.put(map.get("建设单位签收_日期"), DateTimeFormatter.ofPattern("yyyy年MM月dd日").format(LocalDate.now()));
                         String pdfUrl = "";
@@ -3660,7 +3660,7 @@ public class TaskController extends BladeController {
         strings.add("项目名称：");
 //        strings.add("申请书收到时间：");
         strings.add("意见发出日期：");
-        strings.add("申请进度款摘录_摘录人_时间");
+//        strings.add("申请进度款摘录_摘录人_时间");
         strings.add("造价机构现场咨询意见_截止上期已累计审批进度款（元）");
         strings.add("造价机构现场咨询意见_截止上期已累计审批进度款（元）_截止本期已累计审核进度款（元）");
         strings.add("造价机构现场咨询意见_现场造价人员");

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/TaskRepealMessageMapper.xml

@@ -22,7 +22,7 @@
         from s_task_repeal_message strm
         where is_deleted = 0 and user_id = #{dto.userId} and contract_id = #{dto.contractId}
         <if test="dto.taskType != null and dto.taskType != ''">
-            and task_type = #{dto.taskType}
+            and meter_task_type = #{dto.taskType}
         </if>
         <if test="dto.messageType != null and dto.messageType != ''">
             and status = #{dto.messageType}
@@ -30,9 +30,9 @@
         <if test="dto.searchValue != null and dto.searchValue != ''">
             and task_name like concat('%',#{dto.searchValue},'%')
         </if>
-        <if test="dto.startDate != null and dto.startDate != ''">
+        <if test="dto.startDate != null ">
             and start_date between #{dto.startDate} and #{dto.endDate}
         </if>
-
+        order by create_time desc
     </select>
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/TaskRepealMessageServiceImpl.java

@@ -84,7 +84,14 @@ public class TaskRepealMessageServiceImpl extends BaseServiceImpl<TaskRepealMess
         if (StringUtils.isBlank(ids)){
             throw new ServiceException("请选择一条通知");
         }
+        //查询出所有要删除的消息
         List<Long> list = Func.toLongList(ids);
+        List<TaskRepealMessage> messages = this.listByIds(list);
+        for (TaskRepealMessage message : messages) {
+            if (message.getStatus() == 1){
+                throw new ServiceException("未读的消息不能直接删除");
+            }
+        }
         this.removeBatchByIds(list);
     }
 }