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
77a372e3
Commit
77a372e3
authored
Nov 02, 2018
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加查询区县列表
添加下载装箱单
parent
5ff0201b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
188 additions
and
13 deletions
+188
-13
ShiroApi.java
src/main/java/com/yxproject/start/api/ShiroApi.java
+0
-0
UserInfoApi.java
src/main/java/com/yxproject/start/api/UserInfoApi.java
+0
-0
FailedinfoEntity.java
...ain/java/com/yxproject/start/entity/FailedinfoEntity.java
+2
-3
GroupinfoEntity.java
...main/java/com/yxproject/start/entity/GroupinfoEntity.java
+3
-1
PoliceStationVailedInfoEntity.java
...yxproject/start/entity/PoliceStationVailedInfoEntity.java
+7
-1
AccCardTEntity.java
.../java/com/yxproject/start/entity/accu/AccCardTEntity.java
+10
-0
AccGroupRelationTEntity.java
.../yxproject/start/entity/accu/AccGroupRelationTEntity.java
+5
-0
AccGroupTEntity.java
...java/com/yxproject/start/entity/accu/AccGroupTEntity.java
+8
-0
ProdApplyInfoTEntity.java
...com/yxproject/start/entity/prod/ProdApplyInfoTEntity.java
+9
-1
ProdGroupTEntity.java
...ava/com/yxproject/start/entity/prod/ProdGroupTEntity.java
+22
-0
ProdTraceTEntity.java
...ava/com/yxproject/start/entity/prod/ProdTraceTEntity.java
+14
-0
FailedinfoMapper.java
...ain/java/com/yxproject/start/mapper/FailedinfoMapper.java
+1
-2
GroupinfoMapper.java
...main/java/com/yxproject/start/mapper/GroupinfoMapper.java
+11
-0
GroupinfoService.java
...in/java/com/yxproject/start/service/GroupinfoService.java
+13
-0
ProductionTaskListService.java
...om/yxproject/start/service/ProductionTaskListService.java
+7
-0
GroupinfoServiceImpl.java
...om/yxproject/start/service/impl/GroupinfoServiceImpl.java
+65
-0
UtilServiceImpl.java
...ava/com/yxproject/start/service/impl/UtilServiceImpl.java
+0
-1
GroupinfoMapper.xml
src/main/resources/mapper/GroupinfoMapper.xml
+11
-4
No files found.
src/main/java/com/yxproject/start/api/ShiroApi.java
View file @
77a372e3
This diff is collapsed.
Click to expand it.
src/main/java/com/yxproject/start/api/UserInfoApi.java
View file @
77a372e3
This diff is collapsed.
Click to expand it.
src/main/java/com/yxproject/start/entity/FailedinfoEntity.java
View file @
77a372e3
...
...
@@ -100,6 +100,7 @@ public class FailedinfoEntity {
public
void
setPrint_Date
(
String
print_Date
)
{
this
.
print_Date
=
print_Date
;
}
@Basic
@Column
(
name
=
"STATE"
,
nullable
=
false
,
precision
=
0
)
public
long
getState
()
{
...
...
@@ -129,10 +130,8 @@ public class FailedinfoEntity {
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
failedinfoid
,
failed_Reason
,
groupno
,
cyclesheetid
,
position_Date
,
finish_Date
,
allot_Date
,
print_Date
,
state
);
return
Objects
.
hash
(
failedinfoid
,
failed_Reason
,
groupno
,
cyclesheetid
,
position_Date
,
finish_Date
,
allot_Date
,
print_Date
,
state
);
}
}
src/main/java/com/yxproject/start/entity/GroupinfoEntity.java
View file @
77a372e3
...
...
@@ -53,6 +53,7 @@ public class GroupinfoEntity {
public
void
setGrouptype
(
Long
grouptype
)
{
this
.
grouptype
=
grouptype
;
}
@Basic
@Column
(
name
=
"VAILD_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Long
getValid_Count
()
{
...
...
@@ -62,6 +63,7 @@ public class GroupinfoEntity {
public
void
setValid_Count
(
Long
valid_Count
)
{
this
.
valid_Count
=
valid_Count
;
}
@Basic
@Column
(
name
=
"INVALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Long
getInvalid_Count
()
{
...
...
@@ -87,6 +89,6 @@ public class GroupinfoEntity {
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
groupid
,
groupno
,
cyclesheetid
,
grouptype
,
valid_Count
,
invalid_Count
);
return
Objects
.
hash
(
groupid
,
groupno
,
cyclesheetid
,
grouptype
,
valid_Count
,
invalid_Count
);
}
}
src/main/java/com/yxproject/start/entity/PoliceStationVailedInfoEntity.java
View file @
77a372e3
...
...
@@ -15,6 +15,7 @@ public class PoliceStationVailedInfoEntity {
private
Long
vailed_Count
;
private
Long
invalid_Count
;
private
String
sava_Date
;
@Id
@Column
(
name
=
"POLICE_STATION_VAILED_INFO_ID"
,
nullable
=
false
,
length
=
20
)
public
String
getPolice_Station_Vailed_Info_Id
()
{
...
...
@@ -24,6 +25,7 @@ public class PoliceStationVailedInfoEntity {
public
void
setPolice_Station_Vailed_Info_Id
(
String
police_Station_Vailed_Info_Id
)
{
this
.
police_Station_Vailed_Info_Id
=
police_Station_Vailed_Info_Id
;
}
@Basic
@Column
(
name
=
"CYCLESHEETID"
,
nullable
=
true
,
precision
=
0
)
public
String
getCyclesheetid
()
{
...
...
@@ -33,6 +35,7 @@ public class PoliceStationVailedInfoEntity {
public
void
setCyclesheetid
(
String
cyclesheetid
)
{
this
.
cyclesheetid
=
cyclesheetid
;
}
@Basic
@Column
(
name
=
"POLICE_STATION_CODE"
,
nullable
=
true
,
precision
=
0
)
public
String
getPolice_Station_Code
()
{
...
...
@@ -52,6 +55,7 @@ public class PoliceStationVailedInfoEntity {
public
void
setVailed_Count
(
Long
vailed_Count
)
{
this
.
vailed_Count
=
vailed_Count
;
}
@Basic
@Column
(
name
=
"INVALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Long
getInvalid_Count
()
{
...
...
@@ -61,6 +65,7 @@ public class PoliceStationVailedInfoEntity {
public
void
setInvalid_Count
(
Long
invalid_Count
)
{
this
.
invalid_Count
=
invalid_Count
;
}
@Basic
@Column
(
name
=
"SAVA_DATE"
,
nullable
=
true
,
length
=
20
)
public
String
getSava_Date
()
{
...
...
@@ -70,6 +75,7 @@ public class PoliceStationVailedInfoEntity {
public
void
setSava_Date
(
String
sava_Date
)
{
this
.
sava_Date
=
sava_Date
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
...
...
@@ -85,6 +91,6 @@ public class PoliceStationVailedInfoEntity {
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
police_Station_Vailed_Info_Id
,
cyclesheetid
,
police_Station_Code
,
vailed_Count
,
invalid_Count
,
sava_Date
);
return
Objects
.
hash
(
police_Station_Vailed_Info_Id
,
cyclesheetid
,
police_Station_Code
,
vailed_Count
,
invalid_Count
,
sava_Date
);
}
}
src/main/java/com/yxproject/start/entity/accu/AccCardTEntity.java
View file @
77a372e3
...
...
@@ -23,6 +23,7 @@ public class AccCardTEntity {
private
String
begin_Date
;
private
String
apply_Reason
;
private
String
status_No
;
@Basic
@Column
(
name
=
"UPLOAD_NO"
,
nullable
=
false
,
length
=
22
)
public
String
getUpload_No
()
{
...
...
@@ -32,6 +33,7 @@ public class AccCardTEntity {
public
void
setUpload_No
(
String
upload_No
)
{
this
.
upload_No
=
upload_No
;
}
@Id
@Column
(
name
=
"ACCEPT_NO"
,
nullable
=
false
,
length
=
12
)
public
String
getAccept_No
()
{
...
...
@@ -61,6 +63,7 @@ public class AccCardTEntity {
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
@Basic
@Column
(
name
=
"SEX_NO"
,
nullable
=
false
,
length
=
1
)
public
String
getSex_No
()
{
...
...
@@ -70,6 +73,7 @@ public class AccCardTEntity {
public
void
setSex_No
(
String
sex_No
)
{
this
.
sex_No
=
sex_No
;
}
@Basic
@Column
(
name
=
"NATION_NO"
,
nullable
=
false
,
length
=
2
)
public
String
getNation_No
()
{
...
...
@@ -89,6 +93,7 @@ public class AccCardTEntity {
public
void
setBirthday
(
String
birthday
)
{
this
.
birthday
=
birthday
;
}
@Basic
@Column
(
name
=
"ID_NO"
,
nullable
=
false
,
length
=
18
)
public
String
getId_No
()
{
...
...
@@ -138,6 +143,7 @@ public class AccCardTEntity {
public
void
setAddress1
(
String
address1
)
{
this
.
address1
=
address1
;
}
@Basic
@Column
(
name
=
"SIGN_GOVT"
,
nullable
=
false
,
length
=
45
)
public
String
getSign_Govt
()
{
...
...
@@ -147,6 +153,7 @@ public class AccCardTEntity {
public
void
setSign_Govt
(
String
sign_Govt
)
{
this
.
sign_Govt
=
sign_Govt
;
}
@Basic
@Column
(
name
=
"EXPIRE_DATE"
,
nullable
=
false
,
length
=
8
)
public
String
getExpire_Date
()
{
...
...
@@ -156,6 +163,7 @@ public class AccCardTEntity {
public
void
setExpire_Date
(
String
expire_Date
)
{
this
.
expire_Date
=
expire_Date
;
}
@Basic
@Column
(
name
=
"BEGIN_DATE"
,
nullable
=
false
,
length
=
8
)
public
String
getBegin_Date
()
{
...
...
@@ -165,6 +173,7 @@ public class AccCardTEntity {
public
void
setBegin_Date
(
String
begin_Date
)
{
this
.
begin_Date
=
begin_Date
;
}
@Basic
@Column
(
name
=
"APPLY_REASON"
,
nullable
=
false
,
length
=
2
)
public
String
getApply_Reason
()
{
...
...
@@ -174,6 +183,7 @@ public class AccCardTEntity {
public
void
setApply_Reason
(
String
apply_Reason
)
{
this
.
apply_Reason
=
apply_Reason
;
}
@Basic
@Column
(
name
=
"STATUS_NO"
,
nullable
=
true
,
length
=
1
)
public
String
getStatus_No
()
{
...
...
src/main/java/com/yxproject/start/entity/accu/AccGroupRelationTEntity.java
View file @
77a372e3
...
...
@@ -11,6 +11,7 @@ public class AccGroupRelationTEntity {
private
String
deal_Status
;
private
String
deal_Date
;
private
String
upload_Unit_No
;
@Id
@Column
(
name
=
"GROUP_NO"
,
nullable
=
false
,
length
=
10
)
public
String
getGroup_No
()
{
...
...
@@ -20,6 +21,7 @@ public class AccGroupRelationTEntity {
public
void
setGroup_No
(
String
group_No
)
{
this
.
group_No
=
group_No
;
}
@Basic
@Column
(
name
=
"ORIGINAL_NO"
,
nullable
=
false
,
length
=
25
)
public
String
getOriginal_No
()
{
...
...
@@ -29,6 +31,7 @@ public class AccGroupRelationTEntity {
public
void
setOriginal_No
(
String
original_No
)
{
this
.
original_No
=
original_No
;
}
@Basic
@Column
(
name
=
"DEAL_STATUS"
,
nullable
=
true
,
length
=
1
)
public
String
getDeal_Status
()
{
...
...
@@ -38,6 +41,7 @@ public class AccGroupRelationTEntity {
public
void
setDeal_Status
(
String
deal_Status
)
{
this
.
deal_Status
=
deal_Status
;
}
@Basic
@Column
(
name
=
"DEAL_DATE"
,
nullable
=
false
,
length
=
8
)
public
String
getDeal_Date
()
{
...
...
@@ -47,6 +51,7 @@ public class AccGroupRelationTEntity {
public
void
setDeal_Date
(
String
deal_Date
)
{
this
.
deal_Date
=
deal_Date
;
}
@Basic
@Column
(
name
=
"UPLOAD_UNIT_NO"
,
nullable
=
false
,
length
=
12
)
public
String
getUpload_Unit_No
()
{
...
...
src/main/java/com/yxproject/start/entity/accu/AccGroupTEntity.java
View file @
77a372e3
...
...
@@ -15,6 +15,7 @@ public class AccGroupTEntity {
private
Byte
invalid_Count
;
private
Time
submit_Date
;
private
String
submit_Code
;
@Id
@Column
(
name
=
"GROUP_NO"
,
nullable
=
false
,
length
=
10
)
public
String
getGroup_No
()
{
...
...
@@ -24,6 +25,7 @@ public class AccGroupTEntity {
public
void
setGroup_No
(
String
group_No
)
{
this
.
group_No
=
group_No
;
}
@Basic
@Column
(
name
=
"USER_CODE"
,
nullable
=
true
,
length
=
8
)
public
String
getUser_Code
()
{
...
...
@@ -33,6 +35,7 @@ public class AccGroupTEntity {
public
void
setUser_Code
(
String
user_Code
)
{
this
.
user_Code
=
user_Code
;
}
@Basic
@Column
(
name
=
"IMPORT_TIME"
,
nullable
=
true
)
public
Time
getImport_Time
()
{
...
...
@@ -42,6 +45,7 @@ public class AccGroupTEntity {
public
void
setImport_Time
(
Time
import_Time
)
{
this
.
import_Time
=
import_Time
;
}
@Basic
@Column
(
name
=
"DEAL_FLAG"
,
nullable
=
false
,
length
=
1
)
public
String
getDeal_Flag
()
{
...
...
@@ -51,6 +55,7 @@ public class AccGroupTEntity {
public
void
setDeal_Flag
(
String
deal_Flag
)
{
this
.
deal_Flag
=
deal_Flag
;
}
@Basic
@Column
(
name
=
"VALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getValid_Count
()
{
...
...
@@ -60,6 +65,7 @@ public class AccGroupTEntity {
public
void
setValid_Count
(
Byte
valid_Count
)
{
this
.
valid_Count
=
valid_Count
;
}
@Basic
@Column
(
name
=
"INVALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getInvalid_Count
()
{
...
...
@@ -69,6 +75,7 @@ public class AccGroupTEntity {
public
void
setInvalid_Count
(
Byte
invalid_Count
)
{
this
.
invalid_Count
=
invalid_Count
;
}
@Basic
@Column
(
name
=
"SUBMIT_DATE"
,
nullable
=
true
)
public
Time
getSubmit_Date
()
{
...
...
@@ -78,6 +85,7 @@ public class AccGroupTEntity {
public
void
setSubmit_Date
(
Time
submit_Date
)
{
this
.
submit_Date
=
submit_Date
;
}
@Basic
@Column
(
name
=
"SUBMIT_CODE"
,
nullable
=
true
,
length
=
8
)
public
String
getSubmit_Code
()
{
...
...
src/main/java/com/yxproject/start/entity/prod/ProdApplyInfoTEntity.java
View file @
77a372e3
...
...
@@ -15,6 +15,7 @@ public class ProdApplyInfoTEntity {
private
String
apply_Address
;
private
String
draw_Type
;
private
String
province_No
;
@Basic
@Column
(
name
=
"UPLOAD_NO"
,
nullable
=
false
,
length
=
22
)
public
String
getUpload_No
()
{
...
...
@@ -24,6 +25,7 @@ public class ProdApplyInfoTEntity {
public
void
setUpload_No
(
String
upload_No
)
{
this
.
upload_No
=
upload_No
;
}
@Id
@Column
(
name
=
"ACCEPT_NO"
,
nullable
=
false
,
length
=
12
)
public
String
getAccept_No
()
{
...
...
@@ -33,6 +35,7 @@ public class ProdApplyInfoTEntity {
public
void
setAccept_No
(
String
accept_No
)
{
this
.
accept_No
=
accept_No
;
}
@Basic
@Column
(
name
=
"MAKE_TYPE"
,
nullable
=
true
,
length
=
1
)
public
String
getMake_Type
()
{
...
...
@@ -42,6 +45,7 @@ public class ProdApplyInfoTEntity {
public
void
setMake_Type
(
String
make_Type
)
{
this
.
make_Type
=
make_Type
;
}
@Basic
@Column
(
name
=
"APPLY_NAME"
,
nullable
=
true
,
length
=
45
)
public
String
getApply_Name
()
{
...
...
@@ -51,6 +55,7 @@ public class ProdApplyInfoTEntity {
public
void
setApply_Name
(
String
apply_Name
)
{
this
.
apply_Name
=
apply_Name
;
}
@Basic
@Column
(
name
=
"APPLY_PHONE"
,
nullable
=
true
,
length
=
20
)
public
String
getApply_Phone
()
{
...
...
@@ -60,6 +65,7 @@ public class ProdApplyInfoTEntity {
public
void
setApply_Phone
(
String
apply_Phone
)
{
this
.
apply_Phone
=
apply_Phone
;
}
@Basic
@Column
(
name
=
"APPLY_POSTCODE"
,
nullable
=
true
,
length
=
6
)
public
String
getApply_Postcode
()
{
...
...
@@ -69,6 +75,7 @@ public class ProdApplyInfoTEntity {
public
void
setApply_Postcode
(
String
apply_Postcode
)
{
this
.
apply_Postcode
=
apply_Postcode
;
}
@Basic
@Column
(
name
=
"APPLY_ADDRESS"
,
nullable
=
true
,
length
=
105
)
public
String
getApply_Address
()
{
...
...
@@ -78,6 +85,7 @@ public class ProdApplyInfoTEntity {
public
void
setApply_Address
(
String
apply_Address
)
{
this
.
apply_Address
=
apply_Address
;
}
@Basic
@Column
(
name
=
"DRAW_TYPE"
,
nullable
=
false
,
length
=
2
)
public
String
getDraw_Type
()
{
...
...
@@ -87,6 +95,7 @@ public class ProdApplyInfoTEntity {
public
void
setDraw_Type
(
String
draw_Type
)
{
this
.
draw_Type
=
draw_Type
;
}
@Basic
@Column
(
name
=
"PROVINCE_NO"
,
nullable
=
true
,
length
=
6
)
public
String
getProvince_No
()
{
...
...
@@ -98,7 +107,6 @@ public class ProdApplyInfoTEntity {
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
...
...
src/main/java/com/yxproject/start/entity/prod/ProdGroupTEntity.java
View file @
77a372e3
...
...
@@ -29,6 +29,7 @@ public class ProdGroupTEntity {
private
String
move_Flag
;
private
Byte
move_Count
;
private
Time
move_Date
;
@Id
@Column
(
name
=
"GROUP_NO"
,
nullable
=
false
,
length
=
10
)
public
String
getGroup_No
()
{
...
...
@@ -38,6 +39,7 @@ public class ProdGroupTEntity {
public
void
setGroup_No
(
String
group_No
)
{
this
.
group_No
=
group_No
;
}
@Basic
@Column
(
name
=
"VALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getValid_Count
()
{
...
...
@@ -47,6 +49,7 @@ public class ProdGroupTEntity {
public
void
setValid_Count
(
Byte
valid_Count
)
{
this
.
valid_Count
=
valid_Count
;
}
@Basic
@Column
(
name
=
"INVALID_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getInvalid_Count
()
{
...
...
@@ -56,6 +59,7 @@ public class ProdGroupTEntity {
public
void
setInvalid_Count
(
Byte
invalid_Count
)
{
this
.
invalid_Count
=
invalid_Count
;
}
@Basic
@Column
(
name
=
"SUBMIT_DATE"
,
nullable
=
true
)
public
Time
getSubmit_Date
()
{
...
...
@@ -65,6 +69,7 @@ public class ProdGroupTEntity {
public
void
setSubmit_Date
(
Time
submit_Date
)
{
this
.
submit_Date
=
submit_Date
;
}
@Basic
@Column
(
name
=
"SUBMIT_CODE"
,
nullable
=
true
,
length
=
8
)
public
String
getSubmit_Code
()
{
...
...
@@ -74,6 +79,7 @@ public class ProdGroupTEntity {
public
void
setSubmit_Code
(
String
submit_Code
)
{
this
.
submit_Code
=
submit_Code
;
}
@Basic
@Column
(
name
=
"EXPORT_DATE"
,
nullable
=
true
)
public
Time
getExport_Date
()
{
...
...
@@ -83,6 +89,7 @@ public class ProdGroupTEntity {
public
void
setExport_Date
(
Time
export_Date
)
{
this
.
export_Date
=
export_Date
;
}
@Basic
@Column
(
name
=
"EXPORT_CODE"
,
nullable
=
true
,
length
=
8
)
public
String
getExport_Code
()
{
...
...
@@ -92,6 +99,7 @@ public class ProdGroupTEntity {
public
void
setExport_Code
(
String
export_Code
)
{
this
.
export_Code
=
export_Code
;
}
@Basic
@Column
(
name
=
"DOWNLOAD_FLAG"
,
nullable
=
true
,
length
=
1
)
public
String
getDownload_Flag
()
{
...
...
@@ -101,6 +109,7 @@ public class ProdGroupTEntity {
public
void
setDownload_Flag
(
String
download_Flag
)
{
this
.
download_Flag
=
download_Flag
;
}
@Basic
@Column
(
name
=
"DOWNLOAD_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getDownload_Count
()
{
...
...
@@ -110,6 +119,7 @@ public class ProdGroupTEntity {
public
void
setDownload_Count
(
Byte
download_Count
)
{
this
.
download_Count
=
download_Count
;
}
@Basic
@Column
(
name
=
"DOWNLOAD_DATE"
,
nullable
=
true
)
public
Time
getDownload_Date
()
{
...
...
@@ -119,6 +129,7 @@ public class ProdGroupTEntity {
public
void
setDownload_Date
(
Time
download_Date
)
{
this
.
download_Date
=
download_Date
;
}
@Basic
@Column
(
name
=
"EWRITE_FLAG"
,
nullable
=
true
,
length
=
1
)
public
String
getEwrite_Flag
()
{
...
...
@@ -128,6 +139,7 @@ public class ProdGroupTEntity {
public
void
setEwrite_Flag
(
String
ewrite_Flag
)
{
this
.
ewrite_Flag
=
ewrite_Flag
;
}
@Basic
@Column
(
name
=
"EWRITE_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getEwrite_Count
()
{
...
...
@@ -137,6 +149,7 @@ public class ProdGroupTEntity {
public
void
setEwrite_Count
(
Byte
ewrite_Count
)
{
this
.
ewrite_Count
=
ewrite_Count
;
}
@Basic
@Column
(
name
=
"EWRITE_DATE"
,
nullable
=
true
)
public
Time
getEwrite_Date
()
{
...
...
@@ -146,6 +159,7 @@ public class ProdGroupTEntity {
public
void
setEwrite_Date
(
Time
ewrite_Date
)
{
this
.
ewrite_Date
=
ewrite_Date
;
}
@Basic
@Column
(
name
=
"CHECK_FLAG"
,
nullable
=
true
,
length
=
1
)
public
String
getCheck_Flag
()
{
...
...
@@ -155,6 +169,7 @@ public class ProdGroupTEntity {
public
void
setCheck_Flag
(
String
check_Flag
)
{
this
.
check_Flag
=
check_Flag
;
}
@Basic
@Column
(
name
=
"CHECK_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getCheck_Count
()
{
...
...
@@ -164,6 +179,7 @@ public class ProdGroupTEntity {
public
void
setCheck_Count
(
Byte
check_Count
)
{
this
.
check_Count
=
check_Count
;
}
@Basic
@Column
(
name
=
"CHECK_DATE"
,
nullable
=
true
)
public
Time
getCheck_Date
()
{
...
...
@@ -173,6 +189,7 @@ public class ProdGroupTEntity {
public
void
setCheck_Date
(
Time
check_Date
)
{
this
.
check_Date
=
check_Date
;
}
@Basic
@Column
(
name
=
"SEND_FLAG"
,
nullable
=
true
,
length
=
1
)
public
String
getSend_Flag
()
{
...
...
@@ -182,6 +199,7 @@ public class ProdGroupTEntity {
public
void
setSend_Flag
(
String
send_Flag
)
{
this
.
send_Flag
=
send_Flag
;
}
@Basic
@Column
(
name
=
"SEND_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getSend_Count
()
{
...
...
@@ -191,6 +209,7 @@ public class ProdGroupTEntity {
public
void
setSend_Count
(
Byte
send_Count
)
{
this
.
send_Count
=
send_Count
;
}
@Basic
@Column
(
name
=
"SEND_DATE"
,
nullable
=
true
)
public
Time
getSend_Date
()
{
...
...
@@ -200,6 +219,7 @@ public class ProdGroupTEntity {
public
void
setSend_Date
(
Time
send_Date
)
{
this
.
send_Date
=
send_Date
;
}
@Basic
@Column
(
name
=
"MOVE_FLAG"
,
nullable
=
true
,
length
=
1
)
public
String
getMove_Flag
()
{
...
...
@@ -209,6 +229,7 @@ public class ProdGroupTEntity {
public
void
setMove_Flag
(
String
move_Flag
)
{
this
.
move_Flag
=
move_Flag
;
}
@Basic
@Column
(
name
=
"MOVE_COUNT"
,
nullable
=
true
,
precision
=
0
)
public
Byte
getMove_Count
()
{
...
...
@@ -218,6 +239,7 @@ public class ProdGroupTEntity {
public
void
setMove_Count
(
Byte
move_Count
)
{
this
.
move_Count
=
move_Count
;
}
@Basic
@Column
(
name
=
"MOVE_DATE"
,
nullable
=
true
)
public
Time
getMove_Date
()
{
...
...
src/main/java/com/yxproject/start/entity/prod/ProdTraceTEntity.java
View file @
77a372e3
...
...
@@ -20,6 +20,7 @@ public class ProdTraceTEntity {
private
Time
check_Date
;
private
String
mover_No
;
private
Time
move_Date
;
@Id
@Column
(
name
=
"ACCEPT_NO"
,
nullable
=
false
,
length
=
12
)
public
String
getAccept_No
()
{
...
...
@@ -29,6 +30,7 @@ public class ProdTraceTEntity {
public
void
setAccept_No
(
String
accept_No
)
{
this
.
accept_No
=
accept_No
;
}
@Basic
@Column
(
name
=
"PHOTOER_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getPhotoer_No
()
{
...
...
@@ -38,6 +40,7 @@ public class ProdTraceTEntity {
public
void
setPhotoer_No
(
String
photoer_No
)
{
this
.
photoer_No
=
photoer_No
;
}
@Basic
@Column
(
name
=
"PHOTO_DATE"
,
nullable
=
true
)
public
Time
getPhoto_Date
()
{
...
...
@@ -47,6 +50,7 @@ public class ProdTraceTEntity {
public
void
setPhoto_Date
(
Time
photo_Date
)
{
this
.
photo_Date
=
photo_Date
;
}
@Basic
@Column
(
name
=
"EXPORT_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getExport_No
()
{
...
...
@@ -56,6 +60,7 @@ public class ProdTraceTEntity {
public
void
setExport_No
(
String
export_No
)
{
this
.
export_No
=
export_No
;
}
@Basic
@Column
(
name
=
"EXPORT_DATE"
,
nullable
=
true
)
public
Time
getExport_Date
()
{
...
...
@@ -65,6 +70,7 @@ public class ProdTraceTEntity {
public
void
setExport_Date
(
Time
export_Date
)
{
this
.
export_Date
=
export_Date
;
}
@Basic
@Column
(
name
=
"DOWNLOAD_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getDownload_No
()
{
...
...
@@ -74,6 +80,7 @@ public class ProdTraceTEntity {
public
void
setDownload_No
(
String
download_No
)
{
this
.
download_No
=
download_No
;
}
@Basic
@Column
(
name
=
"DOWNLOAD_DATE"
,
nullable
=
true
)
public
Time
getDownload_Date
()
{
...
...
@@ -83,6 +90,7 @@ public class ProdTraceTEntity {
public
void
setDownload_Date
(
Time
download_Date
)
{
this
.
download_Date
=
download_Date
;
}
@Basic
@Column
(
name
=
"ELECTRIC_WRITER_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getElectric_Writer_No
()
{
...
...
@@ -92,6 +100,7 @@ public class ProdTraceTEntity {
public
void
setElectric_Writer_No
(
String
electric_Writer_No
)
{
this
.
electric_Writer_No
=
electric_Writer_No
;
}
@Basic
@Column
(
name
=
"ELECTRIC_WRITE_DATE"
,
nullable
=
true
)
public
Time
getElectric_Write_Date
()
{
...
...
@@ -101,6 +110,7 @@ public class ProdTraceTEntity {
public
void
setElectric_Write_Date
(
Time
electric_Write_Date
)
{
this
.
electric_Write_Date
=
electric_Write_Date
;
}
@Basic
@Column
(
name
=
"CHECKER_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getChecker_No
()
{
...
...
@@ -110,6 +120,7 @@ public class ProdTraceTEntity {
public
void
setChecker_No
(
String
checker_No
)
{
this
.
checker_No
=
checker_No
;
}
@Basic
@Column
(
name
=
"CHECK_DATE"
,
nullable
=
true
)
public
Time
getCheck_Date
()
{
...
...
@@ -119,6 +130,7 @@ public class ProdTraceTEntity {
public
void
setCheck_Date
(
Time
check_Date
)
{
this
.
check_Date
=
check_Date
;
}
@Basic
@Column
(
name
=
"MOVER_NO"
,
nullable
=
true
,
length
=
8
)
public
String
getMover_No
()
{
...
...
@@ -128,6 +140,7 @@ public class ProdTraceTEntity {
public
void
setMover_No
(
String
mover_No
)
{
this
.
mover_No
=
mover_No
;
}
@Basic
@Column
(
name
=
"MOVE_DATE"
,
nullable
=
true
)
public
Time
getMove_Date
()
{
...
...
@@ -137,6 +150,7 @@ public class ProdTraceTEntity {
public
void
setMove_Date
(
Time
move_Date
)
{
this
.
move_Date
=
move_Date
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
...
...
src/main/java/com/yxproject/start/mapper/FailedinfoMapper.java
View file @
77a372e3
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.FailedinfoEntity
;
import
com.yxproject.start.entity.UserInfo
;
import
org.apache.ibatis.annotations.*
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
import
java.util.Map
;
...
...
src/main/java/com/yxproject/start/mapper/GroupinfoMapper.java
View file @
77a372e3
...
...
@@ -4,6 +4,7 @@ import com.yxproject.start.entity.GroupinfoEntity;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
import
java.util.Map
;
/**
* Created by zhangyusheng on 2018/10/13 9:36
...
...
@@ -12,7 +13,17 @@ import java.util.List;
public
interface
GroupinfoMapper
{
public
int
insertGroupinfoEntity
(
GroupinfoEntity
groupinfoEntity
);
public
List
<
GroupinfoEntity
>
findGroupinfoEntityByAcceptNo
(
String
acceptNo
);
public
int
updateGroupinfoEntity
(
GroupinfoEntity
groupinfoEntity
);
public
List
<
GroupinfoEntity
>
findGroupinfoEntityListByProductionTaskListId
(
String
cyclesheetid
);
public
List
<
Map
<
String
,
Object
>>
findCountyInfoList8_10
(
String
groupinfo10
,
String
groupinfo8
);
public
List
<
Map
<
String
,
Object
>>
findCountyInfoList8
(
String
groupinfo8
);
public
List
<
Map
<
String
,
Object
>>
findCountyInfoList10
(
String
groupinfo10
);
}
src/main/java/com/yxproject/start/service/GroupinfoService.java
0 → 100644
View file @
77a372e3
package
com
.
yxproject
.
start
.
service
;
import
com.yxproject.start.entity.GroupinfoEntity
;
import
java.util.List
;
import
java.util.Map
;
/**
* Created by zhangyusheng on 2018/11/1 14:22
*/
public
interface
GroupinfoService
{
public
List
<
Map
<
String
,
Object
>>
findCountyInfoList
(
String
cyclesheetID
);
}
src/main/java/com/yxproject/start/service/ProductionTaskListService.java
View file @
77a372e3
...
...
@@ -10,12 +10,19 @@ import java.util.List;
public
interface
ProductionTaskListService
{
public
List
<
ProductionTaskListEntity
>
findProductionTaskListEntityByID
(
String
id
);
public
int
updateProductionTask
(
ProductionTaskListEntity
map
);
public
int
addProductionTaskListEntity
(
ProductionTaskListEntity
productionTaskListEntity
,
List
<
GroupinfoEntity
>
groupinfoEntities
);
public
int
addQuickCyclesheetInfo
(
String
acceptNo
);
public
List
<
Object
>
findCardInfoByCardIDOrAcceptNo
(
String
cardInfo
);
public
List
<
Object
>
findAccuProductionInfo
(
String
importDate
);
public
int
savePoliceStationVailedInfoEntity
(
List
<
PoliceStationVailedInfoEntity
>
policeStationVailedInfoEntities
);
public
List
<
PoliceStationVailedInfoEntity
>
find
(
String
id
);
public
List
<
ProductionTaskListEntity
>
findProductionTaskListEntityByState
(
int
state
);
...
...
src/main/java/com/yxproject/start/service/impl/GroupinfoServiceImpl.java
0 → 100644
View file @
77a372e3
package
com
.
yxproject
.
start
.
service
.
impl
;
import
com.yxproject.start.entity.GroupinfoEntity
;
import
com.yxproject.start.mapper.GroupinfoMapper
;
import
com.yxproject.start.service.GroupinfoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
/**
* Created by zhangyusheng on 2018/11/1 14:26
*/
@Service
public
class
GroupinfoServiceImpl
implements
GroupinfoService
{
@Autowired
public
GroupinfoMapper
groupinfoMapper
;
@Override
public
List
<
Map
<
String
,
Object
>>
findCountyInfoList
(
String
cyclesheetid
)
{
List
<
Map
<
String
,
Object
>>
countyInfoList
=
new
ArrayList
<>();
List
<
GroupinfoEntity
>
groupinfoEntityList
=
groupinfoMapper
.
findGroupinfoEntityListByProductionTaskListId
(
cyclesheetid
);
List
<
String
>
groupnoLength10
=
new
ArrayList
<
String
>();
List
<
String
>
groupnoLength8
=
new
ArrayList
<
String
>();
for
(
GroupinfoEntity
groupinfoEntity
:
groupinfoEntityList
)
{
if
(
groupinfoEntity
.
getGroupno
().
length
()
==
10
)
{
groupnoLength10
.
add
(
groupinfoEntity
.
getGroupno
());
}
else
{
groupnoLength8
.
add
(
groupinfoEntity
.
getGroupno
());
}
}
String
group_no10
=
""
;
for
(
int
i
=
0
;
i
<
groupnoLength10
.
size
();
i
++)
{
if
(
i
!=
groupnoLength10
.
size
()
-
1
)
{
group_no10
+=
"'"
+
groupnoLength10
.
get
(
i
)
+
"',"
;
}
else
{
group_no10
+=
"'"
+
groupnoLength10
.
get
(
i
)
+
"'"
;
}
}
String
group_no8
=
""
;
for
(
int
i
=
0
;
i
<
groupnoLength8
.
size
();
i
++)
{
if
(
i
!=
groupnoLength8
.
size
()
-
1
)
{
group_no8
+=
"'"
+
groupnoLength8
.
get
(
i
)
+
"',"
;
}
else
{
group_no8
+=
"'"
+
groupnoLength8
.
get
(
i
)
+
"'"
;
}
}
//数组中有长度为10和8 的
if
(
groupnoLength8
.
size
()
!=
0
&&
groupnoLength10
.
size
()
!=
0
)
{
countyInfoList
=
groupinfoMapper
.
findCountyInfoList8_10
(
group_no10
,
group_no8
);
}
else
if
(
groupnoLength8
.
size
()
==
0
&&
groupnoLength10
.
size
()
!=
10
)
{
//数组中只有长度为10 的
countyInfoList
=
groupinfoMapper
.
findCountyInfoList10
(
group_no10
);
}
else
if
(
groupnoLength8
.
size
()
!=
0
&&
groupnoLength10
.
size
()
==
0
)
{
//数组中只有长度为8 的
countyInfoList
=
groupinfoMapper
.
findCountyInfoList8
(
group_no8
);
}
return
countyInfoList
;
}
}
src/main/java/com/yxproject/start/service/impl/UtilServiceImpl.java
View file @
77a372e3
...
...
@@ -14,7 +14,6 @@ public class UtilServiceImpl implements UtilService {
public
UtilMapper
utilMapper
;
@Override
public
int
findProductionTaskListSequenceNextValue
()
{
return
utilMapper
.
findProductionTaskListSequenceNextValue
();
}
...
...
src/main/resources/mapper/GroupinfoMapper.xml
View file @
77a372e3
...
...
@@ -11,7 +11,7 @@
</resultMap>
<select
id=
"findGroupinfoEntityListByProductionTaskListId"
resultType=
"com.yxproject.start.entity.GroupinfoEntity"
parameterType=
"String"
>
select * from GROUPINFO where cyclesheetid like #{id}
select * from GROUPINFO where cyclesheetid like #{
cyclesheet
id}
</select>
<insert
id=
"insertGroupinfoEntity"
parameterType=
"com.yxproject.start.entity.GroupinfoEntity"
>
...
...
@@ -34,7 +34,13 @@
where GROUPID=#{groupid}
</update>
<!--<select id="findGroupinfoEntityByAcceptNo" resultType="java.util.HashMap" parameterType="String">-->
<!--select * from GROUPINFO where GROUPNO =#{acceptNo} or GROUPNO =substr(#{acceptNo},0,8)-->
<!--</select>-->
<select
id=
"findCountyInfoList8_10"
resultType=
"java.util.HashMap"
parameterType=
"String"
>
select * from FINDPRODCOUNTYLIST8_10_VIEW where p_view_param.set_param(#{groupinfo10})=#{groupinfo10} AND p_view_param.set_param2(#{groupinfo8})=#{groupinfo8}
</select>
<select
id=
"findCountyInfoList8"
resultType=
"java.util.HashMap"
parameterType=
"String"
>
select * from FINDPRODCOUNTYLIST8_VIEW where p_view_param.set_param2(#{groupinfo8})=#{groupinfo8}
</select>
<select
id=
"findCountyInfoList10"
resultType=
"java.util.HashMap"
parameterType=
"String"
>
select * from FINDPRODCOUNTYLIST10_VIEW where p_view_param.set_param(#{groupinfo10})=#{groupinfo10}
</select>
</mapper>
\ No newline at end of file
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