公开状态调整

yudao-server/src/main/java/cn/iocoder/yudao/module/server/service/policycommunications/PolicyCommunicationsServiceImpl.java

@@ -209,11 +209,30 @@ public class PolicyCommunicationsServiceImpl implements PolicyCommunicationsServ
         return policyCommunications.getId();
     }
 
-    public PageResult<PolicyCommunicationsDO> getPolicyCommunicationsByUser(PolicyCommunicationsAnonymousQueryReqVO queryReqVO) {
+/*    public PageResult<PolicyCommunicationsDO> getPolicyCommunicationsByUser(PolicyCommunicationsAnonymousQueryReqVO queryReqVO) {
         // 设置用户ID条件，并查询所有状态（包含公开和不公开）
         queryReqVO.setUserId(queryReqVO.getUserId());
         // dealStatus 和 replayIsPublic 不设置，查询所有状态
         return policyCommunicationsMapper.selectAnonymousPage(queryReqVO);
+    }*/
+
+    public PageResult<PolicyCommunicationsDO> getPolicyCommunicationsByUser(PolicyCommunicationsAnonymousQueryReqVO queryReqVO) {
+        // 设置用户ID条件，并查询所有状态（包含公开和不公开）
+        queryReqVO.setUserId(queryReqVO.getUserId());
+        // dealStatus 和 replayIsPublic 不设置，查询所有状态
+        PageResult<PolicyCommunicationsDO> pageResult = policyCommunicationsMapper.selectAnonymousPage(queryReqVO);
+
+        // 处理数据：如果 submitIsPublic 是 1，则设置 replayIsPublic = 1
+        List<PolicyCommunicationsDO> list = pageResult.getList();
+        if (list != null && !list.isEmpty()) {
+            for (PolicyCommunicationsDO item : list) {
+                if (item.getSubmitIsPublic() != null && item.getSubmitIsPublic() == 0) {
+                    item.setReplayIsPublic(0);
+                }
+            }
+        }
+
+        return pageResult;
     }
 
     @Override
@@ -593,6 +612,12 @@ public class PolicyCommunicationsServiceImpl implements PolicyCommunicationsServ
         if (record.getDealStatus() != null && record.getDealStatus() == 0) { // 0 表示待处理
             Integer remainingWorkdays = calculateRemainingWorkdays(record.getSubmitTime());
             record.setRemainingWorkdays(remainingWorkdays);
+            if(record.getSubmitIsPublic()==0){
+                record.setReplayIsPublic(0);
+            }else{
+                record.setReplayIsPublic(1);
+            }
+
         } else {
             // 非待处理状态不显示
             record.setRemainingWorkdays(null);
@@ -658,7 +683,7 @@ public class PolicyCommunicationsServiceImpl implements PolicyCommunicationsServ
                     if (type.equals("POLICY_COMMUNICATIONS_DEADLINE")) {
                         content = buildReminderContent(item);
                     } else if (type.equals("POLICY_COMMUNICATIONS_CREATE")){
-                        content = "您有新的政策沟通待处理，请及时处理。";
+                        content = "您有新的政策沟通交流待答复，请及时前往内蒙古自治区集约化平台-政策沟通交流系统进行处理。";
                     }
                     // TODO: 调用短信发送服务
                     boolean b = false;