Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
5bf3327d
Commit
5bf3327d
authored
Dec 25, 2019
by
zuoyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
股東表插入、查詢
parent
d8cfcbb3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
10 deletions
+3
-10
AppShareholderDetail.java
...b/wxiaoqi/security/admin/entity/AppShareholderDetail.java
+2
-5
AppShareholderDetailBiz.java
...b/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java
+0
-2
AppUserPositionTempBiz.java
...ub/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
+0
-1
AppShareholderDetailMapper.xml
.../src/main/resources/mapper/AppShareholderDetailMapper.xml
+1
-2
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppShareholderDetail.java
View file @
5bf3327d
...
...
@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.entity;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.Column
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.persistence.*
;
import
java.io.Serializable
;
import
java.util.Date
;
...
...
@@ -58,7 +55,7 @@ public class AppShareholderDetail implements Serializable {
@Column
(
name
=
"position_id"
)
private
Integer
positionId
;
@Transient
private
String
companyIdArray
;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java
View file @
5bf3327d
...
...
@@ -98,8 +98,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
if
(
branchCompany
.
getData
()
==
null
)
{
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
NOTEXIST_CODE
,
"分公司不存在"
);
}
appShareholderDetailDTO
.
setCompanyId
(
companyId
);
appShareholderDetailDTO
.
setCompanyName
(
branchCompany
.
getData
().
getName
());
Integer
positionId
=
branchCompany
.
getData
().
getId
().
equals
(
1
)
?
HEADQUARTERS_SHAREHOLDER
:
BRANCH_HEADQUARTERS_SHAREHOLDER
;
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
View file @
5bf3327d
...
...
@@ -282,7 +282,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
//记录表插入
appUserPositionChangeRecordBiz
.
addJoinJobRecord
(
appUserPositionTempNew
,
operatorId
);
}
}
catch
(
BaseException
ex
)
{
errorResultMap
=
new
HashMap
<>(
1
);
errorResultMap
.
put
(
"num"
,
i
);
...
...
ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml
View file @
5bf3327d
...
...
@@ -28,7 +28,7 @@
</otherwise>
</choose>
</select>
<select
id=
"findPage"
result
Map=
"d
etail"
>
<select
id=
"findPage"
result
Type=
"com.github.wxiaoqi.security.admin.entity.AppShareholderD
etail"
>
select * from (
select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
...
...
@@ -81,6 +81,5 @@
<result
property=
"isQuit"
column=
"is_quit"
/>
<result
property=
"updTime"
column=
"upd_time"
/>
<result
property=
"positionId"
column=
"positionId"
/>
<result
property=
"companyIdArray"
column=
"companyIdArray"
/>
</resultMap>
</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