|
@@ -17,9 +17,7 @@ import com.kingdee.eas.util.app.DbUtil;
|
|
|
import com.kingdee.jdbc.rowset.IRowSet;
|
|
|
import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
|
|
|
import com.kingdee.shr.certificationservice.*;
|
|
|
-import com.kingdee.shr.certificationservice.app.CertificateStatusEnum;
|
|
|
import com.kingdee.shr.certificationservice.app.CertificationDrawUpMode;
|
|
|
-
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
|
|
@@ -31,7 +29,7 @@ import java.util.Date;
|
|
|
* 自动生成离职证明
|
|
|
* 20241121
|
|
|
*/
|
|
|
-public class AutoGenCertificationControllerBean extends AbstractAutoGenCertificationControllerBean
|
|
|
+public class AutoGenCertificationControllerBean extends AbstractAutoGenCertificationControllerBean
|
|
|
{
|
|
|
private static Logger logger =
|
|
|
Logger.getLogger("com.kingdee.eas.custom.certification.AutoGenCertificationControllerBean");
|
|
@@ -88,9 +86,9 @@ public class AutoGenCertificationControllerBean extends AbstractAutoGenCertific
|
|
|
.append( DateUtil.dateToString(endDate,"yyyy-MM-dd HH:mm:ss") )
|
|
|
.append(" ' )")
|
|
|
.append(" OR ( ")
|
|
|
- .append(" entry.fbizdate >= '")
|
|
|
+ .append(" bill.fbizdate >= '")
|
|
|
.append( DateUtil.dateToString(startDate,"yyyy-MM-dd HH:mm:ss") )
|
|
|
- .append("' AND entry.fbizdate <= '")
|
|
|
+ .append("' AND bill.fbizdate <= '")
|
|
|
.append( DateUtil.dateToString(endDate,"yyyy-MM-dd HH:mm:ss") )
|
|
|
.append(" ' ) ) ")
|
|
|
.append(" and bill.fid not in (select CFSouBillId from T_HR_HRCertificationBill where CFSouBillId is not null ) ");
|
|
@@ -125,9 +123,9 @@ public class AutoGenCertificationControllerBean extends AbstractAutoGenCertific
|
|
|
EntityViewInfo viewInfo = new EntityViewInfo();
|
|
|
FilterInfo filterInfo = new FilterInfo();
|
|
|
filterInfo.getFilterItems()
|
|
|
- .add(new FilterItemInfo("lastUpdateTime", DateUtil.getDateStartTime(startDate), CompareType.GREATER_EQUALS));
|
|
|
+ .add(new FilterItemInfo("bizDate", DateUtil.getDateStartTime(startDate), CompareType.GREATER_EQUALS));
|
|
|
filterInfo.getFilterItems()
|
|
|
- .add(new FilterItemInfo("lastUpdateTime", DateUtil.getDateEndTime(endDate), CompareType.LESS_EQUALS));
|
|
|
+ .add(new FilterItemInfo("bizDate", DateUtil.getDateEndTime(endDate), CompareType.LESS_EQUALS));
|
|
|
filterInfo.getFilterItems().add(new FilterItemInfo("certificationStatus", "103", CompareType.NOTEQUALS));
|
|
|
filterInfo.getFilterItems().add(new FilterItemInfo("isSign", true , CompareType.EQUALS));
|
|
|
filterInfo.getFilterItems().add(new FilterItemInfo("isAutoGen", true, CompareType.EQUALS));
|
|
@@ -176,9 +174,9 @@ public class AutoGenCertificationControllerBean extends AbstractAutoGenCertific
|
|
|
EntityViewInfo viewInfo = new EntityViewInfo();
|
|
|
FilterInfo filterInfo = new FilterInfo();
|
|
|
filterInfo.getFilterItems()
|
|
|
- .add(new FilterItemInfo("lastUpdateTime", DateUtil.getDateStartTime(startDate), CompareType.GREATER_EQUALS));
|
|
|
+ .add(new FilterItemInfo("bizDate", DateUtil.getDateStartTime(startDate), CompareType.GREATER_EQUALS));
|
|
|
filterInfo.getFilterItems()
|
|
|
- .add(new FilterItemInfo("lastUpdateTime", DateUtil.getDateEndTime(endDate), CompareType.LESS_EQUALS));
|
|
|
+ .add(new FilterItemInfo("bizDate", DateUtil.getDateEndTime(endDate), CompareType.LESS_EQUALS));
|
|
|
//101未开证明
|
|
|
//102已开
|
|
|
filterInfo.getFilterItems().add(new FilterItemInfo("certificationStatus", "101", CompareType.EQUALS));
|