|
|
@@ -429,9 +429,9 @@ public class DataboardController {
|
|
|
}
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
RepairStatisticsVo result = new RepairStatisticsVo();
|
|
|
- String sql = "SELECT t1.* FROM wf_repair_declaration t1" +
|
|
|
+ String sql = "SELECT t1.is_artificial,t2.current_state FROM wf_repair_declaration t1" +
|
|
|
" INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
|
|
|
- " WHERE t2.current_state = 'COMPLETED'";
|
|
|
+ " WHERE 1 = 1 ";
|
|
|
if(startTime != null && endTime != null){
|
|
|
sql += " and t1.application_time between '" + startTime.format(formatter) + "' and '" + endTime.format(formatter) + "'";
|
|
|
}
|
|
|
@@ -442,8 +442,8 @@ public class DataboardController {
|
|
|
int personCount = 0;
|
|
|
|
|
|
for (Map<String, Object> objectMap : list) {
|
|
|
- Object statusObj = objectMap.get("maintenance_feedback");
|
|
|
- if(statusObj != null && !statusObj.toString().isEmpty()){
|
|
|
+ Object statusObj = objectMap.get("current_state");
|
|
|
+ if(HistoricProcessInstance.STATE_COMPLETED.equals(statusObj.toString())){
|
|
|
completeCount ++;
|
|
|
}else{
|
|
|
uncompleteCount ++;
|