Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
90065ac3
Commit
90065ac3
authored
Nov 22, 2023
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改导出bug
parent
df258108
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
8 deletions
+33
-8
pom.xml
...t-module-tzspatrol/amos-boot-module-tzspatrol-biz/pom.xml
+5
-0
PlanTaskPageParam.java
...yeejoin/amos/patrol/business/param/PlanTaskPageParam.java
+14
-0
FileHelper.java
...ava/com/yeejoin/amos/patrol/business/util/FileHelper.java
+8
-8
dbTemplate_plan_task.xml
...biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
+6
-0
No files found.
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/pom.xml
View file @
90065ac3
...
@@ -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>
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/PlanTaskPageParam.java
View file @
90065ac3
...
@@ -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
;
}
/**
/**
* 单位
* 单位
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/FileHelper.java
View file @
90065ac3
...
@@ -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;
}
//
}
/**
/**
*
*
...
...
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @
90065ac3
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment