优化更新

src/com/kingdee/eas/custom/wamke/affair/service/PreResignNoticeService.java

@@ -105,9 +105,14 @@ public class PreResignNoticeService extends AbstractResignNoticeService {
                 " AND emp.FAssignType = 1 " +
                 " LEFT JOIN t_org_admin adm ON emp.FAdminOrgID = adm.fid " +
                 " LEFT JOIN t_org_admin comp ON emp.FCompanyID = comp.fid " +
+                //20260331, 反馈有离职的人还是收到了邮件,加入判断,如果员工非S11,则不进行通知了
+                " LEFT JOIN T_HR_EmpLaborRelation ELR ON person.fid = ELR.FPERSONID  " +
+                " LEFT JOIN T_HR_BDEmployeeType BDET ON ELR.FLaborRelationStateID = BDET.FID " +
+
                 " WHERE entrys.CFPreResignDate >= '" + startStr + "' " +
                 " AND entrys.CFPreResignDate <= '" + endStr + "'" + 
-                " AND resign.FBillState in ( '1','2')  ";
+                " AND resign.FBillState in ( '1','2')  " +
+                " AND BDET.FNUMBER = 'S11'  " ;
     }
     
     private Date calculateTargetDate(String curDate, int offSet) {

src/com/kingdee/eas/hr/customextend/server/PreResignServer.java

@@ -259,6 +259,8 @@ public class PreResignServer {
 	    sql.append("WHERE P.FID IS NOT NULL \n");
 	    sql.append("    AND BDET.FNUMBER = 'S11' \n");
 	    sql.append("    AND ELR.FEFFDT <= '").append(targetDate).append("' \n");
+		// 20260325
+		sql.append("    AND ELR.FIsLatestInAday = '1'  \n");
 	    sql.append("    AND EXISTS ( \n");
 	    sql.append("        SELECT 1 FROM T_HR_EmpLaborRelation ELR2 \n");
 	    sql.append("        LEFT JOIN T_HR_BDEmployeeType BDET2 ON ELR2.FLaborRelationStateID = BDET2.FID \n");
@@ -556,8 +558,12 @@ public class PreResignServer {
 //	    			billInfo.setIsFromSSC(false);
 	    			billInfo.setIsMultiEntry(Boolean.TRUE);
 	    			billInfo.setExtendedProperty("isAddNew", "isAddNew");
-	    			
-	    			ResignBizBillFactory.getLocalInstance(ctx).submitEffect(billInfo);
+	    			try {
+						ResignBizBillFactory.getLocalInstance(ctx).submitEffect(billInfo);
+	    			} catch (Exception e) {
+	    				logger.error("SHRBillUtil.createResignationBill err", e);
+					}
+
 	    	} 
 	    	
 	    }