薪资包更新

GDYSL/websrc/com/kingdee/customer/salary/handler/SalaryBagEditHandler.java

@@ -30,7 +30,6 @@ import com.kingdee.eas.custom.bill.salary.SalaryBagEntryInfo;
 import com.kingdee.eas.custom.bill.salary.SalaryBagFactory;
 import com.kingdee.eas.custom.bill.salary.SalaryBagInfo;
 import com.kingdee.eas.framework.CoreBaseInfo;
-import com.kingdee.eas.hr.affair.EmpEnrollBizBillEntryInfo;
 import com.kingdee.eas.hr.base.HRBillStateEnum;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
@@ -41,7 +40,7 @@ import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
 import com.kingdee.shr.base.syssetting.util.MetaDataUtil;
 import com.kingdee.shr.base.syssetting.web.handler.EditHandler;
 import com.kingdee.shr.base.syssetting.web.json.JSONUtils;
-import com.kingdee.shr.compensation.CmpItemInfo;
+
 
 /**
  * 工资包
@@ -174,6 +173,7 @@ public class SalaryBagEditHandler extends EditHandler{
 			BigDecimal remainder = new BigDecimal(0);
 			//补发月应发金额
 			BigDecimal amountPayable = new BigDecimal(0);
+			BigDecimal lastPay = new BigDecimal(0);
 			for(int i = 0 ; i <  monthList.size() ; i ++) {
 				Map<String,Object> entryMap = new HashMap<String, Object>();
 				Date months = monthList.get(i);
@@ -200,19 +200,17 @@ public class SalaryBagEditHandler extends EditHandler{
 					entryMap.put("reissueAmount", 0);
 					//应发金额
 					entryMap.put("amountPayable", amountPayable.add(avgAmount));
-				}else if(monthList.get(i).after(reissueDate)) {
-					//应发金额
+				}else if(monthList.get(i).after(reissueDate)) {//后面的
 					entryMap.put("amountPayable", avgAmount);
-					//补发金额
-					entryMap.put("reissueAmount", 0);
-				}else {
+					entryMap.put("reissueAmount", Integer.valueOf(0));
+				}else { //前面的
 					entryMap.put("amountPayable", 0);
 					//补发金额
 					entryMap.put("reissueAmount", avgAmount.subtract(beforeAmount));
 					//总应发差额
 					amountPayable = amountPayable.add(avgAmount.subtract(beforeAmount));
 				}
-				System.out.print("月份result========="+entryMap);
+				logger.error("月份result========="+entryMap);
 				resultList.add(entryMap);	
 			}
 			JSONUtils.writeJson(response, resultList);
@@ -371,10 +369,9 @@ public class SalaryBagEditHandler extends EditHandler{
 	    	String updateSql = "update CT_SAL_SalaryBag set FBillState = '1' where fid = '"+ demoInfo.getSourceBillId() +"'";
 			System.out.print("变更单据状态更新========="+updateSql);
 	    	DbUtil.execute(ctx, updateSql);
-	    	
-	    	String deleteSql = "delete from CT_SAL_SalaryBag where fid = '"+ demoInfo.getSourceBillId() +"'";
-			System.out.print("删除工资包SQL========="+deleteSql);
-	    	DbUtil.execute(ctx, deleteSql);
+//	        String deleteSql = "delete from CT_SAL_SalaryBag where fid = '" + demoInfo.getSourceBillId() + "'";
+//	        System.out.print( deleteSql);
+//	        DbUtil.execute(ctx, deleteSql);
 	    }
 	    String id = model.getId().toString();
 	    writeSuccessData(id);