yuanzhi_kuang 2 mesiacov pred
rodič
commit
e9539cc38c

+ 67 - 17
GDYSL/src/com/kingdee/eas/hr/affair/app/ResignBizBillControllerBeanEx.java

@@ -9,32 +9,24 @@ import com.kingdee.eas.basedata.person.PersonFactory;
 import com.kingdee.eas.basedata.person.PersonInfo;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.facade.leave.LeaveAllowanceFacadeFactory;
+import com.kingdee.eas.custom.facade.plurality.IPluralitySubFacade;
+import com.kingdee.eas.custom.facade.plurality.PluralitySubFacadeFactory;
 import com.kingdee.eas.custom.utils.SendUtils;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.hr.affair.*;
 import com.kingdee.eas.hr.base.HRBillBaseEntryInfo;
 import com.kingdee.eas.mobile.BOSMsgTypeEnum;
 import com.kingdee.eas.mobile.PriorityEnum;
-import com.kingdee.eas.rpts.ctrlreport.osf.OSFExecutor;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
 import com.kingdee.util.DateTimeUtils;
-
 import java.sql.SQLException;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.hadoop.hive.ql.parse.HiveParser_IdentifiersParser.booleanValue_return;
 import org.apache.log4j.Logger;
 
 /**
@@ -88,23 +80,32 @@ public class ResignBizBillControllerBeanEx extends ResignBizBillControllerBean{
         //离职后更新薪酬结构失效日期
         for (int i = 0; i < entryCollection.size(); i++) {
         	HRAffairBizBillEntryInfo affairEntry = (HRAffairBizBillEntryInfo)entryCollection.get(i);
+           	//兼职终止单; 202503
+        	createPDelFromEntry(ctx, entryCollection.get(i));
         	String personId = affairEntry.getPerson().getId().toString();
         	String sql = "/*dialect*/update T_HR_SFixAdjustSalary a set CFHisLeffectDay = FLeffectDay,FLeffectDay = b.FBIZDATE from T_HR_ResignBizBillEntry b where a.FPERSONID = b.FPERSONID and a.FLEFFECTDAY > b.FBIZDATE and a.FPERSONID = '"+personId+"'";
         	logger.error("更新薪酬结构失效日期SQL:"+sql);
         	DbUtil.execute(ctx, sql);
         }
+        
+        //邮件发送移动至此方法;
+        try {
+			sendResignMessage(ctx, entryCollection);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
     }
     
     @Override
     protected IObjectPK _submitEffect(Context ctx, CoreBaseInfo model) throws BOSException, EASBizException {
     	IObjectPK objectPk = super._submitEffect(ctx, model);
-    	ResignBizBillInfo resignBizBillInfo = ResignBizBillFactory.getLocalInstance(ctx).getResignBizBillInfo(objectPk);
-    	ResignBizBillEntryCollection entrys = resignBizBillInfo.getEntrys();
-    	try {
-			sendResignMessage(ctx, entrys);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+//    	ResignBizBillInfo resignBizBillInfo = ResignBizBillFactory.getLocalInstance(ctx).getResignBizBillInfo(objectPk);
+//    	ResignBizBillEntryCollection entrys = resignBizBillInfo.getEntrys();
+//    	try {
+//			sendResignMessage(ctx, entrys);
+//		} catch (SQLException e) {
+//			e.printStackTrace();
+//		}
     	return objectPk;
     }
     
@@ -179,6 +180,8 @@ public class ResignBizBillControllerBeanEx extends ResignBizBillControllerBean{
                 }
             }, 2, TimeUnit.MINUTES);
         }
+ 
+        
     }
 
     /**
@@ -211,4 +214,51 @@ public class ResignBizBillControllerBeanEx extends ResignBizBillControllerBean{
         	DbUtil.execute(ctx, sql);
         }
     }
+    
+    
+    
+    /**
+     * 创建兼职终止单
+     * 202503
+     * @throws BOSException 
+     * @throws EASBizException 
+     */
+    private void createPDelBizBill(Context ctx, BOSUuid billId) throws EASBizException, BOSException {
+    	//兼职单与兼职终止的关系;
+    	//人员 , 开始时间, 职位,部门,  兼职时薪
+		ResignBizBillInfo billInfo = ResignBizBillFactory.getLocalInstance(ctx).getResignBizBillInfo(new ObjectUuidPK(billId));
+		ResignBizBillEntryCollection entrys = billInfo.getEntrys();
+		if(entrys.size()>0){
+			ResignBizBillEntryInfo resignBizBillEntryInfo = entrys.get(0);
+			createPDelFromEntry(ctx, resignBizBillEntryInfo);
+		}
+    	
+    }
+    
+    /**
+     * 根据离职单分录的数据生成兼职单
+     * @param ctx
+     * @param resignBizBillEntryInfo
+     * @throws BOSException
+     * @throws EASBizException
+     */
+    private void  createPDelFromEntry(Context ctx, ResignBizBillEntryInfo resignBizBillEntryInfo) throws BOSException, EASBizException {
+    	String personId = resignBizBillEntryInfo.getPerson().getId().toString();
+		Date bizDate = resignBizBillEntryInfo.getBizDate();
+        String dateStr   = DateTimeUtils.format(bizDate, "yyyy-MM-dd");
+		IPluralitySubFacade pluralityIns = PluralitySubFacadeFactory.getLocalInstance(ctx);
+		pluralityIns.resignCreateEnd(personId, dateStr);
+    }
+    
+    @Override
+    protected void _entryEffectCommon(Context ctx, BOSUuid billId) throws BOSException, EASBizException {
+    	super._entryEffectCommon(ctx, billId);
+    	
+
+	}
+    
+    
+   
+    
+    
 }