Merge remote-tracking branch 'origin/master'

jiangping

2025-04-23 1c4de3dad5e7c505f08cd6020d29b84a60668b02

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -493,7 +493,7 @@
        approveList.add(createUserApprove);

        //查询所有待处理人
        String token = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
//        String token = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
        //审批业务数据
        for (int i = 0; i < approveParamList.size(); i++) {
            ApproveParam approveParam = approveParamList.get(i);
@@ -600,8 +600,7 @@
                            wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
                                    wxNoticeConfigMapper,
                                    platformBooksMapper.selectById(businessId),
                                    WxPlatConstants.platformBookContent.platformBookWaitAudit,
                                    token,
                                    WxPlatConstants.platformBookContent.platformBookWaitAudit, 
                                    Arrays.asList(member.getSystemOpenid().split(",")),
                                    Constants.ONE);
                        }
@@ -617,7 +616,6 @@
                        if(StringUtils.isNotBlank(member.getSystemOpenid())){
                            wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                                    wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
                                    token,
                                    Arrays.asList(member.getSystemOpenid().split(","))
                            );
                        }
@@ -632,7 +630,6 @@
                        if(StringUtils.isNotBlank(member.getSystemOpenid())){
                            wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                                    wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
                                    token,
                                    Arrays.asList(member.getSystemOpenid().split(","))
                            );
                        }
@@ -654,7 +651,6 @@
                                            wxNoticeConfigMapper,
                                            carUseBookMapper.selectById(businessId),
                                            WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
                                            token,
                                            Arrays.asList(member.getSystemOpenid().split(",")),
                                            Constants.ONE);
                                }
@@ -1444,7 +1440,6 @@
                        wxNoticeConfigMapper,
                        platformBooksMapper.selectById(approveDTO.getObjId()),
                        WxPlatConstants.platformBookContent.platformBookWaitAudit,
                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                        openIdList,
                        Constants.ONE);
            }
@@ -1468,8 +1463,7 @@
                        //发送微信公众号通知
                        wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
                                wxNoticeConfigMapper,carUseBook,
                                WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                WxPlatConstants.carUseBookContent.carUseBookWaitAudit, 
                                openIdList,1);
                    }
                }
@@ -1495,7 +1489,6 @@
                        wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                                wxNoticeConfigMapper,visitsMapper.selectById(approveDTO.getObjId()),
                                approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?WxPlatConstants.visitReportContent.visitReportWaitAudit:WxPlatConstants.visitContent.visitWaitAudit,
                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                openIdList
                        );
                    }
@@ -1752,7 +1745,6 @@
                if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
                    wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                            wxNoticeConfigMapper,visits, objCode,
                            systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                            Arrays.asList(visits.getOpenid().split(","))
                    );
                }
@@ -1779,7 +1771,6 @@
                    wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
                            wxNoticeConfigMapper,carUseBook,
                            Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.carUseBookContent.carUseBookAuditSuccess: WxPlatConstants.carUseBookContent.carUseBookAuditFail,
                            systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                            Arrays.asList(systemUser.getOpenid().split(",")),0);
                }
            }
@@ -1850,7 +1841,6 @@
                wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
                        wxNoticeConfigMapper, platformBooks,
                        Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                        Arrays.asList(driver.getOpenid().split(",")),0);
            }