Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
Overview
Overview
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
吴迪
gs1-office-web-sit
Commits
bb335a20
Commit
bb335a20
authored
Dec 23, 2021
by
唐功亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复BUG 审核
parent
d74304c9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
13 deletions
+14
-13
TycpdmFirmChangeDao.java
...ava/io/office/modules/manage/dao/TycpdmFirmChangeDao.java
+1
-1
TycpdmFirmDao.java
...main/java/io/office/modules/manage/dao/TycpdmFirmDao.java
+1
-1
TycpdmFirmServiceImpl.java
...ce/modules/manage/service/impl/TycpdmFirmServiceImpl.java
+10
-9
TycpdmFirmChangeDao.xml
src/main/resources/mapper/manage/TycpdmFirmChangeDao.xml
+1
-1
TycpdmFirmDao.xml
src/main/resources/mapper/manage/TycpdmFirmDao.xml
+1
-1
No files found.
src/main/java/io/office/modules/manage/dao/TycpdmFirmChangeDao.java
View file @
bb335a20
...
...
@@ -27,7 +27,7 @@ public interface TycpdmFirmChangeDao extends BaseMapper<TycpdmFirmChangeEntity>
@Update
(
"UPDATE tycpdm_firm_change SET logout_flag = #{logout_flag}, approve_date = #{date} ,approve_content=#{approve_content} , auditor =#{username} WHERE id = #{id}"
)
void
updateBYIdLogoutFlag
(
@Param
(
"logout_flag"
)
String
logout_flag
,
@Param
(
"id"
)
String
id
,
@Param
(
"date"
)
String
date
,
@Param
(
"username"
)
String
username
,
@Param
(
"approve_content"
)
String
approve_content
);
Integer
findTycpdmFirmLogoutFlagCountALL
(
@Param
(
"levels"
)
Integer
levels
,
@Param
(
"logout_flag"
)
Integer
logout_flag
);
Integer
findTycpdmFirmLogoutFlagCountALL
(
@Param
(
"levels"
)
String
levels
,
@Param
(
"logout_flag"
)
Integer
logout_flag
);
List
<
TycpdmFirmChangeEntity
>
selectTycpdmFirmList
(
Map
<
String
,
Object
>
params
,
Page
page
);
...
...
src/main/java/io/office/modules/manage/dao/TycpdmFirmDao.java
View file @
bb335a20
...
...
@@ -23,7 +23,7 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> {
@Select
(
"select * from tycpdm_firm where base_user=#{userName} "
)
TycpdmFirmEntity
findUserName
(
@Param
(
"userName"
)
String
userName
);
Integer
findTycpdmFirmLogoutFlagCountALL
(
@Param
(
"levels"
)
Integer
levels
,
@Param
(
"logout_flag"
)
Integer
logout_flag
);
Integer
findTycpdmFirmLogoutFlagCountALL
(
@Param
(
"levels"
)
String
levels
,
@Param
(
"logout_flag"
)
Integer
logout_flag
);
/* @Update("UPDATE tycpdm_firm SET firmBusinessLicenseFile = #{firmBusinessLicenseFile} , logout_flag=#{logout_flag} WHERE f_id = #{id}")
void updateByIdFirmBusinessLicenseFile(@Param("firmBusinessLicenseFile")String firmBusinessLicenseFile,@Param("id") Integer id,@Param("logout_flag")int logout_flag );
...
...
src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java
View file @
bb335a20
...
...
@@ -123,25 +123,26 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
}
else
if
(
levels
==
1
){
throw
new
RRException
(
"无权访问"
);
}
else
if
(
String
.
valueOf
(
levels
).
length
()==
4
){
//levels=-99;
//levels=-99;
}
else
{
throw
new
RRException
(
"无权访问"
);
}
//审核状态 0待审核 1审核成功 2审核失败
//查询审核数据
Integer
countAll
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
null
);
//查询 申请总数
Integer
auditCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
0
);
//查询 等待审核 0
Integer
throughCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
1
);
//查询 通过审核 1
Integer
notThroughCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
2
);
//查询 未通过审核 2
String
levelsStr
=
levels
+
""
;
Integer
countAll
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levelsStr
,
null
);
//查询 申请总数
Integer
auditCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levelsStr
,
0
);
//查询 等待审核 0
Integer
throughCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levelsStr
,
1
);
//查询 通过审核 1
Integer
notThroughCount
=
tycpdmFirmDao
.
findTycpdmFirmLogoutFlagCountALL
(
levelsStr
,
2
);
//查询 未通过审核 2
map
.
put
(
"countAll"
,
countAll
);
map
.
put
(
"auditCount"
,
auditCount
);
map
.
put
(
"throughCount"
,
throughCount
);
map
.
put
(
"notThroughCount"
,
notThroughCount
);
//查询变更数据
Integer
countChangeAll
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
null
);
//查询 申请总数
Integer
auditChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
0
);
//查询 等待审核 0
Integer
throughChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
1
);
//查询 通过审核 1
Integer
notThroughChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
,
2
);
//查询 未通过审核 2
Integer
countChangeAll
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
Str
,
null
);
//查询 申请总数
Integer
auditChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
Str
,
0
);
//查询 等待审核 0
Integer
throughChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
Str
,
1
);
//查询 通过审核 1
Integer
notThroughChangeCount
=
tycpdmFirmChangeDao
.
findTycpdmFirmLogoutFlagCountALL
(
levels
Str
,
2
);
//查询 未通过审核 2
map
.
put
(
"countChangeAll"
,
countChangeAll
);
map
.
put
(
"auditChangeCount"
,
auditChangeCount
);
map
.
put
(
"throughChangeCount"
,
throughChangeCount
);
...
...
src/main/resources/mapper/manage/TycpdmFirmChangeDao.xml
View file @
bb335a20
...
...
@@ -58,7 +58,7 @@
<select
id=
"findTycpdmFirmLogoutFlagCountALL"
parameterType=
"java.lang.Integer"
resultType=
"java.lang.Integer"
>
select count(*) from tycpdm_firm_change a left join tycpdm_user_service b on a.f_id=b.f_id
where 1=1
<if
test=
"levels
==-99
"
>
<if
test=
"levels
.length==4
"
>
and branchcode=#{levels}
</if>
<if
test=
"logout_flag !=null"
>
...
...
src/main/resources/mapper/manage/TycpdmFirmDao.xml
View file @
bb335a20
...
...
@@ -56,7 +56,7 @@
<select
id=
"findTycpdmFirmLogoutFlagCountALL"
parameterType=
"java.lang.Integer"
resultType=
"java.lang.Integer"
>
select count(*) from tycpdm_firm a left join tycpdm_user_service b on a.f_id=b.f_id
where 1=1
<if
test=
"levels
==-99
"
>
<if
test=
"levels
.length==4
"
>
and branchcode=#{levels}
</if>
<if
test=
"logout_flag !=null"
>
...
...
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