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
eb164564
Commit
eb164564
authored
Mar 15, 2019
by
suichenguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加查询历史总数
parent
7b191c96
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
312 additions
and
7 deletions
+312
-7
TaskListApi.java
src/main/java/com/yxproject/start/api/TaskListApi.java
+58
-0
LogMapper.java
src/main/java/com/yxproject/start/mapper/LogMapper.java
+0
-5
TaskListMapper.java
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
+117
-2
TaskListService.java
...ain/java/com/yxproject/start/service/TaskListService.java
+41
-0
TaskListServiceImpl.java
...com/yxproject/start/service/impl/TaskListServiceImpl.java
+96
-0
No files found.
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @
eb164564
...
@@ -420,6 +420,57 @@ public class TaskListApi {
...
@@ -420,6 +420,57 @@ public class TaskListApi {
}
}
@RequestMapping
(
"selectCountHistory"
)
public
int
selectCountHistory
(
@RequestParam
(
"date"
)
String
date
,
@RequestParam
(
"state"
)
String
state
){
int
count
=
0
;
int
count1
;
int
count2
;
switch
(
state
){
case
"1"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountIssue
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountIssue2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"2"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountPrintOut
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountPrintOut2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"3"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountPosition
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountPosition2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"4"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountConcora
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountConcora2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"5"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountPunching
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountPunching2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"6"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountSorting
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountSorting2
(
date
));
count
=
count1
+
count2
;
return
count
;
case
"7"
:
count1
=
Integer
.
parseInt
(
taskListService
.
selectCountQuality
(
date
));
count2
=
Integer
.
parseInt
(
taskListService
.
selectCountQuality2
(
date
));
count
=
count1
+
count2
;
return
count
;
}
return
count
;
}
/**
/**
* 去除字符串中中线
* 去除字符串中中线
*
*
...
@@ -430,4 +481,11 @@ public class TaskListApi {
...
@@ -430,4 +481,11 @@ public class TaskListApi {
return
str
.
replace
(
"-"
,
""
);
return
str
.
replace
(
"-"
,
""
);
}
}
}
}
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @
eb164564
...
@@ -22,11 +22,6 @@ public interface LogMapper {
...
@@ -22,11 +22,6 @@ public interface LogMapper {
public
List
<
Map
<
String
,
Object
>>
selectAnalysisData
(
@Param
(
"uploadDate"
)
String
uploadDate
);
public
List
<
Map
<
String
,
Object
>>
selectAnalysisData
(
@Param
(
"uploadDate"
)
String
uploadDate
);
//TODO XML的时间+post的file_id
//TODO XML的时间+post的file_id
@Update
(
"UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n"
+
@Update
(
"UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n"
+
"WHERE JMSFZSLH = (\n"
+
"WHERE JMSFZSLH = (\n"
+
...
...
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @
eb164564
...
@@ -562,7 +562,7 @@ public interface TaskListMapper {
...
@@ -562,7 +562,7 @@ public interface TaskListMapper {
/**
/**
* 任务单查询历史
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
* @param
process 工序
* @param
* @return
* @return
*/
*/
@Select
(
"select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,"
+
@Select
(
"select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,"
+
...
@@ -581,7 +581,7 @@ public interface TaskListMapper {
...
@@ -581,7 +581,7 @@ public interface TaskListMapper {
/**
/**
* 任务单查询历史
* 任务单查询历史
* 辅助库 余证
* 辅助库 余证
* @param
process 工序
* @param
* @return
* @return
*/
*/
@Select
(
"select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n"
+
@Select
(
"select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n"
+
...
@@ -894,4 +894,119 @@ public interface TaskListMapper {
...
@@ -894,4 +894,119 @@ public interface TaskListMapper {
*/
*/
@Select
(
"SELECT * FROM CARD_TYPE_DIC"
)
@Select
(
"SELECT * FROM CARD_TYPE_DIC"
)
public
List
<
CardTypeDicEntity
>
selectTypeList
();
public
List
<
CardTypeDicEntity
>
selectTypeList
();
//创建任务单查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.SUBMIT_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountSubmit
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.SUBMIT_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountSubmit2
(
@Param
(
"date"
)
String
date
);
//下发任务单查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.ISSUED_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountIssue
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.ISSUED_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountIssue2
(
@Param
(
"date"
)
String
date
);
//打印转出查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.PRINT_OUT_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPrintOut
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.PRINT_OUT_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPrintOut2
(
@Param
(
"date"
)
String
date
);
//预定位查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.POSITION_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPosition
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.POSITION_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPosition2
(
@Param
(
"date"
)
String
date
);
//平压查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.CONCORA_CRUSH_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountConcora
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.CONCORA_CRUSH_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountConcora2
(
@Param
(
"date"
)
String
date
);
//电写查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.PUNCHING_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPunching
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.PUNCHING_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountPunching2
(
@Param
(
"date"
)
String
date
);
//分拣查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.SORTING_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountSorting
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.SORTING_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountSorting2
(
@Param
(
"date"
)
String
date
);
//人工质检查询历史总数
@Select
(
"SELECT COUNT(*) \n"
+
"FROM SPECIAL_CARD \n"
+
"LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n"
+
"WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountQuality
(
@Param
(
"date"
)
String
date
);
@Select
(
"SELECT SUM(GROUP_NO.VALID_COUNT) \n"
+
"FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n"
+
"WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}"
)
public
String
selectCountQuality2
(
@Param
(
"date"
)
String
date
);
}
}
src/main/java/com/yxproject/start/service/TaskListService.java
View file @
eb164564
...
@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskEntity;
...
@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskEntity;
import
com.yxproject.start.entity.TaskList.CountCountyEntity
;
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
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -55,4 +56,44 @@ public interface TaskListService {
...
@@ -55,4 +56,44 @@ public interface TaskListService {
public
boolean
saveFastTask
(
TaskEntity
taskEntity
);
public
boolean
saveFastTask
(
TaskEntity
taskEntity
);
public
List
<
CardTypeDicEntity
>
getTypeList
();
public
List
<
CardTypeDicEntity
>
getTypeList
();
public
String
selectCountSubmit
(
@Param
(
"date"
)
String
date
);
public
String
selectCountSubmit2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountIssue
(
@Param
(
"date"
)
String
date
);
public
String
selectCountIssue2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPrintOut
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPrintOut2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPosition
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPosition2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountConcora
(
@Param
(
"date"
)
String
date
);
public
String
selectCountConcora2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPunching
(
@Param
(
"date"
)
String
date
);
public
String
selectCountPunching2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountSorting
(
@Param
(
"date"
)
String
date
);
public
String
selectCountSorting2
(
@Param
(
"date"
)
String
date
);
public
String
selectCountQuality
(
@Param
(
"date"
)
String
date
);
public
String
selectCountQuality2
(
@Param
(
"date"
)
String
date
);
}
}
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @
eb164564
...
@@ -598,6 +598,102 @@ public class TaskListServiceImpl implements TaskListService {
...
@@ -598,6 +598,102 @@ public class TaskListServiceImpl implements TaskListService {
return
taskListMapper
.
selectTypeList
();
return
taskListMapper
.
selectTypeList
();
}
}
@Override
public
String
selectCountSubmit
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountSubmit
(
date
);
return
count1
;
}
@Override
public
String
selectCountSubmit2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountSubmit2
(
date
);
return
count2
;
}
@Override
public
String
selectCountIssue
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountIssue
(
date
);
return
count1
;
}
@Override
public
String
selectCountIssue2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountIssue2
(
date
);
return
count2
;
}
@Override
public
String
selectCountPrintOut
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountPrintOut
(
date
);
return
count1
;
}
@Override
public
String
selectCountPrintOut2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountPrintOut2
(
date
);
return
count2
;
}
@Override
public
String
selectCountPosition
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountPosition
(
date
);
return
count1
;
}
@Override
public
String
selectCountPosition2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountPosition2
(
date
);
return
count2
;
}
@Override
public
String
selectCountConcora
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountConcora
(
date
);
return
count1
;
}
@Override
public
String
selectCountConcora2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountConcora2
(
date
);
return
null
;
}
@Override
public
String
selectCountPunching
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountPunching
(
date
);
return
count1
;
}
@Override
public
String
selectCountPunching2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountPunching2
(
date
);
return
count2
;
}
@Override
public
String
selectCountSorting
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountSorting
(
date
);
return
count1
;
}
@Override
public
String
selectCountSorting2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountSorting2
(
date
);
return
count2
;
}
@Override
public
String
selectCountQuality
(
String
date
)
{
String
count1
=
taskListMapper
.
selectCountQuality
(
date
);
return
count1
;
}
@Override
public
String
selectCountQuality2
(
String
date
)
{
String
count2
=
taskListMapper
.
selectCountQuality2
(
date
);
return
count2
;
}
private
String
createGroupNo
(
List
<
Integer
>
c
,
List
<
Integer
>
nsList
)
{
private
String
createGroupNo
(
List
<
Integer
>
c
,
List
<
Integer
>
nsList
)
{
try
{
try
{
...
...
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