Commit 90065ac3 authored by lisong's avatar lisong

修改导出bug

parent df258108
...@@ -168,6 +168,11 @@ ...@@ -168,6 +168,11 @@
<version>4.0.0</version> <version>4.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -2,6 +2,8 @@ package com.yeejoin.amos.patrol.business.param; ...@@ -2,6 +2,8 @@ package com.yeejoin.amos.patrol.business.param;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable; import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import java.util.List;
/** /**
* 计划执行查询参数 * 计划执行查询参数
* @author suhuiguang * @author suhuiguang
...@@ -68,6 +70,18 @@ public class PlanTaskPageParam extends CommonPageable { ...@@ -68,6 +70,18 @@ public class PlanTaskPageParam extends CommonPageable {
*/ */
private String userId; private String userId;
/**
* 人员编号
*/
private List<String> ids;
public List<String> getIds() {
return ids;
}
public void setIds(List<String> ids) {
this.ids = ids;
}
/** /**
* 单位 * 单位
......
...@@ -129,14 +129,14 @@ public class FileHelper { ...@@ -129,14 +129,14 @@ public class FileHelper {
* @param file * @param file
* @return * @return
*/ */
public static boolean isPPT2003(File file) { // public static boolean isPPT2003(File file) {
try ( InputStream is = new FileInputStream(file); // try ( InputStream is = new FileInputStream(file);
HSLFSlideShow ppt = new HSLFSlideShow(is);) { // // HSLFSlideShow ppt = new HSLFSlideShow(is);) {
} catch (Exception e) { // } catch (Exception e) {
return false; // return false;
} // }
return true; // return true;
} // }
/** /**
* *
......
...@@ -122,6 +122,12 @@ ...@@ -122,6 +122,12 @@
and a.org_code like #{orgCode} and a.org_code like #{orgCode}
</if> </if>
<if test="bizOrgCode!=null"> and d.biz_org_code like concat(#{bizOrgCode},'%') </if> <if test="bizOrgCode!=null"> and d.biz_org_code like concat(#{bizOrgCode},'%') </if>
<if test="ids != null ">
and b.id in
<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where> </where>
order by b.id order by b.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment