Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.maintenance.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckRecordParam;
 import com.yeejoin.amos.maintenance.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
-import com.yeejoin.amos.maintenance.business.service.intfc.ISafety3DDataSendService;
 import com.yeejoin.amos.maintenance.business.util.*;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -463,13 +463,13 @@ public class PlanTaskController extends AbstractBaseController {
     @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse qryLoginUserPlanTask(
             @ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId,
-            @ApiParam(value = "开始日期") @RequestParam(value = "startTime") String startTime,
-            @ApiParam(value = "结束日期") @RequestParam(value = "endTime") String endTime,
+            @ApiParam(value = "开始日期",required = true) @RequestParam(value = "startDate") String startTime,
+            @ApiParam(value = "结束日期",required = true) @RequestParam(value = "endDate") String endTime,
             @ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus,
-            @ApiParam(value = "排序条件") @RequestParam(value = "orderBy") String orderBy,
+            @ApiParam(value = "排序条件") @RequestParam(value = "orderBy",defaultValue = "1") String orderBy,
             @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
-            @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
-            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
+            @ApiParam(value = "当前页", required =true) @RequestParam(value = "pageNumber") int pageNumber,
+            @ApiParam(value = "页大小", required =true) @RequestParam(value = "pageSize") int pageSize) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);

amos-boot-system-maintenance/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@ spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos_maintenance_v1.0?use
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties:
-eeureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
 
 security.password=a1234560
 security.loginId=jc_wjk006