手机端接口-获取当前登录人创建的接驳记录

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/dao/DischargingDao.java

@@ -38,4 +38,5 @@ public interface DischargingDao extends BaseDao {
 
     Double getAllDischargingWeightByYearAndSandAreaId(Date dischargingTime, UUID billId);
 
+    Page<KObject> queryPagingByCreator(Page<KObject> objectPage, Date startDate, Date endDate, UUID creatorId);
 }

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/DischargingDaoImpl.java

@@ -89,6 +89,26 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
     }
 
     @Override
+    public Page<KObject> queryPagingByCreator(Page<KObject> page, Date startDate, Date endDate, UUID creatorId) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(DischargingConstant.ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.add(Restrictions.eq(BaseConstants.CREATOR+"."+BaseConstants.ID,creatorId));
+        if (null != startDate) {
+            detachedCriteria.add(Restrictions.ge("dischargingTime", startDate));
+        }
+        if (null != endDate) {
+            detachedCriteria.add(Restrictions.le("dischargingTime", endDate));
+        }
+        detachedCriteria.addOrder(Order.desc("createTime"));
+        int offset = page.getPageSize() * (page.getPageNo() - 1);
+        page.setTotal(template.findByCriteria(detachedCriteria).size());
+        List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
+        page.setDatas(list);
+        return page;
+    }
+
+    @Override
     public List<HashMap<String, Object>> groupInfo(List<UUID> regionalCompanyIds, Integer year, Boolean isGroupByMonth, Boolean isGroupByRegionalCompany, Boolean isGroupBySandMiningArea) {
         DetachedCriteria detachedCriteria = getDetachedCriteria(null, null, DateTimeUtils.getYearStart(year), DateTimeUtils.getYearEnd(year), null, null, null, null, null, regionalCompanyIds);
         ProjectionList add = Projections.projectionList()
@@ -111,8 +131,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         detachedCriteria.setProjection(add);
 //        projL.add(Projections.sqlGroupProjection("day({alias}.dataHoraEnt) as day, month({alias}.dataHoraEnt) as month, year({alias}.dataHoraEnt) as year", "day({alias}.dataHoraEnt), month({alias}.dataHoraEnt), year({alias}.dataHoraEnt)", new String[]{"day","month", "year"}, (org.hibernate.type.Type[]) new Type[]{Hibernate.INTEGER, Hibernate.INTEGER, Hibernate.INTEGER}));
         detachedCriteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
-        List<HashMap<String, Object>> byCriteria = (List<HashMap<String, Object>>) template.findByCriteria(detachedCriteria);
-        return byCriteria;
+        return (List<HashMap<String, Object>>) template.findByCriteria(detachedCriteria);
     }
 
 

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/DischargingServiceImpl.java

@@ -65,6 +65,11 @@ public class DischargingServiceImpl implements DischargingService {
     }
 
     @Override
+    public Page<KObject> queryPagingByCreator(Page<KObject> objectPage, Date startDate, Date endDate, UUID creatorId) {
+        return dischargingDao.queryPagingByCreator(objectPage,startDate,endDate,creatorId);
+    }
+
+    @Override
     public UUID addDischarging(KObject kObject) {
         int type = kObject.getInt("type");
 

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/service/DischargingService.java

@@ -30,4 +30,7 @@ public interface DischargingService {
     Object groupInfo( UUID transportShipId, Integer type, Date startDate, Date endDate, Integer sandMiningAreaType, List<UUID> stationIds, UUID sandMiningAreaId, UUID sandMiningShipId, UUID parentId);
 
     Object groupInfoByYear(List<UUID> regionalCompanyIds, Integer year, Boolean isGroupByMonth, Boolean isGroupByRegionalCompany, Boolean isGroupBySandMiningArea);
+
+
+    Page<KObject> queryPagingByCreator(Page<KObject> objectPage, Date startDate, Date endDate, UUID creatorId);
 }

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/web/DischargingController.java

@@ -53,6 +53,22 @@ public class DischargingController {
         return ResponseObj.success("查询成功", dischargingService.queryByPaging(objectPage,transportShipId,type,startDate,endDate,sandMiningAreaType,stationIds,sandMiningAreaId,sandMiningShipId,parentId));
     }
 
+    @RequestMapping(value = "creator/page", method = RequestMethod.GET)
+    public ResponseObj getListByCreatorPage(
+            @RequestParam(name = "pageNo") Integer pageNo,
+            @RequestParam(name = "pageSize") Integer pageSize,
+            @RequestParam(name = "startDate", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date startDate,
+            @RequestParam(name = "endDate", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date endDate,
+            @RequestParam(name = "creatorId", required = false)UUID creatorId
+
+            )  {
+
+        Page<KObject> objectPage = new Page<>();
+        objectPage.setPageNo(pageNo);
+        objectPage.setPageSize(pageSize);
+        return ResponseObj.success("查询成功", dischargingService.queryPagingByCreator(objectPage,startDate,endDate,creatorId));
+    }
+
     @RequestMapping(value = "list/groupInfo", method = RequestMethod.GET)
     public ResponseObj groupInfo(
             @RequestParam(name = "type", required = false) Integer type,