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
d3c4062b
Commit
d3c4062b
authored
Jan 02, 2019
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改添加废证API
修改添加废证页面
parent
f493d4d1
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
150 additions
and
69 deletions
+150
-69
UserApi.java
src/main/java/com/yxproject/start/api/UserApi.java
+25
-7
FailedCardEntity.java
...ain/java/com/yxproject/start/entity/FailedCardEntity.java
+51
-54
FailedCardMapper.java
...ain/java/com/yxproject/start/mapper/FailedCardMapper.java
+24
-0
FailedCardService.java
...n/java/com/yxproject/start/service/FailedCardService.java
+6
-0
FailedCardServiceImpl.java
...m/yxproject/start/service/impl/FailedCardServiceImpl.java
+21
-0
FailedCardMapper.xml
src/main/resources/mapper/FailedCardMapper.xml
+12
-3
service.js
src/main/resources/static/js/services/service.js
+5
-2
addFailedCard.js
...esources/static/tpl/layout/addFailedCard/addFailedCard.js
+4
-1
failedCard.html
...in/resources/static/tpl/layout/failedCard/failedCard.html
+1
-1
searchSpecialCard.html
...tatic/tpl/layout/searchSpecialCard/searchSpecialCard.html
+1
-1
No files found.
src/main/java/com/yxproject/start/api/UserApi.java
View file @
d3c4062b
...
@@ -247,13 +247,31 @@ public class UserApi {
...
@@ -247,13 +247,31 @@ public class UserApi {
* @return
* @return
*/
*/
@RequestMapping
(
"addFailedinfo"
)
@RequestMapping
(
"addFailedinfo"
)
public
String
addFailedinfo
(
@RequestParam
(
"idNo"
)
String
id
,
HttpServletResponse
resp
)
{
public
String
addFailedinfo
(
@RequestParam
(
"idNo"
)
String
idNo
,
HttpServletResponse
resp
)
throws
Exception
{
String
map
=
"[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]"
;
JSONObject
jsonObject
=
JSONObject
.
fromObject
(
idNo
);
JSONArray
jsonArray
=
JSONArray
.
fromObject
(
map
);
Map
<
String
,
List
>
map
=
jsonObject
;
List
<
Map
<
String
,
String
>>
list
=
map
.
get
(
"list"
);
List
<
FailedCardEntity
>
failedinfoEntityList
=
new
ArrayList
<>();
List
<
FailedCardEntity
>
failedinfoEntityList
=
new
ArrayList
<>();
for
(
Object
object
:
jsonArray
)
{
for
(
Map
<
String
,
String
>
acceptMap
:
list
)
{
FailedCardEntity
o
=
(
FailedCardEntity
)
JSONObject
.
toBean
((
JSONObject
)
object
,
FailedCardEntity
.
class
);
FailedCardEntity
failedCardEntity
=
new
FailedCardEntity
();
failedinfoEntityList
.
add
(
o
);
String
acceptNo
=
acceptMap
.
get
(
"acceptNo"
);
failedCardEntity
.
setAccept_No
(
acceptNo
);
failedCardEntity
.
setFailed_Card_Reason_Id
(
Long
.
valueOf
(
acceptMap
.
get
(
"reson"
)));
List
<
FailedCardEntity
>
failedCardEntities
=
failedCardService
.
selectAcceptNoAtFailedCard
(
acceptNo
);
List
<
SpecialCardEntity
>
specialCardEntities
=
failedCardService
.
selectAcceptNoAtSpecialCard
(
acceptNo
);
List
<
GroupNoEntity
>
groupNoEntities
=
failedCardService
.
selectAcceptNoAtGroupNo
(
acceptNo
.
substring
(
0
,
8
));
if
(
failedCardEntities
.
size
()!=
0
){
failedCardEntity
.
setTask_Id
(
failedCardEntities
.
get
(
0
).
getTask_Id
());
}
else
if
(
specialCardEntities
.
size
()!=
0
){
failedCardEntity
.
setTask_Id
(
specialCardEntities
.
get
(
0
).
getTask_Id
());
}
else
if
(
groupNoEntities
.
size
()!=
0
){
failedCardEntity
.
setTask_Id
(
groupNoEntities
.
get
(
0
).
getTask_Id
());
}
else
{
throw
new
Exception
(
"证件信息有误"
);
}
failedinfoEntityList
.
add
(
failedCardEntity
);
}
}
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
YXJSONResponse
yxjsonResponse
=
new
YXJSONResponse
();
resp
.
setCharacterEncoding
(
"UTF-8"
);
resp
.
setCharacterEncoding
(
"UTF-8"
);
...
@@ -271,7 +289,7 @@ public class UserApi {
...
@@ -271,7 +289,7 @@ public class UserApi {
// @RequiresPermissions("userInfo.add")//权限管理;
// @RequiresPermissions("userInfo.add")//权限管理;
public
String
updateFailedinfo
(
@RequestParam
(
"failedCardId"
)
String
id
,
@RequestParam
(
"state"
)
String
state
,
HttpServletResponse
resp
)
{
public
String
updateFailedinfo
(
@RequestParam
(
"failedCardId"
)
String
id
,
@RequestParam
(
"state"
)
String
state
,
HttpServletResponse
resp
)
{
FailedCardEntity
failedCardEntity
=
new
FailedCardEntity
();
FailedCardEntity
failedCardEntity
=
new
FailedCardEntity
();
failedCardEntity
.
setFailed
Card
Id
(
Long
.
valueOf
(
id
));
failedCardEntity
.
setFailed
_Card_
Id
(
Long
.
valueOf
(
id
));
failedCardEntity
.
setState
(
Long
.
valueOf
(
state
));
failedCardEntity
.
setState
(
Long
.
valueOf
(
state
));
List
<
FailedCardEntity
>
failedinfoEntityList
=
new
ArrayList
<>();
List
<
FailedCardEntity
>
failedinfoEntityList
=
new
ArrayList
<>();
// for (Object object : jsonArray) {
// for (Object object : jsonArray) {
...
...
src/main/java/com/yxproject/start/entity/FailedCardEntity.java
View file @
d3c4062b
...
@@ -11,90 +11,87 @@ import java.util.Objects;
...
@@ -11,90 +11,87 @@ import java.util.Objects;
@Entity
@Entity
@Table
(
name
=
"FAILED_CARD"
,
schema
=
"DAHAI"
)
@Table
(
name
=
"FAILED_CARD"
,
schema
=
"DAHAI"
)
public
class
FailedCardEntity
{
public
class
FailedCardEntity
{
private
long
failed
Card
Id
;
private
long
failed
_Card_
Id
;
private
long
failed
CardReason
Id
;
private
long
failed
_Card_Reason_
Id
;
private
String
acceptNo
;
private
String
accept
_
No
;
private
long
taskId
;
private
long
task
_
Id
;
private
Date
positionDate
;
private
Date
position
_
Date
;
private
Date
finishDate
;
private
Date
finish
_
Date
;
private
Date
allotDate
;
private
Date
allot
_
Date
;
private
Date
printDate
;
private
Date
print
_
Date
;
private
long
state
;
private
long
state
;
@Id
@Id
@Column
(
name
=
"FAILED_CARD_ID"
,
nullable
=
false
,
precision
=
0
)
@Column
(
name
=
"FAILED_CARD_ID"
,
nullable
=
false
,
precision
=
0
)
public
long
getFailed
Card
Id
()
{
public
long
getFailed
_Card_
Id
()
{
return
failed
Card
Id
;
return
failed
_Card_
Id
;
}
}
public
void
setFailed
CardId
(
long
failedCard
Id
)
{
public
void
setFailed
_Card_Id
(
long
failed_Card_
Id
)
{
this
.
failed
CardId
=
failedCard
Id
;
this
.
failed
_Card_Id
=
failed_Card_
Id
;
}
}
@Basic
@Basic
@Column
(
name
=
"FAILED_CARD_REASON_ID"
,
nullable
=
true
,
precision
=
0
)
@Column
(
name
=
"FAILED_CARD_REASON_ID"
,
nullable
=
true
)
public
long
getFailed
CardReason
Id
()
{
public
long
getFailed
_Card_Reason_
Id
()
{
return
failed
CardReason
Id
;
return
failed
_Card_Reason_
Id
;
}
}
public
void
setFailed
CardReasonId
(
long
failedCardReason
Id
)
{
public
void
setFailed
_Card_Reason_Id
(
long
failed_Card_Reason_
Id
)
{
this
.
failed
CardReasonId
=
failedCardReason
Id
;
this
.
failed
_Card_Reason_Id
=
failed_Card_Reason_
Id
;
}
}
@Basic
@Basic
@Column
(
name
=
"ACCEPT_NO"
,
nullable
=
true
,
length
=
20
)
@Column
(
name
=
"ACCEPT_NO"
,
nullable
=
true
,
length
=
20
)
public
String
getAcceptNo
()
{
public
String
getAccept
_
No
()
{
return
acceptNo
;
return
accept
_
No
;
}
}
public
void
setAccept
No
(
String
accept
No
)
{
public
void
setAccept
_No
(
String
accept_
No
)
{
this
.
accept
No
=
accept
No
;
this
.
accept
_No
=
accept_
No
;
}
}
@Basic
@Basic
@Column
(
name
=
"TASK_ID"
,
nullable
=
false
,
precision
=
0
)
@Column
(
name
=
"TASK_ID"
,
nullable
=
false
,
precision
=
0
)
public
long
getTaskId
()
{
public
long
getTask
_
Id
()
{
return
taskId
;
return
task
_
Id
;
}
}
public
void
setTask
Id
(
long
task
Id
)
{
public
void
setTask
_Id
(
long
task_
Id
)
{
this
.
task
Id
=
task
Id
;
this
.
task
_Id
=
task_
Id
;
}
}
@Basic
@Basic
@Column
(
name
=
"POSITION_DATE"
,
nullable
=
true
,
length
=
20
)
@Column
(
name
=
"POSITION_DATE"
,
nullable
=
true
,
length
=
20
)
public
Date
getPositionDate
()
{
public
Date
getPosition
_
Date
()
{
return
positionDate
;
return
position
_
Date
;
}
}
public
void
setPosition
Date
(
Date
position
Date
)
{
public
void
setPosition
_Date
(
Date
position_
Date
)
{
this
.
position
Date
=
position
Date
;
this
.
position
_Date
=
position_
Date
;
}
}
@Basic
@Basic
@Column
(
name
=
"FINSH_DATE"
,
nullable
=
true
,
length
=
20
)
@Column
(
name
=
"FINSH_DATE"
,
nullable
=
true
,
length
=
20
)
public
Date
getFinishDate
()
{
public
Date
getFinish
_
Date
()
{
return
finishDate
;
return
finish
_
Date
;
}
}
public
void
setFinish
Date
(
Date
finish
Date
)
{
public
void
setFinish
_Date
(
Date
finish_
Date
)
{
this
.
finish
Date
=
finish
Date
;
this
.
finish
_Date
=
finish_
Date
;
}
}
@Basic
@Basic
@Column
(
name
=
"ALLOT_DATE"
,
nullable
=
true
,
length
=
20
)
@Column
(
name
=
"ALLOT_DATE"
,
nullable
=
true
,
length
=
20
)
public
Date
getAllotDate
()
{
public
Date
getAllot
_
Date
()
{
return
allotDate
;
return
allot
_
Date
;
}
}
public
void
setAllot
Date
(
Date
allot
Date
)
{
public
void
setAllot
_Date
(
Date
allot_
Date
)
{
this
.
allot
Date
=
allot
Date
;
this
.
allot
_Date
=
allot_
Date
;
}
}
@Basic
@Basic
@Column
(
name
=
"PRINT_DATE"
,
nullable
=
true
,
length
=
20
)
@Column
(
name
=
"PRINT_DATE"
,
nullable
=
true
,
length
=
20
)
public
Date
getPrintDate
()
{
public
Date
getPrint
_
Date
()
{
return
printDate
;
return
print
_
Date
;
}
}
public
void
setPrintDate
(
Date
printDate
)
{
this
.
printDate
=
printDate
;
public
void
setPrint_Date
(
Date
print_Date
)
{
this
.
print_Date
=
print_Date
;
}
}
@Basic
@Basic
...
@@ -112,21 +109,21 @@ public class FailedCardEntity {
...
@@ -112,21 +109,21 @@ public class FailedCardEntity {
if
(
this
==
o
)
return
true
;
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
FailedCardEntity
that
=
(
FailedCardEntity
)
o
;
FailedCardEntity
that
=
(
FailedCardEntity
)
o
;
return
Objects
.
equals
(
failed
CardId
,
that
.
failedCard
Id
)
&&
return
Objects
.
equals
(
failed
_Card_Id
,
that
.
failed_Card_
Id
)
&&
Objects
.
equals
(
failed
CardReasonId
,
that
.
failedCardReason
Id
)
&&
Objects
.
equals
(
failed
_Card_Reason_Id
,
that
.
failed_Card_Reason_
Id
)
&&
Objects
.
equals
(
accept
No
,
that
.
accept
No
)
&&
Objects
.
equals
(
accept
_No
,
that
.
accept_
No
)
&&
Objects
.
equals
(
task
Id
,
that
.
task
Id
)
&&
Objects
.
equals
(
task
_Id
,
that
.
task_
Id
)
&&
Objects
.
equals
(
position
Date
,
that
.
position
Date
)
&&
Objects
.
equals
(
position
_Date
,
that
.
position_
Date
)
&&
Objects
.
equals
(
allot
Date
,
that
.
allot
Date
)
&&
Objects
.
equals
(
allot
_Date
,
that
.
allot_
Date
)
&&
Objects
.
equals
(
print
Date
,
that
.
print
Date
)
&&
Objects
.
equals
(
print
_Date
,
that
.
print_
Date
)
&&
Objects
.
equals
(
state
,
that
.
state
)
&&
Objects
.
equals
(
state
,
that
.
state
)
&&
Objects
.
equals
(
finish
Date
,
that
.
finish
Date
);
Objects
.
equals
(
finish
_Date
,
that
.
finish_
Date
);
}
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
Objects
.
hash
(
failed
CardId
,
failedCardReasonId
,
acceptNo
,
taskId
,
positionDate
,
finishDate
,
allotDate
,
print
Date
,
state
);
return
Objects
.
hash
(
failed
_Card_Id
,
failed_Card_Reason_Id
,
accept_No
,
task_Id
,
position_Date
,
finish_Date
,
allot_Date
,
print_
Date
,
state
);
}
}
}
}
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @
d3c4062b
package
com
.
yxproject
.
start
.
mapper
;
package
com
.
yxproject
.
start
.
mapper
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.GroupNoEntity
;
import
com.yxproject.start.entity.SpecialCardEntity
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
@@ -34,6 +36,28 @@ public interface FailedCardMapper {
...
@@ -34,6 +36,28 @@ public interface FailedCardMapper {
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public
List
<
FailedCardEntity
>
findFailedList
(
String
state
);
public
List
<
FailedCardEntity
>
findFailedList
(
String
state
);
/**
* 查询废证的任务单
* 在废证表中
* @param accept_No 废证受理号
* @return
*/
public
List
<
FailedCardEntity
>
selectAcceptNoAtFailedCard
(
String
accept_No
);
/**
* 查询废证的任务单
* 在特证表中
* @param accept_No 废证受理号
* @return
*/
public
List
<
SpecialCardEntity
>
selectAcceptNoAtSpecialCard
(
String
accept_No
);
/**
* 查询废证的任务单
* 在组号表中
* @param groupNo 废证受理组号
* @return
*/
public
List
<
GroupNoEntity
>
selectAcceptNoAtGroupNo
(
String
groupNo
);
...
...
src/main/java/com/yxproject/start/service/FailedCardService.java
View file @
d3c4062b
package
com
.
yxproject
.
start
.
service
;
package
com
.
yxproject
.
start
.
service
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.GroupNoEntity
;
import
com.yxproject.start.entity.SpecialCardEntity
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -12,4 +14,8 @@ public interface FailedCardService {
...
@@ -12,4 +14,8 @@ public interface FailedCardService {
public
int
saveFailedinfo
(
List
<
FailedCardEntity
>
failedinfoEntityList
);
public
int
saveFailedinfo
(
List
<
FailedCardEntity
>
failedinfoEntityList
);
public
int
updateFailedinfo
(
List
<
FailedCardEntity
>
failedinfoEntityList
);
public
int
updateFailedinfo
(
List
<
FailedCardEntity
>
failedinfoEntityList
);
public
List
<
FailedCardEntity
>
findFailedList
(
String
state
);
public
List
<
FailedCardEntity
>
findFailedList
(
String
state
);
public
List
<
FailedCardEntity
>
selectAcceptNoAtFailedCard
(
String
accept_No
);
public
List
<
SpecialCardEntity
>
selectAcceptNoAtSpecialCard
(
String
accept_No
);
public
List
<
GroupNoEntity
>
selectAcceptNoAtGroupNo
(
String
groupNo
);
}
}
src/main/java/com/yxproject/start/service/impl/FailedCardServiceImpl.java
View file @
d3c4062b
package
com
.
yxproject
.
start
.
service
.
impl
;
package
com
.
yxproject
.
start
.
service
.
impl
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.FailedCardEntity
;
import
com.yxproject.start.entity.GroupNoEntity
;
import
com.yxproject.start.entity.SpecialCardEntity
;
import
com.yxproject.start.mapper.FailedCardMapper
;
import
com.yxproject.start.mapper.FailedCardMapper
;
import
com.yxproject.start.service.FailedCardService
;
import
com.yxproject.start.service.FailedCardService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -38,4 +40,23 @@ public class FailedCardServiceImpl implements FailedCardService {
...
@@ -38,4 +40,23 @@ public class FailedCardServiceImpl implements FailedCardService {
List
<
FailedCardEntity
>
failedList
=
failedCardMapper
.
findFailedList
(
state
);
List
<
FailedCardEntity
>
failedList
=
failedCardMapper
.
findFailedList
(
state
);
return
failedList
;
return
failedList
;
}
}
@Override
public
List
<
FailedCardEntity
>
selectAcceptNoAtFailedCard
(
String
accept_No
)
{
List
<
FailedCardEntity
>
failedCardEntities
=
failedCardMapper
.
selectAcceptNoAtFailedCard
(
accept_No
);
return
failedCardEntities
;
}
@Override
public
List
<
SpecialCardEntity
>
selectAcceptNoAtSpecialCard
(
String
accept_No
)
{
List
<
SpecialCardEntity
>
specialCardEntities
=
failedCardMapper
.
selectAcceptNoAtSpecialCard
(
accept_No
);
return
specialCardEntities
;
}
@Override
public
List
<
GroupNoEntity
>
selectAcceptNoAtGroupNo
(
String
groupNo
)
{
List
<
GroupNoEntity
>
groupNoEntities
=
failedCardMapper
.
selectAcceptNoAtGroupNo
(
groupNo
);
return
groupNoEntities
;
}
}
}
src/main/resources/mapper/FailedCardMapper.xml
View file @
d3c4062b
...
@@ -18,8 +18,8 @@
...
@@ -18,8 +18,8 @@
</select>
</select>
<insert
id=
"saveFailedCardEntity"
parameterType=
"com.yxproject.start.entity.FailedCardEntity"
>
<insert
id=
"saveFailedCardEntity"
parameterType=
"com.yxproject.start.entity.FailedCardEntity"
>
insert into FAILED_CARD (
FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE
,STATE )
insert into FAILED_CARD (
failed_Card_Reason_Id,ACCEPT_NO,TASK_ID
,STATE )
values (#{failed_Card_
Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date
},#{state})
values (#{failed_Card_
Reason_Id},#{accept_No},#{task_Id
},#{state})
</insert>
</insert>
<update
id=
"updateFailedCardEntity"
parameterType=
"com.yxproject.start.entity.FailedCardEntity"
>
<update
id=
"updateFailedCardEntity"
parameterType=
"com.yxproject.start.entity.FailedCardEntity"
>
...
@@ -36,5 +36,13 @@ update FAILED_CARD
...
@@ -36,5 +36,13 @@ update FAILED_CARD
</set>
</set>
where failed_Card_Id =#{failed_Card_Id}
where failed_Card_Id =#{failed_Card_Id}
</update>
</update>
<select
id=
"selectAcceptNoAtFailedCard"
resultType=
"com.yxproject.start.entity.FailedCardEntity"
parameterType=
"String"
>
select * from failed_card where accept_No =#{accept_No}
</select>
<select
id=
"selectAcceptNoAtSpecialCard"
resultType=
"com.yxproject.start.entity.SpecialCardEntity"
parameterType=
"String"
>
select * from special_card where accept_No =#{accept_No}
</select>
<select
id=
"selectAcceptNoAtGroupNo"
resultType=
"com.yxproject.start.entity.GroupNoEntity"
parameterType=
"String"
>
select * from group_no where group_no =#{groupNo}
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/resources/static/js/services/service.js
View file @
d3c4062b
...
@@ -529,10 +529,13 @@ app.service('MessageService', function (ngDialog) {
...
@@ -529,10 +529,13 @@ app.service('MessageService', function (ngDialog) {
})
})
},
},
saveFailedCardsID
:
function
(
success
){
saveFailedCardsID
:
function
(
idNo
,
success
){
$http
({
$http
({
method
:
'GET'
,
method
:
'GET'
,
url
:
"../yingxin/addInValidCardInfo"
+
urlTimeStamp
(),
url
:
"../user/addFailedinfo"
+
urlTimeStamp
(),
params
:{
idNo
:
idNo
}
}).
then
(
function
successCallback
(
response
)
{
}).
then
(
function
successCallback
(
response
)
{
console
.
log
(
response
.
data
,
"-------------response.data------"
)
console
.
log
(
response
.
data
,
"-------------response.data------"
)
success
(
response
.
data
)
success
(
response
.
data
)
...
...
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js
View file @
d3c4062b
...
@@ -85,7 +85,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
...
@@ -85,7 +85,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope
.
dataInfo
=
data
.
respData
;
$scope
.
dataInfo
=
data
.
respData
;
console
.
log
(
$scope
.
dataInfo
,
"-=====$scope.dataInfo===="
)
console
.
log
(
$scope
.
dataInfo
,
"-=====$scope.dataInfo===="
)
var
count
=
0
;
var
count
=
0
;
for
(
var
i
=
0
;
i
<
$scope
.
dataInfo
.
size
;
i
++
){
for
(
var
i
=
0
;
i
<
$scope
.
dataInfo
.
length
;
i
++
){
if
(
$scope
.
dataInfo
[
i
].
name
!=
null
){
if
(
$scope
.
dataInfo
[
i
].
name
!=
null
){
count
+=
1
;
count
+=
1
;
}
else
{
}
else
{
...
@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
...
@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope
.
confirmFailedInfo
=
function
()
{
$scope
.
confirmFailedInfo
=
function
()
{
console
.
log
(
$rootScope
.
arr
)
console
.
log
(
$rootScope
.
arr
)
$
(
".confirmBtn"
).
attr
(
"disabled"
,
true
);
$
(
".confirmBtn"
).
attr
(
"disabled"
,
true
);
console
.
log
(
count
,
"--------count"
);
console
.
log
(
$scope
.
dataInfo
.
length
,
"--$scope.dataInfo.length--"
);
console
.
log
(
$scope
.
dataInfo
,
"---$scope.dataInfo----"
);
if
(
count
==
$scope
.
dataInfo
.
length
){
if
(
count
==
$scope
.
dataInfo
.
length
){
HttpService
.
saveFailedCardsID
(
$rootScope
.
arr
,
function
(
data
){
HttpService
.
saveFailedCardsID
(
$rootScope
.
arr
,
function
(
data
){
$scope
.
isShowSuccess
=
1
;
$scope
.
isShowSuccess
=
1
;
...
...
src/main/resources/static/tpl/layout/failedCard/failedCard.html
View file @
d3c4062b
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<span
style=
"padding-left:10px;"
<span
style=
"padding-left:10px;"
ng-show=
"failedCard.allotDate==null"
>
未分配
</span>
ng-show=
"failedCard.allotDate==null"
>
未分配
</span>
<span
style=
"padding-left:10px;"
<span
style=
"padding-left:10px;"
ng-show=
"failedCard.allotDate!=null"
>
{{failedCard.allotDate}}
}
</span></span>
ng-show=
"failedCard.allotDate!=null"
>
{{failedCard.allotDate}}
</span></span>
</td>
</td>
<td>
{{failedCard.positionDate}}
</td>
<td>
{{failedCard.positionDate}}
</td>
<td>
{{failedCard.state}}
</td>
<td>
{{failedCard.state}}
</td>
...
...
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.html
View file @
d3c4062b
...
@@ -574,7 +574,7 @@
...
@@ -574,7 +574,7 @@
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h3
class=
"panel-title"
>
<h3
class=
"panel-title"
>
循环单
循环单
</h3>
</h3>
分配时间
</div>
</div>
<div
class=
"panel-body"
style=
"width: auto"
>
<div
class=
"panel-body"
style=
"width: auto"
>
<div
class=
"container"
style=
"width: auto"
>
<div
class=
"container"
style=
"width: auto"
>
...
...
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