Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_beijing_auxiliary_YD
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
zhangyusheng
YX_IDENT_beijing_auxiliary_YD
Commits
49148be8
Commit
49148be8
authored
Apr 24, 2019
by
dahai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
push
parent
860f3ff7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
DeliveredApi.java
src/main/java/com/yxproject/start/api/DeliveredApi.java
+1
-1
MaterialManagementMapper.java
.../com/yxproject/start/mapper/MaterialManagementMapper.java
+3
-3
No files found.
src/main/java/com/yxproject/start/api/DeliveredApi.java
View file @
49148be8
...
@@ -68,7 +68,7 @@ public class DeliveredApi {
...
@@ -68,7 +68,7 @@ public class DeliveredApi {
try
{
try
{
//将当前上下文初始化给 CommonsMutipartResolver (多部分解析器)
//将当前上下文初始化给 CommonsMutipartResolver (多部分解析器)
CommonsMultipartResolver
multipartResolver
=
new
CommonsMultipartResolver
(
CommonsMultipartResolver
multipartResolver
=
new
CommonsMultipartResolver
(
requ
.
getSe
ssion
().
getSe
rvletContext
());
requ
.
getServletContext
());
// 判断是否是多数据段提交格式
// 判断是否是多数据段提交格式
if
(
multipartResolver
.
isMultipart
(
requ
))
{
if
(
multipartResolver
.
isMultipart
(
requ
))
{
MultipartHttpServletRequest
multiRequest
=
(
MultipartHttpServletRequest
)
requ
;
MultipartHttpServletRequest
multiRequest
=
(
MultipartHttpServletRequest
)
requ
;
...
...
src/main/java/com/yxproject/start/mapper/MaterialManagementMapper.java
View file @
49148be8
...
@@ -60,7 +60,7 @@ public interface MaterialManagementMapper {
...
@@ -60,7 +60,7 @@ public interface MaterialManagementMapper {
" and name =#{name} "
+
" and name =#{name} "
+
"</if>"
+
"</if>"
+
"<if test='typeCode != 0 '>"
+
"<if test='typeCode != 0 '>"
+
" and
type
Code =#{typeCode} "
+
" and
card_
Code =#{typeCode} "
+
"</if>"
+
"</if>"
+
"</script>"
)
"</script>"
)
public
List
<
CardBodyEntity
>
selectCardBody
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
public
List
<
CardBodyEntity
>
selectCardBody
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
...
@@ -71,7 +71,7 @@ public interface MaterialManagementMapper {
...
@@ -71,7 +71,7 @@ public interface MaterialManagementMapper {
" and name =#{name} "
+
" and name =#{name} "
+
"</if>"
+
"</if>"
+
"<if test='typeCode != 0 '>"
+
"<if test='typeCode != 0 '>"
+
" and
type
Code =#{typeCode} "
+
" and
card_
Code =#{typeCode} "
+
"</if>"
+
"</if>"
+
"</script>"
)
"</script>"
)
public
String
selectCardCount1
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
public
String
selectCardCount1
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
...
@@ -82,7 +82,7 @@ public interface MaterialManagementMapper {
...
@@ -82,7 +82,7 @@ public interface MaterialManagementMapper {
" and name =#{name} "
+
" and name =#{name} "
+
"</if>"
+
"</if>"
+
"<if test='typeCode != 0 '>"
+
"<if test='typeCode != 0 '>"
+
" and
type
Code =#{typeCode} "
+
" and
card_
Code =#{typeCode} "
+
"</if>"
+
"</if>"
+
"</script>"
)
"</script>"
)
public
String
selectCardCount2
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
public
String
selectCardCount2
(
@Param
(
"beginDate"
)
String
beginDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"typeCode"
)
String
typeCode
,
@Param
(
"name"
)
String
name
);
...
...
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