|
@ -3353,7 +3353,10 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
sf.setSignYear(DateUtil.getSignYear() + "");
|
|
|
sf.setIsValid(0);
|
|
|
sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
|
|
|
//sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
|
|
|
sf.setBegin(new Date());
|
|
|
sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear() + 1 + "-06-30 23:59:59", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
//设置转签原因
|
|
|
if (StringUtils.isNotBlank(reason)) {
|
|
@ -3545,7 +3548,8 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
sf.setSignYear(year + "");
|
|
|
|
|
|
sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
//sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
sf.setBegin(new Date());
|
|
|
sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear() + 1 + "-06-30 23:59:59", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
|
|
|
if (StringUtils.isNotBlank(reason)) {
|