WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-04-11 18:29:37 +08:00
parent 68eb777be8 d79e4c9f72
commit 0c8b448b05
6 changed files with 111 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+5
View File
@@ -82,6 +82,11 @@ public enum TemplateInfoEnum2 {
*/
LAWS_WARN("法规预警","ctp_AArYGerQrOcE","Regulation Early Warning"),
/**
* 法规意见收集
*/
REGULATION_OPINION_COLLECTION("法规意见收集","ctp_AArfYGLozU47","Regulation Opinion Collection"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java
+7
View File
@@ -145,4 +145,11 @@ public interface IFeishuService {
*/
void sendMessageLawsWarn(String templeteId,Map<String,Object> params);
/**
* 飞书消息模板--法规意见收集
* @param templeteId
* @param params
*/
void sendMessageRegulationOpinionCollection(String templeteId,Map<String,Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+50
View File
@@ -1516,4 +1516,54 @@ public class FeishuServiceImpl implements IFeishuService {
}
}
@Override
public void sendMessageRegulationOpinionCollection(String templeteId, Map<String, Object> params) {
List<String> userIdList = (List<String>) params.get("userIdList");
if (CollectionUtils.isNotEmpty(userIdList)) {
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
String contentCn = (String) params.get("contentInfoFeiCn");
String contentEn = (String) params.get("contentInfoFeiEn");
String back_url = (String) params.get("back_url");
String titleCn = (String) params.get("titleCn");
String titleEn = (String) params.get("titleEn");
String regulationNo = (String) params.get("regulationNo");
String initiator = (String) params.get("initiator");
String initiatorEn = (String) params.get("initiatorEn");
String dueDate = (String) params.get("dueDate");
String carTitleCn = (String) params.get("carTitleCn");
String carTitleEn = (String) params.get("carTitleEn");
try {
for (String userId : userIdList) {
String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
if(StringUtils.isNotEmpty(thirdId)){
// 根据结束时间进行排序，获取最近的时间，发消息时使用。
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", templeteId);
larkMesJson.put("userIds",thirdId);
Map<String,Object> templateVariableMap = new HashMap<>();
templateVariableMap.put("contentInfoFeiCn",contentCn);
templateVariableMap.put("contentInfoFeiEn",contentEn);
templateVariableMap.put("view_url_cn",back_url);
templateVariableMap.put("view_url_en",back_url);
templateVariableMap.put("titleCn",titleCn);
templateVariableMap.put("titleEn",titleEn);
templateVariableMap.put("regulationNo",regulationNo);
templateVariableMap.put("initiator",initiator);
templateVariableMap.put("initiatorEn",initiatorEn);
templateVariableMap.put("dueDate",dueDate);
templateVariableMap.put("carTitleCn",carTitleCn);
templateVariableMap.put("carTitleEn",carTitleEn);
larkMesJson.put("templateVariableMap",templateVariableMap);
batchSendLarkCardMsgByTemplate2(larkMesJson);
}
}
} catch (Exception e) {
log.error("飞书消息推送失败");
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+40 -12
View File
@@ -13,6 +13,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.feishu.vo.FeishuMsg2Vo;
import com.jero.modules.feishu.vo.FeishuMsgVo;
@@ -329,6 +330,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
//Map<String, String> lawsOpinionGatherPrcInfo = this.workFlowFeignClient.getLawsOpinionGatherPrcInfo(lawsOpinionGatherId);
String initiator = "";
String initiatorEn = "";
String title = MessageType2Enum.REGULATION_OPINION_COLLECTION.getCn() + "/" + MessageType2Enum.REGULATION_OPINION_COLLECTION.getEn();
String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsOpinionGatherEO.getEndTime());//截止日期
//String prcNum = lawsOpinionGatherPrcInfo.get("prcNum");
@@ -383,7 +385,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue())) {
userIdList.add(jsonObject.getString("evaluatorIds"));
initiator = "系统通知";
initiatorEn = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
"\n标题: " + lawsOpinionGatherEO.getTitle() +
@@ -396,6 +399,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
hrefFeishu = backUrl + "/regulatoryProcessReview?prcId="+ actiProcInstId +"&taskIds="+ taskId +"&prcType=5&router=%2FregulatoryAssessmentTasks&prcNum="+ lawsOpinionGatherEO.getPrcNum() +"&taskDefinitionKey=pgrpg&isDisabled=false";
} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())){
initiator = "系统通知";
initiatorEn = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
userIdList.add(jsonObject.getString("evaluatorIds"));
cnContentUpper = "您好，该任务将于今天到期，请尽快查看处理，谢谢！";
cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
@@ -410,7 +415,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_COMPLETE_MSG.getValue())) {
userIdList.add((String) jsonObject.get("initiatorUserId"));
initiator = "系统通知";
initiatorEn = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
cnContentUpper = "您好，该任务已完成，请查看";
cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
"\n标题: " + lawsOpinionGatherEO.getTitle() +
@@ -440,16 +446,38 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
}
try {
FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
feishuMsgVo.setTitle(title);
feishuMsgVo.setCnContentUpper(cnContentUpper);
feishuMsgVo.setCnContentLower(cnContentLower);
feishuMsgVo.setEnContentUpper(enContentUpper);
feishuMsgVo.setEnContentLower(enContentLower);
feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
} catch (IOException e) {
// FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
// feishuMsgVo.setTitle(title);
// feishuMsgVo.setCnContentUpper(cnContentUpper);
// feishuMsgVo.setCnContentLower(cnContentLower);
// feishuMsgVo.setEnContentUpper(enContentUpper);
// feishuMsgVo.setEnContentLower(enContentLower);
// feishuMsgVo.setUrl(hrefFeishu);
// feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
// feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",cnContentUpper);
params.put("contentInfoFeiEn",enContentUpper);
params.put("userIdList",userIdList);
params.put("back_url",hrefFeishu);
params.put("titleCn"," "+lawsOpinionGatherEO.getTitle());
params.put("titleEn"," "+bussDocumentLibraryEO.getTitleEn());
params.put("regulationNo"," "+lawsOpinionGatherEO.getSerialNumber());
params.put("initiator"," "+initiator);
params.put("carTitleCn",TemplateInfoEnum2.REGULATION_OPINION_COLLECTION.getNameCn());
params.put("carTitleEn",TemplateInfoEnum2.REGULATION_OPINION_COLLECTION.getNameEn());
if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue())
|| StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())
||StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_COMPLETE_MSG.getValue())){
params.put("initiatorEn"," "+initiatorEn);
}else{
params.put("initiatorEn"," "+initiator);
}
params.put("dueDate"," "+endTime);
feishuService.sendMessageRegulationOpinionCollection(TemplateInfoEnum2.REGULATION_OPINION_COLLECTION.getValue(),params);
} catch (Exception e) {
log.error("飞书消息推送失败");
}
//系统内部跳转链接
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+3 -1
View File
@@ -19,7 +19,9 @@
<sql id="BaseQuerySql">
<where>
and project_name is not null
<if test="params.querySource == '2'">
and project_name is not null
</if>
<if test="params.projectName != null and params.projectName !=''">
and (
temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+6
View File
@@ -226,6 +226,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("flowTypeList",flowTypeList);
params.put("taskStatus", TaskStatusEnum.NOT_DONE.getValue());
params.put("currentUserId",currentUser.getId());
params.put("querySource",FlowTypeEnum.SJFHXSHLC.getValue());
List<String> qdqrFlowTypeValue = new ArrayList<>();
qdqrFlowTypeValue.add(FlowTypeEnum.QDQR.getValue());
@@ -251,6 +252,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("flowTypeList",flowTypeList);
params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());
params.put("currentUserId",currentUser.getId());
params.put("querySource",FlowTypeEnum.SJFHXSHLC.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoVO> result = this.baseMapper.queryProjectProcessPageList(page,params);
@@ -273,6 +275,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("currentUserId",currentUser.getId());
params.put("queryType","issuedProcess");
params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());
params.put("querySource",FlowTypeEnum.SJFHXSHLC.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoVO> result = this.baseMapper.queryProjectProcessPageList(page,params);
@@ -365,6 +368,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("flowTypeList",flowTypeList);
params.put("currentUserId",currentUser.getId());
params.put("taskStatus", TaskStatusEnum.NOT_DONE.getValue());
params.put("querySource", FlowTypeEnum.FGJSPG.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoVO> result = this.baseMapper.queryLawsAssessPageList(page,params);
@@ -388,6 +392,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("flowTypeList",flowTypeList);
params.put("currentUserId",currentUser.getId());
params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());
params.put("querySource", FlowTypeEnum.FGJSPG.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoVO> result = this.baseMapper.queryLawsAssessPageList(page,params);
@@ -411,6 +416,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("flowTypeList",flowTypeList);
params.put("currentUserId",currentUser.getId());
params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());
params.put("querySource", FlowTypeEnum.FGJSPG.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoVO> result = this.baseMapper.queryLawsAssessPageList(page,params);