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
87f95e85
Commit
87f95e85
authored
Mar 08, 2019
by
dahai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加并修改任务单状态API
parent
247ca55a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
6 deletions
+53
-6
TaskListApi.java
src/main/java/com/yxproject/start/api/TaskListApi.java
+48
-1
TaskListMapper.java
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
+3
-3
TaskListService.java
...ain/java/com/yxproject/start/service/TaskListService.java
+1
-1
TaskListServiceImpl.java
...com/yxproject/start/service/impl/TaskListServiceImpl.java
+1
-1
No files found.
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @
87f95e85
...
...
@@ -128,7 +128,7 @@ public class TaskListApi {
*/
@RequestMapping
(
"queryByCountyAtAuxiliary"
)
public
List
<
Object
>
queryByCountyAtAuxiliary
(
@RequestParam
(
"process"
)
String
process
,
HttpServletResponse
resp
){
List
<
Object
>
objects
=
taskListService
.
selectByCountyAtAuxiliary
(
process
);
List
<
Object
>
objects
=
taskListService
.
selectByCountyAtAuxiliary
(
Long
.
valueOf
(
process
)-
1
);
return
objects
;
}
...
...
@@ -182,6 +182,53 @@ public class TaskListApi {
}
/**
* 生成快证任务单
*
* name 提交人姓名
* groupList 组号列表
* countyList 区县列表 {typeCode:1,countyCode:'123456'}
* @return
*/
// @RequestMapping("createTask")
// @Transactional
// public String queryByCountyAtACCU(@RequestBody String str, HttpServletResponse resp){
// System.out.println(str);
// JSONObject jsonObject = JSONObject.fromObject(str);
// String date = jsonObject.getString("date");
// String name = jsonObject.getString("name");
//// String process = jsonObject.getString("tag");
// JSONArray jsonCounty = jsonObject.getJSONArray("countyList");
// JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
// List<Map<String,Object>> countyList =(List<Map<String,Object>>)jsonCounty;
// //正常生成区县任务单
// for (Map<String,Object> map :countyList){
// String typeCode = map.get("typeCode").toString();
// String countyCode = map.get("countyCode").toString();
// List<Object> objects = taskListService.selectGroupAtACCU(replaceDate(date), typeCode, countyCode);
// boolean b = taskListService.saveTask(objects,name,0+"");
// }
// //生成某几个组的区县任务单
// if (jsonGroup.size()>0){
// List<String> groupList =(List<String>)jsonGroup;
// //查询组号详情
// String groupNo = "(";
// for ( int i= 0; i<groupList.size();i++){
// if (i!=groupList.size()-1){
// groupNo=groupNo+groupList.get(i)+",";
// }else {
// groupNo=groupNo+groupList.get(i)+")";
// }
// }
// List<Object> objects = taskListService.selectGroupAtACCU(groupNo);
// boolean b = taskListService.saveTask(objects,name,0+"");
// }
// //todo 保存任务单数据
// return "成功生成循环单";
//
// }
...
...
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @
87f95e85
...
...
@@ -144,7 +144,7 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n"
+
"left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n"
+
"where task.TASK_STATE_ID = #{process}"
)
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_common
(
@Param
(
"process"
)
Stri
ng
process
);
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_common
(
@Param
(
"process"
)
lo
ng
process
);
/**
* 循环单查询
...
...
@@ -159,7 +159,7 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n"
+
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n"
+
"where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process}"
)
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_fast
(
@Param
(
"process"
)
Stri
ng
process
);
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_fast
(
@Param
(
"process"
)
lo
ng
process
);
/**
* 循环单查询
...
...
@@ -174,7 +174,7 @@ public interface TaskListMapper {
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n"
+
"left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n"
+
"where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process}"
)
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_remaind
(
@Param
(
"process"
)
Stri
ng
process
);
public
List
<
Map
<
String
,
Object
>>
selectByCountyAtAuxiliary_remaind
(
@Param
(
"process"
)
lo
ng
process
);
...
...
src/main/java/com/yxproject/start/service/TaskListService.java
View file @
87f95e85
...
...
@@ -24,7 +24,7 @@ public interface TaskListService {
public
Map
<
String
,
Object
>
selectByGroupNoAtACCU
(
String
date
,
String
typeCode
,
String
countyCode
,
long
currPage
,
long
pageSize
);
public
List
<
Object
>
selectByCountyAtAuxiliary
(
Stri
ng
process
);
public
List
<
Object
>
selectByCountyAtAuxiliary
(
lo
ng
process
);
public
List
<
Object
>
selectGroupAtACCU
(
String
date
,
String
typeCode
,
String
countyCode
);
...
...
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @
87f95e85
...
...
@@ -209,7 +209,7 @@ public class TaskListServiceImpl implements TaskListService {
* @return
*/
@Override
public
List
<
Object
>
selectByCountyAtAuxiliary
(
Stri
ng
process
)
{
public
List
<
Object
>
selectByCountyAtAuxiliary
(
lo
ng
process
)
{
//查询普通组号列表 在辅助库中
List
<
Map
<
String
,
Object
>>
mapList_common
=
taskListMapper
.
selectByCountyAtAuxiliary_common
(
process
);
//查询快证组号列表 在辅助库中
...
...
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