|
|
@@ -118,7 +118,6 @@ public class DatadetailController {
|
|
|
.select(WorkflowExtra.class, x -> VoToColumnUtil.fieldsToColumns(WorkflowExtra.class).contains(x.getProperty()))
|
|
|
.leftJoin(WorkflowSchema.class, WorkflowSchema::getId, WorkflowExtra::getSchemaId)
|
|
|
.leftJoin(DictionaryDetail.class, DictionaryDetail::getId, WorkflowSchema::getCategory)
|
|
|
- .orderByDesc("t.end_time")
|
|
|
);
|
|
|
|
|
|
|
|
|
@@ -586,7 +585,7 @@ public class DatadetailController {
|
|
|
" LEFT JOIN xjr_dictionary_detail t3 ON t1.item_type = t3.code" +
|
|
|
" AND t3.item_id = 1752140413593518081" +
|
|
|
" WHERE t2.status = 1";
|
|
|
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
if(startTime != null && endTime != null){
|
|
|
sql += " and t2.shen_qing_ri_qi4752 between '" + startTime.format(formatter) + "' and '" + endTime.format(formatter) + "'";
|
|
|
}
|