修改巡检导出增加参数

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

@@ -225,15 +225,14 @@ public class PlanTaskController extends AbstractBaseController {
     @ApiOperation(value = "执行计划导出", notes = "执行计划导出")
     @GetMapping (value = "/reportPlanTaskNew", produces = "application/vnd.ms-excel;charset=UTF-8")
     public void planTaskReportNew(
-            @ApiParam(value = "导出参数", required = false) @RequestBody(required = false)PlanTaskPageParam params,
+            @ApiParam(value = "导出参数", required = false) PlanTaskPageParam params,
 
             HttpServletResponse response) {
         try {
-            PlanTaskPageParam paramsk =new PlanTaskPageParam();
             ReginParams reginParams = getSelectedOrgInfo();
-            paramsk.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+            params.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
 
-            List<PlanTaskVo> list = planTaskService.planTaskReportNew(paramsk);
+            List<PlanTaskVo> list = planTaskService.planTaskReportNew(params);
             String fileName = "计划执行" + new Date().getTime();
             FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response);
         } catch (Exception e) {

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

@@ -22,15 +22,15 @@
 <!--	          OR-->
 <!--	       	(<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
 <!--	        )-->
-			<if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
+			<if test="beginDate!=null and endDate!=null and endDate != '' and beginDate != ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate==null and endDate != null and endDate != ''">
+			<if test="beginDate=='' and endDate != null and endDate != ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate!=null and beginDate != '' and endDate == null">
+			<if test="beginDate!=null and beginDate != '' and endDate == ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
 
 			</if>
@@ -104,15 +104,15 @@
 <!--	       	(<if test="beginDate!=null and endDate!=null">a.begin_Time <![CDATA[<=]]> #{beginDate} AND a.end_Time <![CDATA[>=]]> #{endDate}</if>)-->
 <!--	        )-->
 
-			<if test="beginDate!=null and endDate!=null and endDate != '' and endDate == null">
+			<if test="beginDate!=null and endDate!=null and endDate != '' and beginDate != ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate} AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate==null and endDate != null and endDate != ''">
+			<if test="beginDate=='' and endDate != null and endDate != ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
 
 			</if>
-			<if test="beginDate!=null and beginDate != '' and endDate == null">
+			<if test="beginDate!=null and beginDate != '' and endDate == ''">
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
 
 			</if>