|
|
@@ -188,7 +188,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
cl.setRecordTime(now.getTime());
|
|
|
- cl.setStatus(ContractStatus.CREATE.getCode());
|
|
|
+ cl.setStatus(c.getStatus());
|
|
|
cl.setCid(c.getId());
|
|
|
return cl;
|
|
|
}
|
|
|
@@ -221,15 +221,9 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
|
|
|
c.setSignDate(signDate);
|
|
|
contractMapper.updateByPrimaryKeySelective(c);
|
|
|
|
|
|
- /*ContractLog clog = disposeContractLog(c);
|
|
|
- clog.setStatus(ContractStatus.SIGN.getCode());
|
|
|
- clog.setRecordTime(signDate);
|
|
|
- clog.setOperator(TokenManager.getAdminId());
|
|
|
- clog.setPrincipal(TokenManager.getAdminId());*/
|
|
|
|
|
|
List<ContractLog> logs = new ArrayList<>();
|
|
|
List<Notice> notice = new ArrayList<>();
|
|
|
- //logs.add(clog);
|
|
|
|
|
|
for (int i = 0; i < principals.length; i++) {
|
|
|
ContractLog log = disposeContractLog(c);
|