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
f46877e6
Commit
f46877e6
authored
Jan 12, 2026
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(jg): 添加管道装置报废处理功能
- 新增 JgScrapCancelEqMapper 的 selectNonScrappedPipelineCount 方法用于统计非报废管道数量 - 实现管道装置报废时重新计算管道装置长度的功能 - 当管道装置下所有管道都报废时自动将对应的使用登记证设为报废状态
parent
5d89feca
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
10 deletions
+48
-10
JgScrapCancelEqMapper.java
...amos/boot/module/jg/api/mapper/JgScrapCancelEqMapper.java
+2
-0
JgScrapCancelEqMapper.xml
...g-api/src/main/resources/mapper/JgScrapCancelEqMapper.xml
+10
-0
JgScrapCancelServiceImpl.java
.../module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
+36
-10
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelEqMapper.java
View file @
f46877e6
...
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq
;
import
org.apache.ibatis.annotations.Param
;
/**
* 报废注销设备关系表 Mapper 接口
...
...
@@ -11,4 +12,5 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
*/
public
interface
JgScrapCancelEqMapper
extends
BaseMapper
<
JgScrapCancelEq
>
{
Integer
selectNonScrappedPipelineCount
(
@Param
(
"useRegistrationCode"
)
String
useRegistrationCode
);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelEqMapper.xml
View file @
f46877e6
...
...
@@ -2,4 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper"
>
<select
id=
"selectNonScrappedPipelineCount"
resultType=
"java.lang.Integer"
>
SELECT
COUNT(*)
FROM
idx_biz_jg_use_info ui
LEFT JOIN idx_biz_jg_project_contraption pc ON pc.sequence_nbr = ui."PROJECT_CONTRAPTION_ID"
WHERE
ui."EQU_STATE" != '3'
AND pc.use_registration_code = #{useRegistrationCode}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
View file @
f46877e6
...
...
@@ -33,12 +33,13 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import
com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
;
import
com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher
;
import
com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
...
...
@@ -125,6 +126,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Autowired
private
EventPublisher
eventPublisher
;
@Autowired
private
PieLineDataChangeServiceImpl
pipelineDataChangeService
;
/**
* 移装移装注销/报废注销判断
*
...
...
@@ -836,6 +841,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
}
else
if
(
EquipmentClassifityEnum
.
YLGD
.
getCode
().
equals
(
jsonObject
.
get
(
"equListCode"
)))
{
beanMap
.
put
(
"projectContraptionNo"
,
jsonObject
.
get
(
"projectContraptionNo"
).
toString
());
beanMap
.
put
(
"equipments"
,
JSONArray
.
parse
(
jsonObject
.
get
(
"equipments"
).
toString
()));
beanMap
.
put
(
"EQU_CATEGORY_CODE"
,
CylinderTypeEnum
.
CYLINDER
.
getCode
());
}
else
{
beanMap
.
put
(
"certificates"
,
JSONArray
.
parse
(
jsonObject
.
get
(
"certificates"
).
toString
()));
}
...
...
@@ -1071,20 +1077,40 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
idxBizJgUseInfoMapper
.
batchUpdateUseInfo
(
equipIds
,
EquipmentEnum
.
BAOFEI
.
getCode
());
map1
.
put
(
"EQU_STATE"
,
String
.
valueOf
(
EquipmentEnum
.
BAOFEI
.
getCode
()));
// 修改证管理表中的证的状态
// 查出所有需要改的使用登记证
// 过滤出非气瓶 或是车用气瓶的使用登记证
jgUseRegistrationManageList
=
jgUseRegistrationManageList
.
stream
().
filter
(
item
->
!
CylinderTypeEnum
.
CYLINDER
.
getCode
().
equals
(
item
.
getEquCategoryCode
())
||
item
.
getRegType
().
equals
(
BusinessTypeEnum
.
JG_VEHICLE_GAS_APPLICATION
.
getName
())).
collect
(
Collectors
.
toList
());
//组装条件进行修改
if
(!
ObjectUtils
.
isEmpty
(
jgUseRegistrationManageList
))
{
for
(
JgUseRegistrationManage
useRegistrationManage
:
jgUseRegistrationManageList
){
useRegistrationManage
.
setCertificateStatus
(
CertificateStatusEnum
.
YIZHUXIAO
.
getName
());
if
(!
EquipmentClassifityEnum
.
YLGD
.
getCode
().
equals
(
jgScrapCancel
.
getEquListCode
()))
{
// 查出所有需要改的使用登记证
// 过滤出非气瓶 或是车用气瓶的使用登记证
jgUseRegistrationManageList
=
jgUseRegistrationManageList
.
stream
().
filter
(
item
->
!
CylinderTypeEnum
.
CYLINDER
.
getCode
().
equals
(
item
.
getEquCategoryCode
())
||
item
.
getRegType
().
equals
(
BusinessTypeEnum
.
JG_VEHICLE_GAS_APPLICATION
.
getName
()))
.
collect
(
Collectors
.
toList
());
//组装条件进行修改
if
(!
ObjectUtils
.
isEmpty
(
jgUseRegistrationManageList
))
{
for
(
JgUseRegistrationManage
useRegistrationManage
:
jgUseRegistrationManageList
){
useRegistrationManage
.
setCertificateStatus
(
CertificateStatusEnum
.
YIZHUXIAO
.
getName
());
useRegistrationManage
.
setVersion
(
useRegistrationManage
.
getVersion
()
+
1
);
useRegistrationManage
.
setChangeReason
(
BusinessTypeEnum
.
JG_EQUIPMENT_CANCEL
.
getName
());
useRegistrationManage
.
setIsScrap
(
"1"
);
useRegistrationManage
.
setRecDate
(
new
Date
());
useRegistrationManage
.
setIsDoBusiness
(
"3"
);
//报废修改为3,不可做业务,可以被证管理查询到
}
jgUseRegistrationManageService
.
updateBatchById
(
jgUseRegistrationManageList
);
}
}
else
{
// 1.重新计算管道装置长度(排除作废的管道长度)
pipelineDataChangeService
.
updatePipelineLength
(
jgScrapCancel
.
getProjectContraptionId
());
// 查询管道装置使用登记证下所有非报废的管道
Integer
nonScrappedPipelineCount
=
jgScrapCancelEqMapper
.
selectNonScrappedPipelineCount
(
jgScrapCancel
.
getUseRegistrationCode
());
// 2.管道装置对应使用登记证下所有管道都报废则证报废
if
(
nonScrappedPipelineCount
==
0
)
{
JgUseRegistrationManage
useRegistrationManage
=
jgUseRegistrationManageList
.
get
(
0
);
useRegistrationManage
.
setVersion
(
useRegistrationManage
.
getVersion
()
+
1
);
useRegistrationManage
.
setChangeReason
(
BusinessTypeEnum
.
JG_EQUIPMENT_CANCEL
.
getName
());
useRegistrationManage
.
setIsScrap
(
"1"
);
useRegistrationManage
.
setRecDate
(
new
Date
());
useRegistrationManage
.
setIsDoBusiness
(
"3"
);
//报废修改为3,不可做业务,可以被证管理查询到
useRegistrationManage
.
setIsDoBusiness
(
"3"
);
jgUseRegistrationManageService
.
updateById
(
useRegistrationManage
);
}
jgUseRegistrationManageService
.
updateBatchById
(
jgUseRegistrationManageList
);
}
}
else
{
map1
.
put
(
"EQU_STATE"
,
String
.
valueOf
(
EquipmentEnum
.
ZHUXIAO
.
getCode
()));
...
...
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