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
adc120bc
Commit
adc120bc
authored
Apr 02, 2019
by
liboyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下发任务单
parent
57c01d9e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
7 deletions
+25
-7
UserInfo.java
src/main/java/com/yxproject/start/entity/UserInfo.java
+9
-0
UserInfoMapper.java
src/main/java/com/yxproject/start/mapper/UserInfoMapper.java
+1
-0
dispatchTask.html
...ain/resources/static/views/dispatchTask/dispatchTask.html
+9
-1
dispatchTask.js
src/main/resources/static/views/dispatchTask/dispatchTask.js
+1
-0
taskListPrint.html
src/main/resources/static/views/task/taskListPrint.html
+5
-6
No files found.
src/main/java/com/yxproject/start/entity/UserInfo.java
View file @
adc120bc
...
...
@@ -19,6 +19,7 @@ public class UserInfo implements Serializable {
private
String
password
;
private
String
salt
;
private
byte
state
;
private
String
workGroup
;
@ManyToMany
(
fetch
=
FetchType
.
EAGER
)
@JoinTable
(
name
=
"SysUserRole"
,
joinColumns
=
{
@JoinColumn
(
name
=
"userId"
)
},
inverseJoinColumns
={
@JoinColumn
(
name
=
"roleId"
)
})
private
List
<
SysRole
>
roleList
;
...
...
@@ -79,4 +80,11 @@ public class UserInfo implements Serializable {
this
.
roleList
=
roleList
;
}
public
String
getWorkGroup
()
{
return
workGroup
;
}
public
void
setWorkGroup
(
String
workGroup
)
{
this
.
workGroup
=
workGroup
;
}
}
\ No newline at end of file
src/main/java/com/yxproject/start/mapper/UserInfoMapper.java
View file @
adc120bc
...
...
@@ -24,6 +24,7 @@ public interface UserInfoMapper {
@Result
(
property
=
"password"
,
column
=
"password"
),
@Result
(
property
=
"salt"
,
column
=
"salt"
),
@Result
(
property
=
"state"
,
column
=
"state"
),
@Result
(
property
=
"workGroup"
,
column
=
"WORK_GROUP"
),
@Result
(
property
=
"roleList"
,
javaType
=
List
.
class
,
column
=
"id"
,
many
=
@Many
(
select
=
"com.yxproject.start.mapper.SysRoleMapper.selectRoleAndPermissionByUserId"
))})
public
UserInfo
findUserByUsername
(
String
username
);
...
...
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @
adc120bc
...
...
@@ -83,7 +83,15 @@
</table>
<!-- /.table -->
<div
class=
"box-footer"
style=
"text-align: right;"
>
<button
class=
"btn btn-primary"
ng-click=
"goes()"
>
下发任务单
</button>
<div
class=
"pull-right"
style=
"margin-left: 10px;"
>
<button
class=
"btn btn-primary"
ng-click=
"goes()"
>
下发任务单
</button>
</div>
<div
class=
"pull-right"
>
<select
class=
"form-control select2"
id=
"group"
style=
"border-radius:5px"
>
<option
value=
"1"
>
A组
</option>
<option
value=
"2"
>
B组
</option>
</select>
</div>
</div>
</div>
</div>
...
...
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @
adc120bc
...
...
@@ -157,6 +157,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
var
json
=
{
process
:
$rootScope
.
loginData
.
roleList
[
0
].
process
,
name
:
$rootScope
.
loginData
.
name
,
workGroup
:
$
(
"#group"
).
val
(),
taskIdList
:
arr
,
failedList
:
failedArr
}
...
...
src/main/resources/static/views/task/taskListPrint.html
View file @
adc120bc
...
...
@@ -47,6 +47,7 @@
<th>
证件数量
</th>
<th>
特殊证件数量
</th>
<th>
废证数量
</th>
<th>
工作组
</th>
<th></th>
</tr>
</thead>
...
...
@@ -64,6 +65,8 @@
<td
class=
"mailbox-attachment"
>
{{task.specialCount}}
</td>
<td
ng-if=
"task.faileCount!=0"
class=
"mailbox-subject"
style=
"color: red;"
>
{{task.faileCount}}
</td>
<td
ng-if=
"task.faileCount==0"
class=
"mailbox-subject"
>
{{task.faileCount}}
</td>
<td
class=
"mailbox-attachment text-red"
ng-if=
"task.workGroup==1"
>
A组
</td>
<td
class=
"mailbox-attachment text-green"
ng-if=
"task.workGroup==2"
>
B组
</td>
<td
class=
"mailbox-date"
><a
ng-click=
"getPoliceList(task.groupList,task.taskId)"
>
组号列表
</a></td>
</tr>
<tr
ng-if=
"task.taskId==taskId"
>
...
...
@@ -100,12 +103,6 @@
<div
class=
"pull-right"
style=
"margin-left: 10px;"
>
<button
class=
"btn btn-primary"
ng-click=
"goes()"
>
转出任务单
</button>
</div>
<div
class=
"pull-right"
>
<select
class=
"form-control select2"
id=
"print"
style=
"border-radius:5px"
>
<option
value=
"1"
>
一号打印机
</option>
<option
value=
"2"
>
二号打印机
</option>
</select>
</div>
</div>
</div>
</div>
...
...
@@ -140,6 +137,7 @@
<th>
核验数量
</th>
<th>
证件数量
</th>
<th>
特殊证件数量
</th>
<th>
工作组
</th>
<th></th>
</tr>
</thead>
...
...
@@ -152,6 +150,7 @@
<td
class=
"mailbox-subject"
>
{{task.countyValidCount}}
</td>
<td
class=
"mailbox-subject"
>
{{task.countyValidCount-task.specialCount}}
</td>
<td
class=
"mailbox-attachment"
>
{{task.specialCount}}
</td>
<td
class=
"mailbox-attachment"
>
{{task.workGroup}}
</td>
<td
class=
"mailbox-date"
><a
ng-click=
"getPoliceList(task.groupList,task.taskId)"
>
组号列表
</a></td>
</tr>
<tr
ng-if=
"task.taskId==taskId"
>
...
...
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