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
a5cb321b
Commit
a5cb321b
authored
Dec 27, 2018
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了查询简易身份信息,
添加了查询废证类型list
parent
e6299184
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
94 additions
and
13 deletions
+94
-13
UserApi.java
src/main/java/com/yxproject/start/api/UserApi.java
+4
-2
ProdCardEntity.java
src/main/java/com/yxproject/start/entity/ProdCardEntity.java
+73
-0
SpecialCardMapper.java
...in/java/com/yxproject/start/mapper/SpecialCardMapper.java
+2
-1
ProdCardService.java
...ain/java/com/yxproject/start/service/ProdCardService.java
+15
-0
TaskService.java
src/main/java/com/yxproject/start/service/TaskService.java
+0
-1
TaskServiceImpl.java
...ava/com/yxproject/start/service/impl/TaskServiceImpl.java
+0
-9
No files found.
src/main/java/com/yxproject/start/api/UserApi.java
View file @
a5cb321b
...
@@ -62,6 +62,8 @@ public class UserApi {
...
@@ -62,6 +62,8 @@ public class UserApi {
private
ReceiptListService
receiptListService
;
private
ReceiptListService
receiptListService
;
@Autowired
@Autowired
private
FailedTypeService
failedTypeService
;
private
FailedTypeService
failedTypeService
;
@Autowired
private
ProdCardService
prodCardService
;
// @Autowired
// @Autowired
// private ReadCountyListXMLService readCountyListXMLService;
// private ReadCountyListXMLService readCountyListXMLService;
...
@@ -510,8 +512,8 @@ public class UserApi {
...
@@ -510,8 +512,8 @@ public class UserApi {
*/
*/
@RequestMapping
(
"selectProdCard"
)
@RequestMapping
(
"selectProdCard"
)
// @RequiresPermissions("userInfo.add")//权限管理;
// @RequiresPermissions("userInfo.add")//权限管理;
public
String
selectProdCard
(
@RequestParam
(
"idNo"
)
String
idNo
,
@RequestParam
(
"acceptNo"
)
String
accept
No
,
HttpServletResponse
resp
)
{
public
String
selectProdCard
(
@RequestParam
(
"idNo"
)
List
id
No
,
HttpServletResponse
resp
)
{
List
<
Map
<
String
,
Object
>>
taskEntity
=
taskService
.
getProdCard
(
idNo
,
accept
No
);
List
<
ProdCardEntity
>
taskEntity
=
prodCardService
.
getProdCard
(
id
No
);
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
resp
.
setCharacterEncoding
(
"UTF-8"
);
resp
.
setCharacterEncoding
(
"UTF-8"
);
yxjsonResponse
.
outPutSuccess
(
taskEntity
);
yxjsonResponse
.
outPutSuccess
(
taskEntity
);
...
...
src/main/java/com/yxproject/start/entity/ProdCardEntity.java
0 → 100644
View file @
a5cb321b
package
com
.
yxproject
.
start
.
entity
;
import
javax.persistence.*
;
import
java.util.Objects
;
/**
* Created by Administrator on 2018/12/26.
*/
@Entity
@Table
(
name
=
"PROD_CARD"
,
schema
=
"DAHAI"
)
public
class
ProdCardEntity
{
private
String
idNo
;
private
String
name
;
private
String
acceptNo
;
private
long
specialType
;
@Id
@Column
(
name
=
"idNo"
,
nullable
=
false
,
precision
=
0
)
public
String
getIdNo
()
{
return
idNo
;
}
public
void
setIdNo
(
String
idNo
)
{
this
.
idNo
=
idNo
;
}
@Basic
@Column
(
name
=
"name"
,
nullable
=
false
,
precision
=
0
)
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
@Basic
@Column
(
name
=
"acceptNo"
,
nullable
=
false
,
precision
=
0
)
public
String
getAcceptNo
()
{
return
acceptNo
;
}
public
void
setAcceptNo
(
String
acceptNo
)
{
this
.
acceptNo
=
acceptNo
;
}
@Basic
@Column
(
name
=
"specialType"
,
nullable
=
false
,
precision
=
0
)
public
long
getSpecialType
()
{
return
specialType
;
}
public
void
setSpecialType
(
long
specialType
)
{
this
.
specialType
=
specialType
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
ProdCardEntity
that
=(
ProdCardEntity
)
o
;
return
Objects
.
equals
(
idNo
,
that
.
idNo
)
&&
Objects
.
equals
(
name
,
that
.
name
)
&&
Objects
.
equals
(
acceptNo
,
that
.
acceptNo
)
&&
Objects
.
equals
(
specialType
,
that
.
specialType
);
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
idNo
,
name
,
acceptNo
,
specialType
);
}
}
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @
a5cb321b
package
com
.
yxproject
.
start
.
mapper
;
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.FailedTypeEntity
;
import
com.yxproject.start.entity.FailedTypeEntity
;
import
com.yxproject.start.entity.ProdCardEntity
;
import
com.yxproject.start.entity.SpecialCardEntity
;
import
com.yxproject.start.entity.SpecialCardEntity
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -20,6 +21,6 @@ public interface SpecialCardMapper {
...
@@ -20,6 +21,6 @@ public interface SpecialCardMapper {
public
List
<
SpecialCardEntity
>
findSpecialCardList
(
String
groupNo
);
public
List
<
SpecialCardEntity
>
findSpecialCardList
(
String
groupNo
);
public
List
<
SpecialCardEntity
>
addTuiZheng
(
String
acceptNumber
);
public
List
<
SpecialCardEntity
>
addTuiZheng
(
String
acceptNumber
);
public
List
<
SpecialCardEntity
>
addRemainingCard
(
String
accept_Number
);
public
List
<
SpecialCardEntity
>
addRemainingCard
(
String
accept_Number
);
public
List
<
Map
<
String
,
Object
>>
getProdCard
(
@Param
(
"idNo"
)
String
idNo
,
@Param
(
"acceptNo"
)
String
accept
No
);
public
List
<
ProdCardEntity
>
getProdCard
(
String
id
No
);
public
List
<
FailedTypeEntity
>
getFailedType
();
public
List
<
FailedTypeEntity
>
getFailedType
();
}
}
src/main/java/com/yxproject/start/service/ProdCardService.java
0 → 100644
View file @
a5cb321b
package
com
.
yxproject
.
start
.
service
;
import
com.yxproject.start.entity.ProdCardEntity
;
import
java.util.List
;
import
java.util.Map
;
/**
* Created by Administrator on 2018/12/26.
*/
public
interface
ProdCardService
{
public
List
<
ProdCardEntity
>
getProdCard
(
List
idNo
);
}
src/main/java/com/yxproject/start/service/TaskService.java
View file @
a5cb321b
...
@@ -28,7 +28,6 @@ public interface TaskService {
...
@@ -28,7 +28,6 @@ public interface TaskService {
public
int
addExceptionState
(
String
taskId
,
String
exceptionInformation
);
public
int
addExceptionState
(
String
taskId
,
String
exceptionInformation
);
public
List
<
Map
<
String
,
Object
>>
getProdCard
(
String
idNo
,
String
acceptNo
);
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
// public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
...
...
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @
a5cb321b
...
@@ -434,15 +434,6 @@ public class TaskServiceImpl implements TaskService {
...
@@ -434,15 +434,6 @@ public class TaskServiceImpl implements TaskService {
return
i
;
return
i
;
}
}
/**
* 查询废证
* @return
*/
@Override
public
List
<
Map
<
String
,
Object
>>
getProdCard
(
String
idNo
,
String
acceptNo
){
List
<
Map
<
String
,
Object
>>
getProdCard
=
specialCardMapper
.
getProdCard
(
idNo
,
acceptNo
);
return
getProdCard
;
}
/**
/**
* 测试查询
* 测试查询
...
...
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