diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index a4ee0fe32..e7f3c3237 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -551,6 +551,10 @@ public interface ItemDao extends BaseDao { List getsolutionList(Map params); + List getreplyList(Map params); + + List getresponseList(Map params); + ResponseTotalPieResultDTO responseSixHoursTotal(ScreenTotalFormDTO formDTO); ResponseTotalPieResultDTO replyTotal(ScreenTotalFormDTO formDTO); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 7691372ce..c4a57811f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4563,6 +4563,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem list = baseDao.getevaluationList(params); } else if (!params.isEmpty() && params.containsKey("solutionInfo") && null != params.get("solutionInfo")) { list = baseDao.getsolutionList(params); + } else if (!params.isEmpty() && params.containsKey("reply") && null != params.get("reply")) { + list = baseDao.getreplyList(params); + } else if (!params.isEmpty() && params.containsKey("response") && null != params.get("response")) { + list = baseDao.getresponseList(params); } else { list = baseDao.getItemStatisListPage(params); @@ -5349,7 +5353,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = new ArrayList<>(); ResponseTotalPieResultDTO dtoResonse = baseDao.responseSixHoursTotal(formDTO); ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); - dtoResonseNo.setName("未按期响应率"); + dtoResonseNo.setName("未按期响应"); if (dtoResonse.getValue()!=null){ dtoResonseNo.setValue(dtoResonse.getTotal()-dtoResonse.getValue()); }else{ @@ -5369,7 +5373,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = new ArrayList<>(); ResponseTotalPieResultDTO dtoResonse = baseDao.replyTotal(formDTO); ResponseTotalPieResultDTO dtoResonseNo = new ResponseTotalPieResultDTO(); - dtoResonseNo.setName("未按时恢复"); + dtoResonseNo.setName("未按时回复"); if (dtoResonse.getValue()!=null){ dtoResonseNo.setValue(dtoResonse.getTotal()-dtoResonse.getValue()); }else{ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 26d7c6258..fde56f932 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -3216,7 +3216,7 @@ resultType="com.elink.esua.epdc.dto.item.result.ResponseTotalPieResultDTO"> SELECT - '按期响应率' as name, + '按期响应' as name, COUNT( IF (getworkminute(b.CREATED_TIME,a.CREATED_TIME) <= 480 ,1, NULL )) as value, @@ -3243,7 +3243,7 @@ + +