mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into app-restrict-10165
This commit is contained in:
commit
c1d5ecf0d4
@ -177,12 +177,12 @@ public class SQLServerOperationDAOImpl extends GenericOperationDAOImpl {
|
|||||||
operation = new Operation();
|
operation = new Operation();
|
||||||
operation.setId(rs.getInt("ID"));
|
operation.setId(rs.getInt("ID"));
|
||||||
operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
|
operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
|
||||||
operation.setCreatedTimeStamp(new Timestamp(rs.getLong("CREATED_TIMESTAMP") * 1000L).toString());
|
operation.setCreatedTimeStamp(new Timestamp(rs.getLong("CREATED_TIMESTAMP") * 1000L).toInstant().toString());
|
||||||
if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
|
if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
|
||||||
operation.setReceivedTimeStamp("");
|
operation.setReceivedTimeStamp("");
|
||||||
} else {
|
} else {
|
||||||
operation.setReceivedTimeStamp(
|
operation.setReceivedTimeStamp(
|
||||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toInstant().toString());
|
||||||
}
|
}
|
||||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||||
operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
|
operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user