Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
48569807
Commit
48569807
authored
Aug 18, 2021
by
kongfm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新人员名称realName
parent
301a2d45
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
DispatchPaperController.java
...ot/module/tzs/biz/controller/DispatchPaperController.java
+6
-6
RescueProcessController.java
...ot/module/tzs/biz/controller/RescueProcessController.java
+3
-3
DispatchPaperServiceImpl.java
...module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
+1
-1
RepairConsultServiceImpl.java
...module/tzs/biz/service/impl/RepairConsultServiceImpl.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java
View file @
48569807
...
@@ -57,12 +57,12 @@ public class DispatchPaperController extends BaseController {
...
@@ -57,12 +57,12 @@ public class DispatchPaperController extends BaseController {
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
if
(
dispatchSaveFeedbackDto
.
getSaveFeedbackUid
()
==
null
&&
dispatchSaveFeedbackDto
.
getSaveFeedbackUser
()
==
null
)
{
if
(
dispatchSaveFeedbackDto
.
getSaveFeedbackUid
()
==
null
&&
dispatchSaveFeedbackDto
.
getSaveFeedbackUser
()
==
null
)
{
dispatchSaveFeedbackDto
.
setSaveFeedbackUser
(
user
.
get
User
Name
());
dispatchSaveFeedbackDto
.
setSaveFeedbackUser
(
user
.
get
Real
Name
());
dispatchSaveFeedbackDto
.
setSaveFeedbackUid
(
user
.
getUserId
());
dispatchSaveFeedbackDto
.
setSaveFeedbackUid
(
user
.
getUserId
());
}
}
if
(
dispatchSaveFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchSaveFeedbackDto
.
getFeedbackUname
()
==
null
)
{
if
(
dispatchSaveFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchSaveFeedbackDto
.
getFeedbackUname
()
==
null
)
{
dispatchSaveFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchSaveFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchSaveFeedbackDto
.
setFeedbackUname
(
user
.
get
User
Name
());
dispatchSaveFeedbackDto
.
setFeedbackUname
(
user
.
get
Real
Name
());
}
}
return
ResponseHelper
.
buildResponse
(
dispatchSaveFeedbackDto
);
return
ResponseHelper
.
buildResponse
(
dispatchSaveFeedbackDto
);
}
}
...
@@ -96,12 +96,12 @@ public class DispatchPaperController extends BaseController {
...
@@ -96,12 +96,12 @@ public class DispatchPaperController extends BaseController {
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
if
(
dispatchRepairFeedbackDto
.
getFixFeedbackUid
()
==
null
&&
dispatchRepairFeedbackDto
.
getFixFeedbackUname
()
==
null
)
{
if
(
dispatchRepairFeedbackDto
.
getFixFeedbackUid
()
==
null
&&
dispatchRepairFeedbackDto
.
getFixFeedbackUname
()
==
null
)
{
dispatchRepairFeedbackDto
.
setFixFeedbackUname
(
user
.
get
User
Name
());
dispatchRepairFeedbackDto
.
setFixFeedbackUname
(
user
.
get
Real
Name
());
dispatchRepairFeedbackDto
.
setFixFeedbackUid
(
user
.
getUserId
());
dispatchRepairFeedbackDto
.
setFixFeedbackUid
(
user
.
getUserId
());
}
}
if
(
dispatchRepairFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchRepairFeedbackDto
.
getFeedbackUname
()
==
null
)
{
if
(
dispatchRepairFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchRepairFeedbackDto
.
getFeedbackUname
()
==
null
)
{
dispatchRepairFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchRepairFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchRepairFeedbackDto
.
setFeedbackUname
(
user
.
get
User
Name
());
dispatchRepairFeedbackDto
.
setFeedbackUname
(
user
.
get
Real
Name
());
}
}
return
ResponseHelper
.
buildResponse
(
dispatchRepairFeedbackDto
);
return
ResponseHelper
.
buildResponse
(
dispatchRepairFeedbackDto
);
}
}
...
@@ -134,12 +134,12 @@ public class DispatchPaperController extends BaseController {
...
@@ -134,12 +134,12 @@ public class DispatchPaperController extends BaseController {
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
AgencyUserModel
user
=
reginParams
.
getUserModel
();
if
(
dispatchConsultFeedbackDto
.
getConsultFeedbackUid
()
==
null
&&
dispatchConsultFeedbackDto
.
getConsultFeedbackUname
()
==
null
)
{
if
(
dispatchConsultFeedbackDto
.
getConsultFeedbackUid
()
==
null
&&
dispatchConsultFeedbackDto
.
getConsultFeedbackUname
()
==
null
)
{
dispatchConsultFeedbackDto
.
setConsultFeedbackUname
(
user
.
get
User
Name
());
dispatchConsultFeedbackDto
.
setConsultFeedbackUname
(
user
.
get
Real
Name
());
dispatchConsultFeedbackDto
.
setConsultFeedbackUid
(
user
.
getUserId
());
dispatchConsultFeedbackDto
.
setConsultFeedbackUid
(
user
.
getUserId
());
}
}
if
(
dispatchConsultFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchConsultFeedbackDto
.
getFeedbackUname
()
==
null
)
{
if
(
dispatchConsultFeedbackDto
.
getFeedbackUid
()
==
null
&&
dispatchConsultFeedbackDto
.
getFeedbackUname
()
==
null
)
{
dispatchConsultFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchConsultFeedbackDto
.
setFeedbackUid
(
user
.
getUserId
());
dispatchConsultFeedbackDto
.
setFeedbackUname
(
user
.
get
User
Name
());
dispatchConsultFeedbackDto
.
setFeedbackUname
(
user
.
get
Real
Name
());
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java
View file @
48569807
...
@@ -73,15 +73,15 @@ public class RescueProcessController extends BaseController {
...
@@ -73,15 +73,15 @@ public class RescueProcessController extends BaseController {
RescueProcessDto
dto
=
rescueProcessServiceImpl
.
getProcessByAlertId
(
alertId
);
RescueProcessDto
dto
=
rescueProcessServiceImpl
.
getProcessByAlertId
(
alertId
);
if
(
dto
.
getDispatchUserId
()
==
null
&&
dto
.
getDispatchUserName
()
==
null
)
{
if
(
dto
.
getDispatchUserId
()
==
null
&&
dto
.
getDispatchUserName
()
==
null
)
{
dto
.
setDispatchUserId
(
user
.
getUserId
());
dto
.
setDispatchUserId
(
user
.
getUserId
());
dto
.
setDispatchUserName
(
user
.
get
User
Name
());
dto
.
setDispatchUserName
(
user
.
get
Real
Name
());
}
}
if
(
dto
.
getArriveUserId
()
==
null
&&
dto
.
getArriveUserName
()
==
null
)
{
if
(
dto
.
getArriveUserId
()
==
null
&&
dto
.
getArriveUserName
()
==
null
)
{
dto
.
setArriveUserId
(
user
.
getUserId
());
dto
.
setArriveUserId
(
user
.
getUserId
());
dto
.
setArriveUserName
(
user
.
get
User
Name
());
dto
.
setArriveUserName
(
user
.
get
Real
Name
());
}
}
if
(
dto
.
getRescueUserId
()
==
null
&&
dto
.
getRescueUserName
()
==
null
)
{
if
(
dto
.
getRescueUserId
()
==
null
&&
dto
.
getRescueUserName
()
==
null
)
{
dto
.
setRescueUserId
(
user
.
getUserId
());
dto
.
setRescueUserId
(
user
.
getUserId
());
dto
.
setRescueUserName
(
user
.
get
User
Name
());
dto
.
setRescueUserName
(
user
.
get
Real
Name
());
}
}
return
ResponseHelper
.
buildResponse
(
dto
);
return
ResponseHelper
.
buildResponse
(
dto
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
View file @
48569807
...
@@ -169,7 +169,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
...
@@ -169,7 +169,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchPaper
.
setProcessStatusCode
(
dispatchStatus
.
getId
());
dispatchPaper
.
setProcessStatusCode
(
dispatchStatus
.
getId
());
dispatchPaper
.
setSendUserId
(
sendUser
.
getUserId
());
dispatchPaper
.
setSendUserId
(
sendUser
.
getUserId
());
dispatchPaper
.
setSendUserName
(
sendUser
.
get
User
Name
());
dispatchPaper
.
setSendUserName
(
sendUser
.
get
Real
Name
());
// 电梯维保单位统一信用代码
// 电梯维保单位统一信用代码
Elevator
elevator
=
elevatorServiceImpl
.
selectByAlertId
(
alertId
);
Elevator
elevator
=
elevatorServiceImpl
.
selectByAlertId
(
alertId
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java
View file @
48569807
...
@@ -78,7 +78,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
...
@@ -78,7 +78,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
String
content
=
template
.
getContent
();
String
content
=
template
.
getContent
();
String
createTime
=
DateUtils
.
getDateNowString
();
String
createTime
=
DateUtils
.
getDateNowString
();
if
(
AlertStageEnums
.
JJ
.
getCode
().
equals
(
type
))
{
if
(
AlertStageEnums
.
JJ
.
getCode
().
equals
(
type
))
{
String
createUser
=
user
.
get
User
Name
();
String
createUser
=
user
.
get
Real
Name
();
String
emergency_call
=
alertCalledVo
.
getEmergencyCall
();
String
emergency_call
=
alertCalledVo
.
getEmergencyCall
();
String
area
=
alertCalledVo
.
getAddress
();
String
area
=
alertCalledVo
.
getAddress
();
String
alertType
=
alertCalledVo
.
getAlarmType
();
String
alertType
=
alertCalledVo
.
getAlarmType
();
...
...
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