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
919fd56a
Commit
919fd56a
authored
Sep 20, 2022
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
离线巡检查询接口修改
parent
f35cd88c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
PlanTaskController.java
...n/amos/patrol/business/controller/PlanTaskController.java
+3
-1
PointController.java
...join/amos/patrol/business/controller/PointController.java
+2
-1
pointMapper.xml
...ystem-patrol/src/main/resources/db/mapper/pointMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java
View file @
919fd56a
...
...
@@ -987,7 +987,9 @@ public class PlanTaskController extends AbstractBaseController {
public
CommonResponse
queryLeavePlanTask
()
{
String
userId
=
getUserId
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
//String loginOrgCode = // getOrgCode(reginParams);
String
loginOrgCode
=
reginParams
.
getPersonIdentity
().
getBizOrgCode
();
HashMap
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"userId"
,
userId
);
params
.
put
(
"orgCode"
,
loginOrgCode
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @
919fd56a
...
...
@@ -1340,7 +1340,8 @@ public class PointController extends AbstractBaseController {
@GetMapping
(
value
=
"/queryLeavelPoint"
,
produces
=
"application/json;charset=UTF-8"
)
public
CommonResponse
queryLeavelPoint
(
@ApiParam
(
value
=
"数据同步开始时间(不传为全部同步)"
,
required
=
false
)
@RequestParam
(
required
=
false
)
String
startTime
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
loginOrgCode
=
getOrgCode
(
reginParams
);
// String loginOrgCode = getOrgCode(reginParams);
String
loginOrgCode
=
reginParams
.
getPersonIdentity
().
getBizOrgCode
();
String
roleTypeName
=
getRoleTypeName
(
reginParams
);
if
(
ObjectUtils
.
isEmpty
(
reginParams
))
{
return
CommonResponseUtil
.
failure
(
"用户session过期"
);
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml
View file @
919fd56a
...
...
@@ -934,7 +934,7 @@
LEFT JOIN s_department d on d.id = p.charge_dept_id -->
WHERE p.is_delete = 0
AND p.offline = 1
<if
test=
"orgCode != null and orgCode != ''"
>
AND p.org_code = #{orgCode}
</if>
<if
test=
"orgCode != null and orgCode != ''"
>
AND p.
biz_
org_code = #{orgCode}
</if>
<if
test=
"startTime !=null and startTime != ''"
>
AND p.last_update_time
<![CDATA[>= ]]>
STR_TO_DATE(#{startTime}, '%Y-%m-%d')
</if>
</select>
<select
id=
"getPoints"
resultType=
"Map"
>
...
...
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