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
602f7c04
Commit
602f7c04
authored
Apr 16, 2019
by
dahai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加快证时 验证是否已经生成交接单
parent
4de6149e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
141 deletions
+30
-141
TaskListApi.java
src/main/java/com/yxproject/start/api/TaskListApi.java
+11
-140
ReceiptMapper.java
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
+4
-0
ReceiptService.java
...main/java/com/yxproject/start/service/ReceiptService.java
+2
-1
ReceiptServiceImpl.java
.../com/yxproject/start/service/impl/ReceiptServiceImpl.java
+13
-0
No files found.
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @
602f7c04
...
@@ -5,10 +5,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity;
...
@@ -5,10 +5,7 @@ import com.yxproject.start.entity.TaskList.CountCountyEntity;
import
com.yxproject.start.entity.TaskList.CountGajgEntity
;
import
com.yxproject.start.entity.TaskList.CountGajgEntity
;
import
com.yxproject.start.entity.TaskList.TaskListEntity
;
import
com.yxproject.start.entity.TaskList.TaskListEntity
;
import
com.yxproject.start.mapper.DataAuditingMapper
;
import
com.yxproject.start.mapper.DataAuditingMapper
;
import
com.yxproject.start.service.GroupNoService
;
import
com.yxproject.start.service.*
;
import
com.yxproject.start.service.PreproPersonService
;
import
com.yxproject.start.service.SpecialCardService
;
import
com.yxproject.start.service.TaskListService
;
import
com.yxproject.start.service.impl.DataAuditingServiceImpl
;
import
com.yxproject.start.service.impl.DataAuditingServiceImpl
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONObject
;
import
net.sf.json.JSONObject
;
...
@@ -42,51 +39,9 @@ public class TaskListApi {
...
@@ -42,51 +39,9 @@ public class TaskListApi {
private
PreproPersonService
preproPersonService
;
private
PreproPersonService
preproPersonService
;
@Autowired
@Autowired
private
DataAuditingServiceImpl
dataAuditingService
;
private
DataAuditingServiceImpl
dataAuditingService
;
@Autowired
private
ReceiptService
receiptService
;
// /**
// * 查询以区为单位的制证数量
// * 受理库
// *
// * @param submitDate
// * @return
// */
// @RequestMapping("selectByCounty")
// public JSONObject selectByCounty(@RequestParam(value = "submitDate") String submitDate) {
// List<CountCountyEntity> resultList = taskListService.selectByCounty(submitDate);
// JSONObject resultJson = JSONObject.fromObject(resultList);
// return resultJson;
// }
//
// /**
// * 查询以派出所为单位的制证数量
// * 受理库
// *
// * @param submitDate
// * @param countyCode
// * @return
// */
// @RequestMapping("selectByGajg")
// public JSONObject selectByGajg(@RequestParam(value = "submitDate") String submitDate, @RequestParam(value = "countyCode") String countyCode) {
// List<CountGajgEntity> resultList = taskListService.selectByGajg(submitDate, countyCode);
// JSONObject resultJson = JSONObject.fromObject(resultList);
// return resultJson;
// }
//
// /**
// * 生成任务单
// * 受理库
// *
// * @param submitDate
// * @param countyCode
// * @param Gajg
// * @return
// */
// @RequestMapping("createTaskList")
// public boolean createTaskList(@RequestParam(value = "submitDate") String submitDate, @RequestParam(value = "countyCode") String countyCode, @RequestParam(value = "Gajg") String Gajg) {
// List<TaskListEntity> resultList = taskListService.selectACCU(submitDate, countyCode, Gajg);
// taskListService.createTaskList(resultList);
// return true;
// }
/**
/**
* 更改任务单状态
* 更改任务单状态
...
@@ -315,7 +270,7 @@ public class TaskListApi {
...
@@ -315,7 +270,7 @@ public class TaskListApi {
/**
/**
* 生成快证任务单
* 生成快证任务单
*
<p>
*
* name 提交人姓名
* name 提交人姓名
* acceptNo 受理组号
* acceptNo 受理组号
* cardType 制证类型(原有)
* cardType 制证类型(原有)
...
@@ -332,6 +287,13 @@ public class TaskListApi {
...
@@ -332,6 +287,13 @@ public class TaskListApi {
String
cardType
=
jsonObject
.
getString
(
"cardType"
);
String
cardType
=
jsonObject
.
getString
(
"cardType"
);
String
countyCode
=
jsonObject
.
getString
(
"countyCode"
);
String
countyCode
=
jsonObject
.
getString
(
"countyCode"
);
String
name
=
jsonObject
.
getString
(
"name"
);
String
name
=
jsonObject
.
getString
(
"name"
);
// 判断是否添加快证 通过受理号查询交接单详情数量
List
<
DetailReceiptListEntity
>
detailReceiptListEntityList
=
receiptService
.
queryReceipt
(
acceptNo
);
if
(
detailReceiptListEntityList
.
size
()!=
0
){
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
"msg"
,
"证件已经生成交接单,无法加入快证"
);
return
map
;
}
if
(
"null"
.
equals
(
countyCode
.
substring
(
0
,
4
)))
{
if
(
"null"
.
equals
(
countyCode
.
substring
(
0
,
4
)))
{
countyCode
=
"000000"
;
countyCode
=
"000000"
;
}
}
...
@@ -456,97 +418,6 @@ public class TaskListApi {
...
@@ -456,97 +418,6 @@ public class TaskListApi {
return
printOutCount
;
return
printOutCount
;
}
}
// /**
// *
// * @param date
// * @param state
// * @return
// */
// @RequestMapping("selectCountHistory")
// public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){
// int count=0;
// int count1;
// int count2;
// String c1;
// String c2;
// switch (state){
// case "1":
// c1=taskListService.selectCountIssue(date);
// c2=taskListService.selectCountConcora2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1= Integer.parseInt(c1);
// count2= Integer.parseInt(c2);
// count = count1+count2;
// return count;
//
// case "2":
// c1=taskListService.selectCountPrintOut(date);
// c2=taskListService.selectCountPrintOut2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1 =Integer.parseInt(c1);
// count2=Integer.parseInt(c2);
// count = count1+count2;
// return count;
// case "3":
// c1=taskListService.selectCountPosition(date);
// c2=taskListService.selectCountPosition2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1=Integer.parseInt(c1);
// count2=Integer.parseInt(c2);
// count = count1+count2;
// return count;
// case "4":
// c1=taskListService.selectCountConcora(date);
// c2=taskListService.selectCountConcora2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1 = Integer.parseInt(c1);
// count2= Integer.parseInt(c2);
// count = count1+count2;
// return count;
// case "5":
// c1=taskListService.selectCountPunching(date);
// c2=taskListService.selectCountPunching2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1 =Integer.parseInt(c1);
// count2=Integer.parseInt(c2);
// count = count1+count2;
// return count;
// case "6":
// c1=taskListService.selectCountSorting(date);
// c2=taskListService.selectCountSorting2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1=Integer.parseInt(c1);
// count2=Integer.parseInt(c2);
// count =count1+count2;
// return count;
// case "7":
// c1=taskListService.selectCountQuality(date);
// c2=taskListService.selectCountQuality2(date);
// if (c2==null||c2.equals("")){
// c2="0";
// }
// count1=Integer.parseInt(c1);
// count2=Integer.parseInt(c2);
// count=count1+count2;
// return count;
// }
// return count;
// }
/**
/**
* 去除字符串中中线
* 去除字符串中中线
*
*
...
...
src/main/java/com/yxproject/start/mapper/ReceiptMapper.java
View file @
602f7c04
...
@@ -231,6 +231,10 @@ public interface ReceiptMapper {
...
@@ -231,6 +231,10 @@ public interface ReceiptMapper {
public
List
<
Map
<
String
,
Object
>>
selectReceiptReport
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"name"
)
String
name
);
public
List
<
Map
<
String
,
Object
>>
selectReceiptReport
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"name"
)
String
name
);
@Select
(
"select * from DETAIL_RECEIPT_LIST where ACCEPT_NO =#{acceptNo} "
)
public
List
<
DetailReceiptListEntity
>
queryReceipt
(
String
acceptNo
);
}
}
src/main/java/com/yxproject/start/service/ReceiptService.java
View file @
602f7c04
...
@@ -2,7 +2,6 @@ package com.yxproject.start.service;
...
@@ -2,7 +2,6 @@ package com.yxproject.start.service;
import
com.yxproject.start.entity.DetailReceiptListEntity
;
import
com.yxproject.start.entity.DetailReceiptListEntity
;
import
com.yxproject.start.entity.ReceiptListEntity
;
import
com.yxproject.start.entity.ReceiptListEntity
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -77,4 +76,6 @@ public interface ReceiptService {
...
@@ -77,4 +76,6 @@ public interface ReceiptService {
public
List
<
Map
<
String
,
Object
>>
selectReceiptReport
(
String
startDate
,
String
endDate
,
String
name
);
public
List
<
Map
<
String
,
Object
>>
selectReceiptReport
(
String
startDate
,
String
endDate
,
String
name
);
public
List
<
DetailReceiptListEntity
>
queryReceipt
(
String
acceptNo
);
}
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @
602f7c04
...
@@ -227,6 +227,19 @@ public class ReceiptServiceImpl implements ReceiptService {
...
@@ -227,6 +227,19 @@ public class ReceiptServiceImpl implements ReceiptService {
return
receiptMapper
.
selectReceiptReport
(
startDate
,
endDate
,
name
);
return
receiptMapper
.
selectReceiptReport
(
startDate
,
endDate
,
name
);
}
}
/**
* 查询是否存在交接单详单
*
* @param acceptNo 受理号
* @return
*/
@Override
public
List
<
DetailReceiptListEntity
>
queryReceipt
(
String
acceptNo
)
{
return
receiptMapper
.
queryReceipt
(
acceptNo
);
}
private
List
<
Map
<
String
,
Object
>>
formateMap
(
List
<
Map
<
String
,
Object
>>
maplist
)
{
private
List
<
Map
<
String
,
Object
>>
formateMap
(
List
<
Map
<
String
,
Object
>>
maplist
)
{
Map
<
String
,
Object
>
typeMap
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
typeMap
=
new
LinkedHashMap
<>();
for
(
Map
o
:
maplist
)
{
for
(
Map
o
:
maplist
)
{
...
...
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