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 051fed665..d676a3854 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 @@ -522,4 +522,6 @@ public interface ItemDao extends BaseDao { void updateBatchBySerialNum(@Param("updateList") List updateList); List getItemListByAddress(Map params); + + List getevaluationList(Map params); } 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 ccfd7ae0a..c30237e83 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 @@ -4097,7 +4097,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); params.put("statDate", df.format(d)); } - List list = baseDao.getItemStatisListPage(params); + List list = new ArrayList<>(); + if(!params.isEmpty() && params.containsKey("evaluationScore") && null != params.get("evaluationScore")){ + list = baseDao.getevaluationList(params); + }else { + list = baseDao.getItemStatisListPage(params); + } + return new PageData<>(list, page.getTotal()); } 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 4b3ce3cbd..26fa60926 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 @@ -2881,6 +2881,46 @@ a.all_dept_ids ASC + + UPDATE epdc_item