Переглянути джерело

进度查看,统计修改

zh 3 роки тому
батько
коміт
9562b9248a

+ 5 - 3
boman-web-core/src/main/java/com/boman/web/core/service/bomanMessageReceive/BomanMessageReceiveServiceImpl.java

@@ -28,13 +28,14 @@ public class BomanMessageReceiveServiceImpl implements IBomanMessageReceiveServi
 
     private static final String BOMAN_MESSAGE_RECEIVE = "boman_message_receive";
     private static final String STATUS = "status";
-    private static final String STATUS_N = "N";
-    private static final String STATUS_Y = "Y";
+    private static final String STATUS_N = "未读";
+    private static final String STATUS_Y = "已读";
     private static final String MESSAGE_ID = "message_id";
     private static final String DELETED = "D";
     private static final String TOTAL = "total";
     private static final String NOT_READ = "notRead";
     private static final String READ = "read";
+    private static final String VISIBLE = "visible";
 
     @Autowired
     private IBaseSelectService selectService;
@@ -138,6 +139,7 @@ public class BomanMessageReceiveServiceImpl implements IBomanMessageReceiveServi
 
         JSONObject condition = new JSONObject();
         condition.put(MESSAGE_ID, messageId);
+        condition.put(VISIBLE, "Y");
         List<JSONObject> recieves = commonService.getByMap(BOMAN_MESSAGE_RECEIVE, condition);
         requireNonNull(recieves, String.format("根据发文id: [%s], 未找到对应的收文列表", messageId));
 
@@ -152,7 +154,7 @@ public class BomanMessageReceiveServiceImpl implements IBomanMessageReceiveServi
         }
 
         JSONObject result = new JSONObject();
-        result.put(TOTAL, result.size());
+        result.put(TOTAL, recieves.size());
         result.put(NOT_READ, notRead);
         result.put(READ, read);
         return AjaxResult.success(result);

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/service/message/MessageServiceImpl.java

@@ -39,7 +39,7 @@ public class MessageServiceImpl implements MessageService {
     private static final String CREATE_TIME = "create_time";
     private static final String MESSAGE_SITUATION = "message_situation";
     /*** 已撤回 ***/
-    private static final String WITHDRAW_CODE = "5";
+    private static final String WITHDRAW_CODE = "3";
     /*** 默认30分钟 ***/
     private static final int DEFAULT_TIME_OUT = 30;