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
b88ff384
Commit
b88ff384
authored
Mar 03, 2023
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改离线提交数据不成功
parent
bc61b69b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
14 deletions
+20
-14
CheckController.java
...join/amos/patrol/business/controller/CheckController.java
+1
-13
CheckMapper.java
.../yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java
+2
-0
CheckServiceImpl.java
...n/amos/patrol/business/service/impl/CheckServiceImpl.java
+6
-0
ICheckService.java
...oin/amos/patrol/business/service/intfc/ICheckService.java
+3
-0
EmergencyMapper.xml
...ystem-equip/src/main/resources/mapper/EmergencyMapper.xml
+1
-1
dbTemplate_check.xml
...-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
+7
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @
b88ff384
...
@@ -163,19 +163,6 @@ public class CheckController extends AbstractBaseController {
...
@@ -163,19 +163,6 @@ public class CheckController extends AbstractBaseController {
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"保存巡检记录<font color='blue'>手机app</font>"
,
notes
=
"保存巡检记录<font color='blue'>手机app</font>"
)
@ApiOperation
(
value
=
"保存巡检记录<font color='blue'>手机app</font>"
,
notes
=
"保存巡检记录<font color='blue'>手机app</font>"
)
@RequestMapping
(
value
=
"/saveRecordNew"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/saveRecordNew"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
POST
)
...
@@ -188,6 +175,7 @@ public class CheckController extends AbstractBaseController {
...
@@ -188,6 +175,7 @@ public class CheckController extends AbstractBaseController {
int
statu
=
-
1
;
int
statu
=
-
1
;
PlanTask
planTask
=
null
;
PlanTask
planTask
=
null
;
if
(
requestParam
.
getPlanTaskId
()!=
null
&&
requestParam
.
getPlanTaskId
()
!=
0
){
if
(
requestParam
.
getPlanTaskId
()!=
null
&&
requestParam
.
getPlanTaskId
()
!=
0
){
checkService
.
delCheckByTaskId
(
requestParam
.
getPlanTaskId
());
planTask
=
planTaskService
.
selectPlanTaskStatus
(
requestParam
.
getPlanTaskId
());
planTask
=
planTaskService
.
selectPlanTaskStatus
(
requestParam
.
getPlanTaskId
());
}
}
AgencyUserModel
user
=
getUserInfo
();
AgencyUserModel
user
=
getUserInfo
();
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java
View file @
b88ff384
...
@@ -282,4 +282,6 @@ public interface CheckMapper extends BaseMapper {
...
@@ -282,4 +282,6 @@ public interface CheckMapper extends BaseMapper {
//Map<String, String> queryUserInfoByIds(@Param(value = "userIds") String userIds);
//Map<String, String> queryUserInfoByIds(@Param(value = "userIds") String userIds);
int
delCheckByTaskId
(
@Param
(
value
=
"taskId"
)
Long
taskId
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @
b88ff384
...
@@ -606,6 +606,7 @@ public class CheckServiceImpl implements ICheckService {
...
@@ -606,6 +606,7 @@ public class CheckServiceImpl implements ICheckService {
}
}
// check = checkDao.save(check);
// check = checkDao.save(check);
try
{
try
{
check
=
checkDao
.
save
(
check
);
check
=
checkDao
.
save
(
check
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
...
@@ -733,6 +734,11 @@ public class CheckServiceImpl implements ICheckService {
...
@@ -733,6 +734,11 @@ public class CheckServiceImpl implements ICheckService {
checkDao
.
deleteBatch
(
list
);
checkDao
.
deleteBatch
(
list
);
}
}
@Override
public
void
delCheckByTaskId
(
Long
id
)
{
checkMapper
.
delCheckByTaskId
(
id
);
}
private
CheckInput
paraseText
(
CheckInput
checkInput
,
String
json
,
CheckInputParam
item
,
String
isScore
)
{
private
CheckInput
paraseText
(
CheckInput
checkInput
,
String
json
,
CheckInputParam
item
,
String
isScore
)
{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
json
);
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
json
);
String
checkType
=
jsonObject
.
getString
(
"CheckType"
);
String
checkType
=
jsonObject
.
getString
(
"CheckType"
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICheckService.java
View file @
b88ff384
...
@@ -52,8 +52,11 @@ public interface ICheckService {
...
@@ -52,8 +52,11 @@ public interface ICheckService {
* @param ids
* @param ids
*/
*/
@Transactional
(
rollbackFor
=
{
YeeException
.
class
,
Exception
.
class
})
@Transactional
(
rollbackFor
=
{
YeeException
.
class
,
Exception
.
class
})
void
delCheckById
(
List
<
Long
>
ids
);
void
delCheckById
(
List
<
Long
>
ids
);
void
delCheckByTaskId
(
Long
id
);
/**
/**
* 获取检查结果中所有不合格检查项
* 获取检查结果中所有不合格检查项
*
*
...
...
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @
b88ff384
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<select
id=
"selectOilDrainage"
resultType=
"java.util.Map"
>
<select
id=
"selectOilDrainage"
resultType=
"java.util.Map"
>
SELECT
SELECT
wes.id,
wes.id,
'1' as type
,
'1' as type,
(SELECT wei.emergency_level FROM wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi on wei.id = wesi.equipment_index_id
(SELECT wei.emergency_level FROM wl_equipment_index wei LEFT JOIN wl_equipment_specific_index wesi on wei.id = wesi.equipment_index_id
WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key) as level,
wes.equipment_code as code ,
wes.equipment_code as code ,
...
...
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
View file @
b88ff384
...
@@ -2159,4 +2159,10 @@
...
@@ -2159,4 +2159,10 @@
d.date
d.date
</select>
</select>
<select
id=
"delCheckByTaskId"
resultType=
"int"
>
DELETE FROM
p_check pc
WHERE pc.plan_task_id = #{taskId}
</select>
</mapper>
</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