手机端 开始时间格式

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

@@ -93,6 +93,9 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         KClass bean = Amino.getStaticMetadataContext().getBean(DischargingConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        if(null==creatorId){
+            creatorId=AminoContextHolder.getContext().getStaff().getUuid(BaseConstants.ID);
+        }
         detachedCriteria.add(Restrictions.eq(BaseConstants.CREATOR+"."+BaseConstants.ID,creatorId));
         if (null != startDate) {
             detachedCriteria.add(Restrictions.ge("dischargingTime", startDate));
@@ -224,6 +227,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
 
     @Override
     public List<KObject> getParentByDateAndStationAndSandMiningArea(UUID stationId, UUID sandMiningAreaId, Date dischargingTime, UUID sandMiningShip, UUID transportShip) {
+
         KClass bean = Amino.getStaticMetadataContext().getBean(DischargingConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
@@ -232,7 +236,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
                 .add(Restrictions.eq("station.id", stationId))
                 .add(Restrictions.eq("sandMiningShip.id", sandMiningShip))
                 .add(Restrictions.eq("type", DischargingTypeEnum.REVISE_DATA.getValue()))
-                .add(Restrictions.sqlRestriction(" discharging_time like '" + DateUtil.convertDateToString1(dischargingTime) + "%'"));
+                .add(Restrictions.sqlRestriction(" discharging_time like '" + DateUtil.convertDateToString1(DateTimeUtils.getStartDateTimeOfMonth(dischargingTime)) + "%'"));
 
         return (List<KObject>) template.findByCriteria(detachedCriteria);
     }

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

@@ -57,8 +57,8 @@ public class DischargingController {
     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 = "startDate", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd")Date startDate,
+            @RequestParam(name = "endDate", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd")Date endDate,
             @RequestParam(name = "creatorId", required = false)UUID creatorId
 
             )  {