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

yd-api/src/main/java/com/yd/rmi/ali/mail/service/impl/MailServiceImpl.java

@@ -43,11 +43,10 @@ public class MailServiceImpl implements MailService {
 
 	@Override
 	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");
 		String[] ccAddresses = new String[ccList.size()];
 		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 messageText = CommonUtil.currentIP()+"	"+warningMessage;
 		String imageFile = null;
@@ -70,11 +69,10 @@ public class MailServiceImpl implements MailService {
 	@Override
 	public void sysException(String warningSubject, String warningMessage) {
 //		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");
 		String[] ccAddresses = new String[ccList.size()];
 		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 messageText = CommonUtil.currentIP()+"	"+warningMessage;
 		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 {
 
     public static void main(String[] args){
     	AliMailInterfServiceImpl service = new AliMailInterfServiceImpl();
-    	String toAddress = "water.wang@autogeneral.cn";
-    	String[] ccAddresses = new String[]{"water.wang@autogeneral.cn","1034346366@qq.com"};
+    	String toAddress = "wenyang.yan@ydinsurance.cn";
+    	String[] ccAddresses = new String[]{"wenyang.yan@ydinsurance.cn","1034346366@qq.com"};
     	String subject = "您已成功通过安吉保购买保险产品";
     	String messageText = ""
     	+"尊敬的XX，您好!"

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

@@ -232,7 +232,8 @@
                                     and (b.approve_status > t.approve_step_id OR b.approve_status = 0)
                                 </when>
                                 <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>
                             </choose>
                         </if>