From 024dc397e65ed55d7addbaf6fb153ce3f2548a6c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 15 四月 2026 11:34:25 +0800
Subject: [PATCH] 字段注入修改
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java
index d88e97e..dc321aa 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java
@@ -8,6 +8,7 @@
import com.fzzy.igds.domain.SnapReply;
import com.fzzy.igds.mapper.SnapReplyMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.WxUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -22,6 +23,8 @@
@Resource
private SnapReplyMapper snapReplyMapper;
+ @Resource
+ private WxUtil wxUtil;
/**
@@ -32,8 +35,9 @@
*/
public void listPage(Page<SnapReply> page, IgdsBaseParam param) {
QueryWrapper<SnapReply> queryWrapper = new QueryWrapper<>();
-
- param.setCompanyId(ContextUtil.getCompanyId());
+ if (StringUtils.isBlank(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
queryWrapper.eq("company_id", param.getCompanyId());
//搴撳尯妫�绱�
@@ -42,11 +46,37 @@
}
//鏄惁澶勭悊妫�绱�
- if (StringUtils.isNotBlank(param.getName())) {
- queryWrapper.eq("is_handle", param.getName());
+ if (StringUtils.isNotBlank(param.getKey())) {
+ queryWrapper.eq("is_handle", param.getKey());
}
queryWrapper.orderByDesc("create_time");
+ queryWrapper.orderByDesc("id");
+ snapReplyMapper.selectPage(page, queryWrapper);
+ }
+
+ public void listPageByListDept(Page<SnapReply> page, IgdsBaseParam param, List<String> listDept) {
+ if (listDept == null || listDept.isEmpty()) {
+ return;
+ }
+
+ QueryWrapper<SnapReply> queryWrapper = new QueryWrapper<>();
+ if (StringUtils.isBlank(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ queryWrapper.eq("company_id", param.getCompanyId());
+
+ //搴撳尯妫�绱�
+ if (!listDept.isEmpty()) {
+ queryWrapper.in("dept_id", listDept);
+ }
+ //鏄惁澶勭悊妫�绱�
+ if (StringUtils.isNotBlank(param.getKey())) {
+ queryWrapper.eq("is_handle", param.getKey());
+ }
+
+ queryWrapper.orderByDesc("create_time");
+ queryWrapper.orderByDesc("id");
snapReplyMapper.selectPage(page, queryWrapper);
}
@@ -139,4 +169,55 @@
return snapReplyMapper.deleteById(snapReply) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
}
+
+
+ /**
+ * 鍙戦�佽鍛婂埌寰俊
+ * @param deptId
+ */
+ public BaseResp sendNotice(String deptId){
+ //todo 鏈畬鎴�
+ if(StringUtils.isEmpty(deptId)){
+ return BaseResp.error("璇烽�夋嫨搴撳尯");
+ }
+
+
+// //闇�瑕佹帹閫佺殑鐢ㄦ埛
+// List<SysUser> users= new ArrayList<>();
+// String res = "";
+// //閬嶅巻鐢ㄦ埛锛屽彂閫佸井淇℃秷鎭�
+// for (SysUser user : users) {
+// if(StringUtils.isNotEmpty(user.getOpenId())){
+// boolean b = weChatUtil.sendMessage(
+// user.getOpenId(),
+// snapReply.getId(),
+// snapReply.getCompanyId(),
+// "搴撳尯鍛婅鎵瑰娴嬭瘯鎺ㄩ��",
+// snapReply.getDeptId(),
+// snapReply.getContent(),
+// DateFormatUtils.format(snapReply.getCreateTime(),"yyyy-MM-dd HH:mm:ss"),
+// "",
+// "",
+// user.getUserName());
+// if(!b){
+// res += user.getUserName() + "鐢ㄦ埛寰俊鎺ㄩ�佸け璐�,";
+// return BaseResp.error(res);
+//
+// }
+// }else{
+// log.debug("------鐢ㄦ埛openid涓嶅瓨鍦紝涓嶈繘琛屾帹閫�------");
+// res += user.getUserName() + "鐢ㄦ埛鏈粦瀹�,";
+// return BaseResp.error(res);
+//
+// }
+// }
+// if(StringUtils.isEmpty(res)){
+// return BaseResp.success("寰俊:鎺ㄩ�佹垚鍔�;");
+// }else{
+// return BaseResp.error("寰俊:"+res+";");
+// }
+ return BaseResp.success("寰俊:鎺ㄩ�佹垚鍔�;");
+
+ }
+
}
--
Gitblit v1.9.3