ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准预警

Browse Source
This commit is contained in:
liao
2023-11-29 15:31:49 +08:00
parent 93a2b92a1e
commit 13fdda0706
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+2 -1
View File
@@ -366,6 +366,7 @@ public class SynchronizationAsmsService {
int[] n = {0}; int[] n = {0};
insertSplitList.forEach(sarFileSplitInfoEO -> { insertSplitList.forEach(sarFileSplitInfoEO -> {
paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber()); paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
paramMap1.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
List<Map<String, String>> mapListAll = asmsPostUtil.sendGetReq(splitUrl, paramMap1); List<Map<String, String>> mapListAll = asmsPostUtil.sendGetReq(splitUrl, paramMap1);
List<LawsDocumentSplit> insertDocumentList = new ArrayList<>(); List<LawsDocumentSplit> insertDocumentList = new ArrayList<>();
mapListAll.forEach(eMap -> { mapListAll.forEach(eMap -> {
@@ -391,7 +392,7 @@ public class SynchronizationAsmsService {
lawsDocumentSplit.setFunctionClassification((String) objectMap2.get("functionClassification")); lawsDocumentSplit.setFunctionClassification((String) objectMap2.get("functionClassification"));
lawsDocumentSplit.setFunctionProfessional((String) objectMap2.get("functionProfession")); lawsDocumentSplit.setFunctionProfessional((String) objectMap2.get("functionProfession"));
lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingName")); lawsDocumentSplit.setFunctionGroupCode((String) objectMap2.get("groupingNum"));
lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingNum")); lawsDocumentSplit.setFunctionGroupName((String) objectMap2.get("groupingNum"));
lawsDocumentSplit.setCerImplementDate((String) objectMap2.get("implementDateCertified")); lawsDocumentSplit.setCerImplementDate((String) objectMap2.get("implementDateCertified"));
lawsDocumentSplit.setNewCerImplementDate((String) objectMap2.get("implementDateNewCer")); lawsDocumentSplit.setNewCerImplementDate((String) objectMap2.get("implementDateNewCer"));
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+1 -1
View File
@@ -402,7 +402,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
break; break;
case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发 case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
linkQueryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionId); linkQueryWrapper.eq(ProcessFbConsultationUserLink::getParentExecutionId, executionId);
linkQueryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, userId); //linkQueryWrapper.eq(ProcessFbConsultationUserLink::getModuleOwnerId, userId);
userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper); userLinks = processFbConsultationUserLinkService.list(linkQueryWrapper);
if (CollectionUtils.isNotEmpty(userLinks)) { if (CollectionUtils.isNotEmpty(userLinks)) {
List<String> collect = userLinks.stream() List<String> collect = userLinks.stream()
laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
+1 -1
View File
@@ -87,7 +87,7 @@
AND standard.source = #{param.source} AND standard.source = #{param.source}
</if> </if>
<if test="param.responsibleDepartment != null and param.responsibleDepartment != ''"> <if test="param.responsibleDepartment != null and param.responsibleDepartment != ''">
AND standard.responsible_department = #{param.responsibleDepartment} AND standard.responsible_department LIKE CONCAT('%', #{param.responsibleDepartment}, '%')
</if> </if>
<if test="param.standardNumberOrName != null and param.standardNumberOrName != ''"> <if test="param.standardNumberOrName != null and param.standardNumberOrName != ''">
AND (standard.standard_number LIKE CONCAT('%', #{param.standardNumberOrName}, '%') AND (standard.standard_number LIKE CONCAT('%', #{param.standardNumberOrName}, '%')
laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java
+6 -3
View File
@@ -116,9 +116,12 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
private void sendMsgList(String templateCode, List<StandardEarlyWarning> distinctList, Boolean flag) { private void sendMsgList(String templateCode, List<StandardEarlyWarning> distinctList, Boolean flag) {
distinctList.forEach(data -> { distinctList.forEach(data -> {
String departId = data.getResponsibleDepartment(); String departId = data.getResponsibleDepartment();
LambdaQueryWrapper<SysUserDepart> queryWrapper = new LambdaQueryWrapper<>(); List<SysUserDepart> userDepartList = new ArrayList<>();
queryWrapper.eq(SysUserDepart::getDepId, departId); if (StringUtils.isNotBlank(departId)) {
List<SysUserDepart> userDepartList = userDepartService.list(queryWrapper); LambdaQueryWrapper<SysUserDepart> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SysUserDepart::getDepId, Arrays.asList(departId.split(",")));
userDepartList = userDepartService.list(queryWrapper);
}
if (CollectionUtils.isNotEmpty(userDepartList)) { if (CollectionUtils.isNotEmpty(userDepartList)) {
// 每个部门需要发消息的用户id集合 // 每个部门需要发消息的用户id集合
List<String> userIdList = userDepartList.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); List<String> userIdList = userDepartList.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());