Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -1642,20 +1642,6 @@
 						<m:icon>iconfont icongongzuoliupeizhi1x</m:icon>
 					</m:function-node>
 					<m:function-node>
-						<m:id>587159b0-7e9b-4f0c-8296-1d670af6189f</m:id>
-						<m:name>enterpriseSettings</m:name>
-						<m:title>企业设置</m:title>
-						<m:index>8000</m:index>
-						<m:license></m:license>
-						<m:privilege></m:privilege>
-						<m:role>systemManagerRole</m:role>
-						<m:function-definition>
-							<m:view>function-enterpriseSettings</m:view>
-							<m:view-config></m:view-config>
-						</m:function-definition>
-						<m:icon>iconfont iconqiyeshezhi1x</m:icon>
-					</m:function-node>
-					<m:function-node>
 						<m:id>47f27d7f-eeb1-4485-87fc-e00ecfdf9995</m:id>
 						<m:name>billManage</m:name>
 						<m:title>报表设置</m:title>

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/PlanningCycleServiceImpl.java

@@ -54,7 +54,8 @@ public class PlanningCycleServiceImpl implements PlanningCycleService{
 	
 	
 	
-public UUID getPlanningCycleObjBySum(String planningCycle,Date date) {
+@Override
+public UUID getPlanningCycleObjBySum(String planningCycle, Date date) {
 	PlanningCycleEnum planningCycleType = null;
 	if (PlanningCycleEnum.DAY.name().equalsIgnoreCase(planningCycle)) {
 		planningCycleType = PlanningCycleEnum.DAY;
@@ -67,5 +68,4 @@ public UUID getPlanningCycleObjBySum(String planningCycle,Date date) {
 	return ID;
 	}
 
-	
 }

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

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

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/DinasTypeProductionStatisticsAdvQuery.jmx

@@ -12,7 +12,7 @@
 			<sql-type>SQL</sql-type>
 			<sql>
                 SELECT
-                bdt.dinasTypeName as typeName,sum(dtd.dinasWeight)/1000 as weight, bdt.type as typeType
+                bdt.dinasTypeName as typeName,sum(dtd.dinasWeight)/10000 as weight, bdt.type as typeType
                 FROM DinasType as bdt
                 LEFT JOIN ProductionPlanReportAssociateddinasTypeDetail as dtd on bdt.id = dtd.dinasType
                 LEFT JOIN ProductionPlanReport AS ppr on dtd.master = ppr.id

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/TransportRecordController.java

@@ -91,6 +91,4 @@ public class TransportRecordController {
         return ResponseObj.success("查询成功", byId);
     }
 
-
-
 }

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/VehicleDriverUserController.java

@@ -120,10 +120,10 @@ public class VehicleDriverUserController {
             @RequestParam(value = "vehicleId", required = false) UUID vehicleId,
             @RequestParam(value = "isOrderByPlanCycleType", required = false, defaultValue = "true") Boolean isOrderByPlanCycleType
     ) {
-        boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
-        if (a) {
-            return ResponseObj.error("请同时输入开始和结束时间");
-        }
+//        boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
+//        if (a) {
+//            return ResponseObj.error("请同时输入开始和结束时间");
+//        }
         DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser();
 
         Page<KObject> kObject = vehicleDriverUserService.pageByVehicleId(pageNo, pageSize, status, vehicleId, startDate, endDate, isOrderByPlanCycleType, driverUser.getId());
@@ -162,10 +162,10 @@ public class VehicleDriverUserController {
             @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(name = "endDate", required = false) Date endDate,
             @RequestParam(value = "vehicleId", required = false) UUID vehicleId
     ) {
-        boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
-        if (a) {
-            return ResponseObj.error("请同时输入开始和结束时间");
-        }
+//        boolean a = (startDate == null && endDate != null) || (startDate != null && endDate == null);
+//        if (a) {
+//            return ResponseObj.error("请同时输入开始和结束时间");
+//        }
         DriverUser driverUser = DriverUserContextHolder.getContext().getDriverUser();
 
         Page<Map<String, Object>> kObject = vehicleDriverUserService.transportRecordPage(pageNo, pageSize, vehicleId, startDate, endDate, driverUser.getId());