Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_REFACTORING
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_REFACTORING
Commits
3d495c0e
Commit
3d495c0e
authored
Dec 11, 2018
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了groupList,conutyList,typeList,派出所申领表,交接单,
parent
5b1715d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
37 deletions
+50
-37
UserApi.java
src/main/java/com/yxproject/start/api/UserApi.java
+50
-37
No files found.
src/main/java/com/yxproject/start/api/UserApi.java
View file @
3d495c0e
...
...
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.*
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
...
...
@@ -521,8 +522,8 @@ public class UserApi {
*/
@RequestMapping
(
"getPoliceStationApplyReasonBySaveDate"
)
// @RequiresPermissions("userInfo.add")//权限管理;
public
String
getPoliceStationApplyReasonBySaveDate
(
@RequestParam
(
"save
Date"
)
String
save
Date
,
HttpServletResponse
resp
)
{
List
<
Map
<
String
,
Object
>>
policeStationApplyReasonEntity
=
policeStationApplyReasonService
.
findPoliceStationApplyReasonBySaveDate
(
saveDate
);
public
String
getPoliceStationApplyReasonBySaveDate
(
@RequestParam
(
"save
_Date"
)
String
save_
Date
,
HttpServletResponse
resp
)
{
List
<
Map
<
String
,
Object
>>
policeStationApplyReasonEntity
=
policeStationApplyReasonService
.
findPoliceStationApplyReasonBySaveDate
(
save
_
Date
);
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
resp
.
setCharacterEncoding
(
"UTF-8"
);
yxjsonResponse
.
outPutSuccess
(
policeStationApplyReasonEntity
);
...
...
@@ -642,8 +643,8 @@ public class UserApi {
*/
@RequestMapping
(
"getConnectList"
)
// @RequiresPermissions("userInfo.add")//权限管理;
public
String
getConnectList
(
@RequestParam
(
"save_Date"
)
String
save_Date
,
HttpServletResponse
resp
)
{
List
<
Map
<
String
,
Object
>
>
countyListEntity
=
countyListService
.
getConnectList
(
save_Date
);
public
String
getConnectList
(
@RequestParam
(
"save_Date"
)
String
save_Date
,
HttpServletResponse
resp
)
throws
ParseException
{
List
<
CountyListEntity
>
countyListEntity
=
countyListService
.
getConnectList
(
save_Date
);
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
resp
.
setCharacterEncoding
(
"UTF-8"
);
yxjsonResponse
.
outPutSuccess
(
countyListEntity
);
...
...
@@ -652,6 +653,51 @@ public class UserApi {
return
yxjsonResponse
.
toJSONString
();
}
// /**
// * 下载交接单
// */
// @RequestMapping("printConnectList")
//// @RequiresPermissions("userInfo.add")//权限管理;
// public byte[] printConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse response) {
//// cyclesheetID ="20180802032";
// response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//// //使用Servlet实现文件下载的时候,避免浏览器自动打开文件
// String fout = null;
// List <CountyListEntity> countyListEntity = countyListService.getConnectList(save_Date);
// fout = connectListExcel(countyListEntity, countyListEntity.get(0).getOut_Storage_Count() + "", 6000,countyListEntity.get(0).getCounty_Code(), dateTime, save_Date);
// String outFile = dateTime + countyListEntity.get(0).getCounty_Code() + "二代身份证交接单";
// try {
// FileInputStream fis = new FileInputStream(new File(fout));
// byte[] b = new byte[fis.available()];
// fis.read(b);
// fis.close();
// response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
// return b;
// } catch (FileNotFoundException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// }
// return null;
// }
//
// /**
// * 下载装箱单
// *
// * @param countyListEntity 交接单信息
// * @param typeName 制证类型
// * @param sum 总数
// * @param county_code 区县代码
// * @param boxCount 盒数
// */
// private String connectListExcel( List <CountyListEntity> countyListEntity, String typeName, int sum, String county_code, String boxCount, String dateTime, String save_date ) {
//
// }
/**
* 更新入库时间
* 前端空值
...
...
@@ -695,39 +741,6 @@ public class UserApi {
// /**
// * 下载交接单;
// *
// * @return
// */
// @RequestMapping("printConnectList")
//// @RequiresPermissions("userInfo.add")//权限管理;
// public byte[] printConnectList(@RequestParam("save_Date") String save_Date, HttpServletResponse response) {
//// cyclesheetID ="20180802032";
// response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
//// //使用Servlet实现文件下载的时候,避免浏览器自动打开文件
// String fout = null;
// List <Map <String, Object>> countyListEntity = countyListService.getConnectList(save_Date);
// List<TaskEntity> taskEntities = taskService.findProductionTaskListEntityByID(Long.valueOf(save_Date));
// fout = exportExcel(countyListEntity, taskEntities.get(0).getCard_Type() + "", "p1", 6000, taskEntities.get(0).getCitycode(), dateTime, save_Date);
// String outFile = dateTime + taskEntities.get(0).getCitycode() + "二代身份证交接单";
// try {
// FileInputStream fis = new FileInputStream(new File(fout));
// byte[] b = new byte[fis.available()];
// fis.read(b);
// fis.close();
// response.addHeader("Content-Disposition", "attachment;filename=" + outFile + ".xls");
// return b;
// } catch (FileNotFoundException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// }
// return null;
// }
/**
* 下载装箱单
...
...
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