Skip to content

Y
yd-backend
Commit 27286a49 by wenyang Committed by jianan
Options

AGMS增加经纪人报聘信息的查询与导出,在原有‘审批流程’页面上增加查询条件（申请开始日期，申请结束日期）

parent c9019188
Showing with 6 additions and 7 deletions
yd-api/src/main/java/com/yd/rmi/ali/mail/service/impl/MailServiceImpl.java
...@@ -43,11 +43,10 @@ public class MailServiceImpl implements MailService { ...@@ -43,11 +43,10 @@ public class MailServiceImpl implements MailService {
@Override @Override
public void sysWarning(String warningSubject,String warningMessage) { public void sysWarning(String warningSubject,String warningMessage) {
String toAddress = "simon.cheng@ydinsurance.cn"; String toAddress = "wenyang.yan@ydinsurance.cn";
List<String> ccList = systemConfigService.getListConfigValue("SysWarningCCAddress"); List<String> ccList = systemConfigService.getListConfigValue("SysWarningCCAddress");
String[] ccAddresses = new String[ccList.size()]; String[] ccAddresses = new String[ccList.size()];
ccList.toArray(ccAddresses); ccList.toArray(ccAddresses);
// String[] ccAddress = new String[]{"water.wang@autogeneral.cn","sweet.zhang@autogeneral.cn","jerold.chen@autogeneral.cn"};
String subject = "【"+ SpringContextUtil.getEnvironmentName()+"环境】"+warningSubject; String subject = "【"+ SpringContextUtil.getEnvironmentName()+"环境】"+warningSubject;
String messageText = CommonUtil.currentIP()+" "+warningMessage; String messageText = CommonUtil.currentIP()+" "+warningMessage;
String imageFile = null; String imageFile = null;
...@@ -70,11 +69,10 @@ public class MailServiceImpl implements MailService { ...@@ -70,11 +69,10 @@ public class MailServiceImpl implements MailService {
@Override @Override
public void sysException(String warningSubject, String warningMessage) { public void sysException(String warningSubject, String warningMessage) {
// if("prod".equals(SpringContextUtil.getActiveProfile())){ // if("prod".equals(SpringContextUtil.getActiveProfile())){
String toAddress = "water.wang@ydinsurance.cn";//"simon.cheng@autogeneral.cn"; String toAddress = "wenyang.yan@ydinsurance.cn";//"simon.cheng@autogeneral.cn";
List<String> ccList = systemConfigService.getListConfigValue("SysWarningCCAddress"); List<String> ccList = systemConfigService.getListConfigValue("SysWarningCCAddress");
String[] ccAddresses = new String[ccList.size()]; String[] ccAddresses = new String[ccList.size()];
ccList.toArray(ccAddresses); ccList.toArray(ccAddresses);
// String[] ccAddress = new String[]{"water.wang@autogeneral.cn","sweet.zhang@autogeneral.cn","jerold.chen@autogeneral.cn"};
String subject = "【"+SpringContextUtil.getEnvironmentName()+"环境】"+warningSubject; String subject = "【"+SpringContextUtil.getEnvironmentName()+"环境】"+warningSubject;
String messageText = CommonUtil.currentIP()+" "+warningMessage; String messageText = CommonUtil.currentIP()+" "+warningMessage;
String imageFile = null; String imageFile = null;
......
yd-api/src/main/java/com/yd/rmi/ali/mailinterf/service/impl/AliMailInterfServiceImpl.java
...@@ -226,8 +226,8 @@ public class AliMailInterfServiceImpl implements AliMailInterfService { ...@@ -226,8 +226,8 @@ public class AliMailInterfServiceImpl implements AliMailInterfService {
public static void main(String[] args){ public static void main(String[] args){
AliMailInterfServiceImpl service = new AliMailInterfServiceImpl(); AliMailInterfServiceImpl service = new AliMailInterfServiceImpl();
String toAddress = "water.wang@autogeneral.cn"; String toAddress = "wenyang.yan@ydinsurance.cn";
String[] ccAddresses = new String[]{"water.wang@autogeneral.cn","1034346366@qq.com"}; String[] ccAddresses = new String[]{"wenyang.yan@ydinsurance.cn","1034346366@qq.com"};
String subject = "您已成功通过安吉保购买保险产品"; String subject = "您已成功通过安吉保购买保险产品";
String messageText = "" String messageText = ""
+"尊敬的XX，您好!" +"尊敬的XX，您好!"
......
yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
...@@ -232,7 +232,8 @@ ...@@ -232,7 +232,8 @@
and (b.approve_status > t.approve_step_id OR b.approve_status = 0) and (b.approve_status > t.approve_step_id OR b.approve_status = 0)
</when> </when>
<when test='status == "2" '> <when test='status == "2" '>
and b.approve_status &lt;= t.approve_step_id and b.approve_status != 0 and b.approve_status != 0 and t.approving_status = 0 and (b.approve_status &lt;= t.approve_step_id or b.approve_status is null)
<!-- and (t.approving_status = 0 or b.approve_status < t.approve_step_id or b.approve_status is null) -->
</when> </when>
</choose> </choose>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment