更新sql

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

@@ -1082,9 +1082,9 @@ public class PlanTaskController extends AbstractBaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "idx消防巡查报表调用", notes = "idx消防巡查报表调用")
     @RequestMapping(value = "/report/info", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse getPlanTaskInfoList(@ApiParam(value = "站编码") @RequestParam String bizOrgCode,
-            @ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
-            @ApiParam(value = "结束日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+    public CommonResponse getPlanTaskInfoList(@ApiParam(value = "站编码") @RequestParam(required = false) String bizOrgCode,
+            @ApiParam(value = "开始日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+            @ApiParam(value = "结束日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
         try {
             Map<String, Object> map = planTaskService.queryPatrolInfoList(bizOrgCode, startDate, endDate);
             return CommonResponseUtil.success(map);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1486,7 +1486,7 @@
 			LEFT JOIN p_route r ON r.id = pt.route_id
 			<where>
 				<if test="bizOrgCode != null">
-					pt.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
+					p.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
 				</if>
 				<if test="startDate != null">
 					AND DATE_FORMAT(pt.end_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')