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
6ef3f09b
Commit
6ef3f09b
authored
Oct 18, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交删除时的错误提示信息
parent
4704a8c3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
DutyCarController.java
.../boot/module/common/biz/controller/DutyCarController.java
+1
-1
DutyFireFightingController.java
...ule/common/biz/controller/DutyFireFightingController.java
+1
-1
DutyFirstAidController.java
.../module/common/biz/controller/DutyFirstAidController.java
+1
-1
DutyPersonController.java
...ot/module/common/biz/controller/DutyPersonController.java
+2
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java
View file @
6ef3f09b
...
@@ -146,7 +146,7 @@ public class DutyCarController extends BaseController {
...
@@ -146,7 +146,7 @@ public class DutyCarController extends BaseController {
}
}
List
<
Map
<
String
,
Object
>>
list
=
iDutyCarService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
List
<
Map
<
String
,
Object
>>
list
=
iDutyCarService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
throw
new
BadRequest
(
"班次已有值班数据,无法删除"
);
return
ResponseHelper
.
buildResponse
(
0
);
}
}
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
return
ResponseHelper
.
buildResponse
(
iDutyCarService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
return
ResponseHelper
.
buildResponse
(
iDutyCarService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyFireFightingController.java
View file @
6ef3f09b
...
@@ -154,7 +154,7 @@ public class DutyFireFightingController extends BaseController{
...
@@ -154,7 +154,7 @@ public class DutyFireFightingController extends BaseController{
}
}
List
<
Map
<
String
,
Object
>>
list
=
iDutyFireFightingService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
List
<
Map
<
String
,
Object
>>
list
=
iDutyFireFightingService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
throw
new
BadRequest
(
"班次已有值班数据,无法删除"
);
return
ResponseHelper
.
buildResponse
(
0
);
}
}
return
ResponseHelper
.
buildResponse
(
iDutyFireFightingService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
return
ResponseHelper
.
buildResponse
(
iDutyFireFightingService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyFirstAidController.java
View file @
6ef3f09b
...
@@ -147,7 +147,7 @@ public class DutyFirstAidController extends BaseController{
...
@@ -147,7 +147,7 @@ public class DutyFirstAidController extends BaseController{
}
}
List
<
Map
<
String
,
Object
>>
list
=
iDutyFirstAidService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
List
<
Map
<
String
,
Object
>>
list
=
iDutyFirstAidService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
throw
new
BadRequest
(
"班次已有值班数据,无法删除"
);
return
ResponseHelper
.
buildResponse
(
0
);
}
}
return
ResponseHelper
.
buildResponse
(
iDutyFirstAidService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
return
ResponseHelper
.
buildResponse
(
iDutyFirstAidService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyPersonController.java
View file @
6ef3f09b
...
@@ -144,7 +144,8 @@ public class DutyPersonController extends BaseController {
...
@@ -144,7 +144,8 @@ public class DutyPersonController extends BaseController {
}
}
List
<
Map
<
String
,
Object
>>
list
=
iDutyPersonService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
List
<
Map
<
String
,
Object
>>
list
=
iDutyPersonService
.
list
(
null
,
startTime
,
DateUtils
.
getDateNowShortStr
());
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
if
(
list
!=
null
&&
list
.
size
()>
0
)
{
throw
new
BadRequest
(
"班次已有值班数据,无法删除"
);
// throw new BadRequest("班次已有值班数据,无法删除");
return
ResponseHelper
.
buildResponse
(
0
);
}
}
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
return
ResponseHelper
.
buildResponse
(
iDutyPersonService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
return
ResponseHelper
.
buildResponse
(
iDutyPersonService
.
deleteDutyData
(
instanceId
,
startTime
,
endTime
));
...
...
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