Merge branch 'develop_dl_plan6_temp_merge_colony' of…

.idea/libraries/Maven__org_typroject_tyboot_component_cache_1_1_20Ty_SNAPSHOT.xml

-<component name="libraryTable">
-  <library name="Maven: org.typroject:tyboot-component-cache:1.1.20Ty-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/typroject/tyboot-component-cache/1.1.20Ty-SNAPSHOT/tyboot-component-cache-1.1.20Ty-SNAPSHOT.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/typroject/tyboot-component-cache/1.1.20Ty-SNAPSHOT/tyboot-component-cache-1.1.20Ty-SNAPSHOT-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/typroject/tyboot-component-cache/1.1.20Ty-SNAPSHOT/tyboot-component-cache-1.1.20Ty-SNAPSHOT-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

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

@@ -242,9 +242,8 @@ public class PlanTaskController extends AbstractBaseController {
         try {
             PlanTaskPageParam paramsk =new PlanTaskPageParam();
             ReginParams reginParams = getSelectedOrgInfo();
-            paramsk.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
-
-            List<PlanTaskVo> list = planTaskService.planTaskReportNew(paramsk);
+            params.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+            List<PlanTaskVo> list = planTaskService.planTaskReportNew(params);
             String fileName = "计划执行" + new Date().getTime();
             FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response);
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/PlanTaskPageParam.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.patrol.business.param;
 
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 
+import java.util.List;
+
 /**
  * 计划执行查询参数
  * @author suhuiguang
@@ -50,6 +52,20 @@ public class PlanTaskPageParam extends CommonPageable {
 
 
 	/**
+	 * 计划批号
+	 */
+	private List<String> ids;
+
+	public List<String> getIds() {
+		return ids;
+	}
+
+	public void setIds(List<String> ids) {
+		this.ids = ids;
+	}
+
+
+	/**
 	 *  单位
 	 * */
 	private String bizOrgCode;

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

@@ -144,8 +144,14 @@
 		<if test="routeId!=null"> and a.route_id = #{routeId}</if>
 		<if test="orgCode!=null">
 		 and a.org_code like #{orgCode}
-		 </if>
-			<if test="bizOrgCode!=null"> and d.biz_org_code  like concat(#{bizOrgCode},'%') </if>
+		</if>
+		<if test="ids!=null">
+			and b.id in
+			<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<if test="bizOrgCode!=null"> and d.biz_org_code  like concat(#{bizOrgCode},'%') </if>
 		</where>
 		order by b.id