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
ddad48d2
Commit
ddad48d2
authored
Apr 18, 2019
by
dahai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导入妥投信息表
登记投递失败信息 妥投信息报表 查询导入妥投信息 查询登记妥投失败信息 删除导入妥投信息 删除登记妥投失败信息
parent
4aa2dccb
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
785 additions
and
2 deletions
+785
-2
DeliveredApi.java
src/main/java/com/yxproject/start/api/DeliveredApi.java
+253
-0
DeliveredFailedInfoEntity.java
...com/yxproject/start/entity/DeliveredFailedInfoEntity.java
+109
-0
DeliveredFailedReasonEntity.java
...m/yxproject/start/entity/DeliveredFailedReasonEntity.java
+49
-0
DeliveredImportDicEntity.java
.../com/yxproject/start/entity/DeliveredImportDicEntity.java
+86
-0
DeliveredInfoEntity.java
.../java/com/yxproject/start/entity/DeliveredInfoEntity.java
+86
-0
DeliveredFailedInfoMapper.java
...com/yxproject/start/mapper/DeliveredFailedInfoMapper.java
+18
-0
DeliveredFailedReasonMapper.java
...m/yxproject/start/mapper/DeliveredFailedReasonMapper.java
+11
-0
DeliveredImportDicMapper.java
.../com/yxproject/start/mapper/DeliveredImportDicMapper.java
+18
-0
DeliveredInfoMapper.java
.../java/com/yxproject/start/mapper/DeliveredInfoMapper.java
+48
-0
DeliveredService.java
...in/java/com/yxproject/start/service/DeliveredService.java
+23
-0
DeliveredServiceImpl.java
...om/yxproject/start/service/impl/DeliveredServiceImpl.java
+82
-0
tagPrint.html
src/main/resources/static/views/tagPrint/tagPrint.html
+2
-2
No files found.
src/main/java/com/yxproject/start/api/DeliveredApi.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
api
;
import
com.yxproject.start.entity.DeliveredFailedInfoEntity
;
import
com.yxproject.start.entity.DeliveredImportDicEntity
;
import
com.yxproject.start.entity.DeliveredInfoEntity
;
import
com.yxproject.start.service.DeliveredService
;
import
com.yxproject.start.utils.ReadExcel
;
import
com.yxproject.start.utils.YXJSONResponse
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONObject
;
import
org.apache.commons.fileupload.disk.DiskFileItemFactory
;
import
org.apache.commons.fileupload.servlet.ServletFileUpload
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartHttpServletRequest
;
import
org.springframework.web.multipart.commons.CommonsMultipartResolver
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.ws.rs.Consumes
;
import
javax.ws.rs.Produces
;
import
javax.ws.rs.core.MediaType
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
/**
* @auther zhangyusheng
* 2019/4/17 9:44
* 妥投信息API
*/
@RestController
@RequestMapping
(
"DeliveredApi"
)
public
class
DeliveredApi
{
@Autowired
private
DeliveredService
deliveredService
;
/**
* 导入妥投信息表
*/
@RequestMapping
(
"ReadDeliveredInfo"
)
@Consumes
(
MediaType
.
MULTIPART_FORM_DATA
)
@Produces
(
MediaType
.
APPLICATION_JSON
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
ReadDeliveredInfo
(
@RequestParam
(
"importName"
)
String
importName
,
HttpServletResponse
resp
,
HttpServletRequest
requ
)
{
YXJSONResponse
yxresp
=
new
YXJSONResponse
();
resp
.
setCharacterEncoding
(
"UTF-8"
);
String
filename
=
""
;
DiskFileItemFactory
factory
=
new
DiskFileItemFactory
();
// 设置缓冲区的大小为100KB,如果不指定,那么缓冲区的大小默认是10KB
factory
.
setSizeThreshold
(
1024
*
100
);
ServletFileUpload
upload
=
new
ServletFileUpload
(
factory
);
upload
.
setHeaderEncoding
(
"UTF-8"
);
// 设置上传单个文件的大小的最大值,目前是设置为1024*1024*10字节,也就是10MB
upload
.
setFileSizeMax
(
1024
*
1024
*
10
);
// 设置上传文件总量的最大值,最大值=同时上传的多个文件的大小的最大值的和,目前设置为4000MB
upload
.
setSizeMax
(
1024
*
1024
*
4000
);
try
{
//将当前上下文初始化给 CommonsMutipartResolver (多部分解析器)
CommonsMultipartResolver
multipartResolver
=
new
CommonsMultipartResolver
(
requ
.
getSession
().
getServletContext
());
// 判断是否是多数据段提交格式
if
(
multipartResolver
.
isMultipart
(
requ
))
{
MultipartHttpServletRequest
multiRequest
=
(
MultipartHttpServletRequest
)
requ
;
Iterator
<
String
>
iter
=
multiRequest
.
getFileNames
();
while
(
iter
.
hasNext
())
{
List
<
MultipartFile
>
fileRows
=
multiRequest
.
getFiles
(
iter
.
next
().
toString
());
for
(
MultipartFile
item
:
fileRows
){
try
{
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename
=
item
.
getName
();
try
{
// 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件
// 得到上传的文件名称
filename
=
item
.
getOriginalFilename
();
File
file
=
null
;
try
{
file
=
File
.
createTempFile
(
"prefix"
,
"_"
+
item
.
getOriginalFilename
());
item
.
transferTo
(
file
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
ReadExcel
readExcel
=
new
ReadExcel
();
List
list1
=
readExcel
.
readExcel
(
file
);
//保存EXCEL文件信息
DeliveredImportDicEntity
deliveredImportDicEntity
=
new
DeliveredImportDicEntity
();
deliveredImportDicEntity
.
setFileName
(
filename
);
deliveredImportDicEntity
.
setImportName
(
importName
);
deliveredImportDicEntity
.
setImportCount
((
long
)
list1
.
size
());
deliveredService
.
saveDeliveredImportDic
(
deliveredImportDicEntity
);
//保存个人邮寄信息
List
<
DeliveredInfoEntity
>
entityList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
list1
.
size
();
i
++)
{
DeliveredInfoEntity
deliveredInfoEntity
=
new
DeliveredInfoEntity
();
List
list2
=
(
List
)
list1
.
get
(
i
);
//跳过空行和第一行
if
(
list2
==
null
||
i
==
0
)
{
continue
;
}
deliveredInfoEntity
.
setWaybillNumber
((
String
)
list2
.
get
(
0
));
deliveredInfoEntity
.
setFileId
(
deliveredImportDicEntity
.
getId
());
deliveredInfoEntity
.
setDealState
(
Long
.
valueOf
(
list2
.
get
(
2
).
toString
()));
entityList
.
add
(
deliveredInfoEntity
);
}
deliveredService
.
saveDeliveredInfoList
(
entityList
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
yxresp
.
outPutError
(
"Exception"
,
"上传文件时发生错误,非法XML文件:"
+
filename
);
continue
;
}
finally
{
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
yxresp
.
outPutError
(
"FileUploadException"
,
"文件上载发生异常:"
+
e
.
getMessage
());
}
finally
{
return
true
;
}
}
}
}
}
catch
(
Exception
e
){
}
finally
{
}
return
true
;
}
/**
* 登记投递失败信息
*/
@RequestMapping
(
"saveDeliveredFailedInfo"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
saveDeliveredFailedInfo
(
@RequestBody
String
jsonStr
){
JSONArray
jsonarray
=
JSONArray
.
fromObject
(
jsonStr
);
List
<
DeliveredFailedInfoEntity
>
deliveredFailedInfoEntities
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
jsonarray
.
size
();
i
++)
{
JSONObject
jsonObject
=
(
JSONObject
)
jsonarray
.
get
(
i
);
String
note
=
jsonObject
.
getString
(
"note"
)+
""
;
String
backReason
=
jsonObject
.
getString
(
"backReason"
);
String
waybillNumber
=
jsonObject
.
getString
(
"waybillNumber"
);
String
cardId
=
jsonObject
.
getString
(
"cardId"
);
String
registerName
=
jsonObject
.
getString
(
"registerName"
);
DeliveredFailedInfoEntity
deliveredFailedInfoEntity
=
new
DeliveredFailedInfoEntity
();
deliveredFailedInfoEntity
.
setBackReason
(
Long
.
valueOf
(
backReason
));
deliveredFailedInfoEntity
.
setNote
(
note
);
deliveredFailedInfoEntity
.
setWaybillNumber
(
waybillNumber
);
deliveredFailedInfoEntity
.
setCardId
(
cardId
);
deliveredFailedInfoEntity
.
setRegisterName
(
registerName
);
deliveredFailedInfoEntities
.
add
(
deliveredFailedInfoEntity
);
}
deliveredService
.
saveDeliveredFailedInfoList
(
deliveredFailedInfoEntities
);
return
true
;
}
/**
* 妥投信息报表
* @param startDate 运单寄出开始时间
* @param endDate 运单寄出结束时间
* @return 返回值
*/
@RequestMapping
(
"queryDeliveredReport"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
List
<
Map
<
String
,
Object
>>
queryDeliveredReport
(
@RequestParam
(
"startDate"
)
String
startDate
,
@RequestParam
(
"endDate"
)
String
endDate
){
List
<
Map
<
String
,
Object
>>
report
=
deliveredService
.
selectDeliveredReport
(
replaceDate
(
startDate
),
replaceDate
(
endDate
));
return
report
;
}
/**
* 查询导入妥投信息
* @param date 导入时间
* @return 返回值
*/
@RequestMapping
(
"queryDeliveredByImportDate"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
List
<
DeliveredImportDicEntity
>
queryDeliveredByImportDate
(
@RequestParam
(
"date"
)
String
date
){
List
<
DeliveredImportDicEntity
>
deliveredImportDicEntities
=
deliveredService
.
selectDeliveredByImportDate
(
replaceDate
(
date
));
return
deliveredImportDicEntities
;
}
/**
* 查询登记妥投失败信息
* @param date 登记时间
* @return 返回值
*/
@RequestMapping
(
"queryDeliveredFailedByRegisterDate"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
List
<
Map
<
String
,
Object
>>
queryDeliveredFailedByRegisterDate
(
@RequestParam
(
"date"
)
String
date
){
List
<
Map
<
String
,
Object
>>
mapList
=
deliveredService
.
selectDeliveredFailedByRegisterDate
(
replaceDate
(
date
));
return
mapList
;
}
/**
* 删除导入妥投信息
* @param fileId 文件ID
* @return 返回值
*/
@RequestMapping
(
"deleteDeliveredByFileId"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
deleteDeliveredByFileId
(
@RequestParam
(
"fileId"
)
String
fileId
){
deliveredService
.
deleteDeliveredByFileId
(
Long
.
valueOf
(
fileId
));
return
true
;
}
/**
* 删除登记妥投失败信息
* @param id 登记妥投失败信息ID
* @return 返回值
*/
@RequestMapping
(
"deleteDeliveredFailedById"
)
// @RequiresPermissions("userInfo.add")//权限管理;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
deleteDeliveredFailedById
(
@RequestParam
(
"id"
)
String
id
){
return
deliveredService
.
deleteDeliveredFailedById
(
Long
.
valueOf
(
id
));
}
/**
* 去除字符串中中线
*
* @param str
* @return
*/
private
String
replaceDate
(
String
str
)
{
return
str
.
replace
(
"-"
,
""
);
}
}
src/main/java/com/yxproject/start/entity/DeliveredFailedInfoEntity.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
entity
;
import
javax.persistence.*
;
import
java.sql.Time
;
import
java.util.Objects
;
/**
* @auther zhangyusheng
* 2019/4/17 9:42
*/
@Entity
@Table
(
name
=
"DELIVERED_FAILED_INFO"
,
schema
=
"YINGXIN"
,
catalog
=
""
)
public
class
DeliveredFailedInfoEntity
{
private
long
id
;
private
String
waybillNumber
;
private
Time
backDate
;
private
long
backReason
;
private
String
note
;
private
String
registerName
;
private
String
cardId
;
@Id
@Column
(
name
=
"ID"
)
public
long
getId
()
{
return
id
;
}
public
void
setId
(
long
id
)
{
this
.
id
=
id
;
}
@Basic
@Column
(
name
=
"WAYBILL_NUMBER"
)
public
String
getWaybillNumber
()
{
return
waybillNumber
;
}
public
void
setWaybillNumber
(
String
waybillNumber
)
{
this
.
waybillNumber
=
waybillNumber
;
}
@Basic
@Column
(
name
=
"BACK_DATE"
)
public
Time
getBackDate
()
{
return
backDate
;
}
public
void
setBackDate
(
Time
backDate
)
{
this
.
backDate
=
backDate
;
}
@Basic
@Column
(
name
=
"NOTE"
)
public
String
getNote
()
{
return
note
;
}
public
void
setNote
(
String
note
)
{
this
.
note
=
note
;
}
@Basic
@Column
(
name
=
"REGISTER_NAME"
)
public
String
getRegisterName
()
{
return
registerName
;
}
public
void
setRegisterName
(
String
registerName
)
{
this
.
registerName
=
registerName
;
}
@Basic
@Column
(
name
=
"BACK_REASON"
)
public
long
getBackReason
()
{
return
backReason
;
}
public
void
setBackReason
(
long
backReason
)
{
this
.
backReason
=
backReason
;
}
@Basic
@Column
(
name
=
"CARD_ID"
)
public
String
getCardId
()
{
return
cardId
;
}
public
void
setCardId
(
String
cardId
)
{
this
.
cardId
=
cardId
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
DeliveredFailedInfoEntity
that
=
(
DeliveredFailedInfoEntity
)
o
;
return
id
==
that
.
id
&&
Objects
.
equals
(
waybillNumber
,
that
.
waybillNumber
)
&&
Objects
.
equals
(
backDate
,
that
.
backDate
)
&&
Objects
.
equals
(
note
,
that
.
note
)
&&
Objects
.
equals
(
backReason
,
that
.
backReason
)
&&
Objects
.
equals
(
cardId
,
that
.
cardId
)
&&
Objects
.
equals
(
registerName
,
that
.
registerName
);
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
id
,
cardId
,
backReason
,
waybillNumber
,
backDate
,
note
,
registerName
);
}
}
src/main/java/com/yxproject/start/entity/DeliveredFailedReasonEntity.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
entity
;
import
javax.persistence.*
;
import
java.util.Objects
;
/**
* @auther zhangyusheng
* 2019/4/17 9:42
*/
@Entity
@Table
(
name
=
"DELIVERED_FAILED_REASON"
,
schema
=
"YINGXIN"
,
catalog
=
""
)
public
class
DeliveredFailedReasonEntity
{
private
long
id
;
private
String
reason
;
@Id
@Column
(
name
=
"ID"
)
public
long
getId
()
{
return
id
;
}
public
void
setId
(
long
id
)
{
this
.
id
=
id
;
}
@Basic
@Column
(
name
=
"REASON"
)
public
String
getReason
()
{
return
reason
;
}
public
void
setReason
(
String
reason
)
{
this
.
reason
=
reason
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
DeliveredFailedReasonEntity
that
=
(
DeliveredFailedReasonEntity
)
o
;
return
id
==
that
.
id
&&
Objects
.
equals
(
reason
,
that
.
reason
);
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
id
,
reason
);
}
}
src/main/java/com/yxproject/start/entity/DeliveredImportDicEntity.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
entity
;
import
javax.persistence.*
;
import
java.sql.Time
;
import
java.util.Objects
;
/**
* @auther zhangyusheng
* 2019/4/17 9:42
*/
@Entity
@Table
(
name
=
"DELIVERED_IMPORT_DIC"
,
schema
=
"YINGXIN"
,
catalog
=
""
)
public
class
DeliveredImportDicEntity
{
private
long
id
;
private
String
fileName
;
private
Time
importDate
;
private
String
importName
;
private
Long
importCount
;
@Id
@Column
(
name
=
"ID"
)
public
long
getId
()
{
return
id
;
}
public
void
setId
(
long
id
)
{
this
.
id
=
id
;
}
@Basic
@Column
(
name
=
"FILE_NAME"
)
public
String
getFileName
()
{
return
fileName
;
}
public
void
setFileName
(
String
fileName
)
{
this
.
fileName
=
fileName
;
}
@Basic
@Column
(
name
=
"IMPORT_DATE"
)
public
Time
getImportDate
()
{
return
importDate
;
}
public
void
setImportDate
(
Time
importDate
)
{
this
.
importDate
=
importDate
;
}
@Basic
@Column
(
name
=
"IMPORT_NAME"
)
public
String
getImportName
()
{
return
importName
;
}
public
void
setImportName
(
String
importName
)
{
this
.
importName
=
importName
;
}
@Basic
@Column
(
name
=
"IMPORT_COUNT"
)
public
Long
getImportCount
()
{
return
importCount
;
}
public
void
setImportCount
(
Long
importCount
)
{
this
.
importCount
=
importCount
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
DeliveredImportDicEntity
that
=
(
DeliveredImportDicEntity
)
o
;
return
id
==
that
.
id
&&
Objects
.
equals
(
fileName
,
that
.
fileName
)
&&
Objects
.
equals
(
importDate
,
that
.
importDate
)
&&
Objects
.
equals
(
importName
,
that
.
importName
)
&&
Objects
.
equals
(
importCount
,
that
.
importCount
);
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
id
,
fileName
,
importDate
,
importName
,
importCount
);
}
}
src/main/java/com/yxproject/start/entity/DeliveredInfoEntity.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
entity
;
import
javax.persistence.*
;
import
java.sql.Time
;
import
java.util.Objects
;
/**
* @auther zhangyusheng
* 2019/4/17 9:42
*/
@Entity
@Table
(
name
=
"DELIVERED_INFO"
,
schema
=
"YINGXIN"
,
catalog
=
""
)
public
class
DeliveredInfoEntity
{
private
long
id
;
private
String
waybillNumber
;
private
Time
dealDate
;
private
Long
dealState
;
private
long
fileId
;
@Id
@Column
(
name
=
"ID"
)
public
long
getId
()
{
return
id
;
}
public
void
setId
(
long
id
)
{
this
.
id
=
id
;
}
@Basic
@Column
(
name
=
"WAYBILL_NUMBER"
)
public
String
getWaybillNumber
()
{
return
waybillNumber
;
}
public
void
setWaybillNumber
(
String
waybillNumber
)
{
this
.
waybillNumber
=
waybillNumber
;
}
@Basic
@Column
(
name
=
"DEAL_DATE"
)
public
Time
getDealDate
()
{
return
dealDate
;
}
public
void
setDealDate
(
Time
dealDate
)
{
this
.
dealDate
=
dealDate
;
}
@Basic
@Column
(
name
=
"DEAL_STATE"
)
public
Long
getDealState
()
{
return
dealState
;
}
public
void
setDealState
(
Long
dealState
)
{
this
.
dealState
=
dealState
;
}
@Basic
@Column
(
name
=
"FILE_ID"
)
public
long
getFileId
()
{
return
fileId
;
}
public
void
setFileId
(
long
fileId
)
{
this
.
fileId
=
fileId
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
DeliveredInfoEntity
that
=
(
DeliveredInfoEntity
)
o
;
return
id
==
that
.
id
&&
Objects
.
equals
(
waybillNumber
,
that
.
waybillNumber
)
&&
Objects
.
equals
(
dealDate
,
that
.
dealDate
)
&&
Objects
.
equals
(
fileId
,
that
.
fileId
)
&&
Objects
.
equals
(
dealState
,
that
.
dealState
);
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
id
,
fileId
,
waybillNumber
,
dealDate
,
dealState
);
}
}
src/main/java/com/yxproject/start/mapper/DeliveredFailedInfoMapper.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.DeliveredFailedInfoEntity
;
import
org.apache.ibatis.annotations.Insert
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Options
;
/**
* @auther zhangyusheng
* 2019/4/17 10:24
*/
@Mapper
public
interface
DeliveredFailedInfoMapper
{
@Insert
(
"insert into DELIVERED_FAILED_INFO (WAYBILL_NUMBER,BACK_DATE,BACK_REASON,note,REGISTER_NAME,CARD_ID) \n"
+
"VALUES (#{waybillNumber},sysdate,#{backReason},#{note},#{registerName},#{cardId})"
)
@Options
(
useGeneratedKeys
=
true
,
keyProperty
=
"id"
,
keyColumn
=
"ID"
)
public
boolean
saveDeliveredFailedInfo
(
DeliveredFailedInfoEntity
deliveredFailedInfoEntity
);
}
src/main/java/com/yxproject/start/mapper/DeliveredFailedReasonMapper.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
mapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* @auther zhangyusheng
* 2019/4/17 10:25
*/
@Mapper
public
interface
DeliveredFailedReasonMapper
{
}
src/main/java/com/yxproject/start/mapper/DeliveredImportDicMapper.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.DeliveredImportDicEntity
;
import
org.apache.ibatis.annotations.Insert
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Options
;
/**
* @auther zhangyusheng
* 2019/4/17 10:25
*/
@Mapper
public
interface
DeliveredImportDicMapper
{
@Insert
(
"insert into DELIVERED_IMPORT_DIC (FILE_NAME,IMPORT_DATE,import_name,import_count) \n"
+
"VALUES (#{fileName},sysdate,#{importName},#{importCount})"
)
@Options
(
useGeneratedKeys
=
true
,
keyProperty
=
"id"
,
keyColumn
=
"ID"
)
public
boolean
saveDeliveredImportDic
(
DeliveredImportDicEntity
deliveredImportDicEntity
);
}
src/main/java/com/yxproject/start/mapper/DeliveredInfoMapper.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.DeliveredImportDicEntity
;
import
com.yxproject.start.entity.DeliveredInfoEntity
;
import
org.apache.ibatis.annotations.*
;
import
java.util.List
;
import
java.util.Map
;
/**
* @auther zhangyusheng
* 2019/4/17 10:26
*/
@Mapper
public
interface
DeliveredInfoMapper
{
@Insert
(
"insert into DELIVERED_INFO (WAYBILL_NUMBER,DEAL_DATE,DEAL_STATE,FILE_ID) \n"
+
"VALUES (#{waybillNumber},sysdate,#{dealState},#{fileId})"
)
@Options
(
useGeneratedKeys
=
true
,
keyProperty
=
"id"
,
keyColumn
=
"ID"
)
public
boolean
saveDeliveredInfo
(
DeliveredInfoEntity
deliveredInfoEntity
);
@Select
(
"select to_char(PRINT_DATE,'yyyyMMdd') PRINT_DATE ,count(PERSON_POST.WAYBILL_NUMBER) post_Count,\n"
+
"sum(decode(DELIVERED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_count,\n"
+
"sum(decode(DELIVERED_FAILED_INFO.WAYBILL_NUMBER,null,0,1)) DELIVERED_FAILED_count from PERSON_POST \n"
+
"left join DELIVERED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_INFO.WAYBILL_NUMBER\n"
+
"left join DELIVERED_FAILED_INFO on PERSON_POST.WAYBILL_NUMBER = DELIVERED_FAILED_INFO.WAYBILL_NUMBER\n"
+
"where to_char(PRINT_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n"
+
"group by to_char(PRINT_DATE,'yyyyMMdd')"
)
public
List
<
Map
<
String
,
Object
>>
selectReport
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
);
@Select
(
"select * from DELIVERED_IMPORT_DIC where TO_CHAR(IMPORT_DATE,'yyyyMMdd') = #{date} "
)
public
List
<
DeliveredImportDicEntity
>
selectDeliveredByImportDate
(
@Param
(
"date"
)
String
date
);
@Select
(
"select DELIVERED_FAILED_INFO.*,DELIVERED_FAILED_REASON.REASON from DELIVERED_FAILED_INFO\n"
+
"left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n"
+
"where to_char(back_date,'yyyyMMdd') = #{date}"
)
public
List
<
Map
<
String
,
Object
>>
selectDeliveredFailedByRegisterDate
(
@Param
(
"date"
)
String
date
);
@Delete
(
"delete from DELIVERED_INFO where FILE_ID = #{fileId}"
)
public
boolean
deleteDeliveredByFileId
(
@Param
(
"fileId"
)
long
fileId
);
@Delete
(
"delete from DELIVERED_IMPORT_DIC where id = #{fileId}"
)
public
boolean
deleteDeliveredImportDicByFileId
(
@Param
(
"fileId"
)
long
fileId
);
@Delete
(
"delete from DELIVERED_FAILED_INFO where id = #{id}"
)
public
boolean
deleteDeliveredFailedById
(
@Param
(
"id"
)
long
id
);
}
src/main/java/com/yxproject/start/service/DeliveredService.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
service
;
import
com.yxproject.start.entity.DeliveredFailedInfoEntity
;
import
com.yxproject.start.entity.DeliveredImportDicEntity
;
import
com.yxproject.start.entity.DeliveredInfoEntity
;
import
java.util.List
;
import
java.util.Map
;
/**
* @auther zhangyusheng
* 2019/4/17 10:27
*/
public
interface
DeliveredService
{
public
boolean
saveDeliveredImportDic
(
DeliveredImportDicEntity
deliveredImportDicEntity
);
public
boolean
saveDeliveredInfoList
(
List
<
DeliveredInfoEntity
>
deliveredInfoEntityList
);
public
boolean
saveDeliveredFailedInfoList
(
List
<
DeliveredFailedInfoEntity
>
deliveredFailedInfoEntities
);
public
List
<
Map
<
String
,
Object
>>
selectDeliveredReport
(
String
startDate
,
String
endDate
);
public
List
<
DeliveredImportDicEntity
>
selectDeliveredByImportDate
(
String
date
);
public
List
<
Map
<
String
,
Object
>>
selectDeliveredFailedByRegisterDate
(
String
date
);
public
boolean
deleteDeliveredByFileId
(
long
filedID
);
public
boolean
deleteDeliveredFailedById
(
long
id
);
}
src/main/java/com/yxproject/start/service/impl/DeliveredServiceImpl.java
0 → 100644
View file @
ddad48d2
package
com
.
yxproject
.
start
.
service
.
impl
;
import
com.yxproject.start.entity.DeliveredFailedInfoEntity
;
import
com.yxproject.start.entity.DeliveredImportDicEntity
;
import
com.yxproject.start.entity.DeliveredInfoEntity
;
import
com.yxproject.start.mapper.DeliveredFailedInfoMapper
;
import
com.yxproject.start.mapper.DeliveredFailedReasonMapper
;
import
com.yxproject.start.mapper.DeliveredImportDicMapper
;
import
com.yxproject.start.mapper.DeliveredInfoMapper
;
import
com.yxproject.start.service.DeliveredService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
java.util.Map
;
/**
* @auther zhangyusheng
* 2019/4/17 10:27
*/
@Service
public
class
DeliveredServiceImpl
implements
DeliveredService
{
@Autowired
private
DeliveredFailedInfoMapper
deliveredFailedInfoMapper
;
@Autowired
private
DeliveredFailedReasonMapper
deliveredFailedReasonMapper
;
@Autowired
private
DeliveredImportDicMapper
deliveredImportDicMapper
;
@Autowired
private
DeliveredInfoMapper
deliveredInfoMapper
;
@Override
public
boolean
saveDeliveredImportDic
(
DeliveredImportDicEntity
deliveredImportDicEntity
)
{
return
deliveredImportDicMapper
.
saveDeliveredImportDic
(
deliveredImportDicEntity
);
}
@Override
public
boolean
saveDeliveredInfoList
(
List
<
DeliveredInfoEntity
>
deliveredInfoEntityList
)
{
for
(
DeliveredInfoEntity
deliveredInfoEntity:
deliveredInfoEntityList
)
{
deliveredInfoMapper
.
saveDeliveredInfo
(
deliveredInfoEntity
);
}
return
true
;
}
@Override
public
boolean
saveDeliveredFailedInfoList
(
List
<
DeliveredFailedInfoEntity
>
deliveredFailedInfoEntities
)
{
for
(
DeliveredFailedInfoEntity
deliveredFailedInfoEntity
:
deliveredFailedInfoEntities
){
deliveredFailedInfoMapper
.
saveDeliveredFailedInfo
(
deliveredFailedInfoEntity
);
}
return
false
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
selectDeliveredReport
(
String
startDate
,
String
endDate
)
{
List
<
Map
<
String
,
Object
>>
mapList
=
deliveredInfoMapper
.
selectReport
(
startDate
,
endDate
);
return
mapList
;
}
@Override
public
List
<
DeliveredImportDicEntity
>
selectDeliveredByImportDate
(
String
date
)
{
return
deliveredInfoMapper
.
selectDeliveredByImportDate
(
date
);
}
@Override
public
List
<
Map
<
String
,
Object
>>
selectDeliveredFailedByRegisterDate
(
String
date
)
{
return
deliveredInfoMapper
.
selectDeliveredFailedByRegisterDate
(
date
);
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
deleteDeliveredByFileId
(
long
filedID
)
{
deliveredInfoMapper
.
deleteDeliveredByFileId
(
filedID
);
deliveredInfoMapper
.
deleteDeliveredImportDicByFileId
(
filedID
);
return
true
;
}
@Override
public
boolean
deleteDeliveredFailedById
(
long
id
)
{
return
deliveredInfoMapper
.
deleteDeliveredFailedById
(
id
);
}
}
src/main/resources/static/views/tagPrint/tagPrint.html
View file @
ddad48d2
...
...
@@ -18,8 +18,8 @@
<td
colspan=
"2"
width=
"35%"
>
<input
type=
"text"
class=
"form-control"
placeholder=
"身份证号"
ng-model=
"idCard"
/>
</td>
<td
colspan=
"
2
"
>
有效期:
<input
style=
"width:9%;"
name=
"yxqstart"
type=
"text"
ng-model=
"startDate"
>
至
<input
style=
"width:15%;"
name=
"yxqend"
type=
"text"
ng-model=
"endDate"
>
<td
colspan=
"
1
"
>
有效期:
<input
style=
"width:9%;"
name=
"yxqstart"
type=
"text"
ng-model=
"startDate"
>
至
<input
style=
"width:9%;"
name=
"yxqend"
type=
"text"
ng-model=
"endDate"
>
</td>
<td
style=
"text-align: left;"
>
<button
class=
"btn btn-primary search"
ng-click=
"searchTagPrintData()"
>
查询
</button>
...
...
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