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
7229c59b
Commit
7229c59b
authored
Dec 22, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jyjc):生产问题处理
1.报检申请,增加补充机制
parent
278ee1cd
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
42 additions
and
25 deletions
+42
-25
ICompensateFlowDataOfRedis.java
...module/common/api/service/ICompensateFlowDataOfRedis.java
+1
-1
JgChangeRegistrationNameServiceImpl.java
...biz/service/impl/JgChangeRegistrationNameServiceImpl.java
+1
-1
JgChangeRegistrationReformServiceImpl.java
...z/service/impl/JgChangeRegistrationReformServiceImpl.java
+2
-1
JgChangeRegistrationTransferServiceImpl.java
...service/impl/JgChangeRegistrationTransferServiceImpl.java
+1
-0
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+1
-1
JgChangeVehicleRegistrationUnitServiceImpl.java
...vice/impl/JgChangeVehicleRegistrationUnitServiceImpl.java
+1
-1
JgEnableDisableServiceImpl.java
...odule/jg/biz/service/impl/JgEnableDisableServiceImpl.java
+1
-1
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+1
-1
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+1
-1
JgMaintainNoticeServiceImpl.java
...dule/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java
+1
-1
JgMaintenanceContractServiceImpl.java
...jg/biz/service/impl/JgMaintenanceContractServiceImpl.java
+1
-1
JgOverDesignServiceLifeServiceImpl.java
.../biz/service/impl/JgOverDesignServiceLifeServiceImpl.java
+1
-2
JgReformNoticeServiceImpl.java
...module/jg/biz/service/impl/JgReformNoticeServiceImpl.java
+1
-0
JgScrapCancelServiceImpl.java
.../module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
+1
-1
JgTransferNoticeServiceImpl.java
...dule/jg/biz/service/impl/JgTransferNoticeServiceImpl.java
+1
-1
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+1
-1
JgVehicleInformationServiceImpl.java
.../jg/biz/service/impl/JgVehicleInformationServiceImpl.java
+1
-1
application.properties
...t-module-jg-biz/src/main/resources/application.properties
+0
-1
JyjcInspectionApplicationServiceImpl.java
...iz/service/impl/JyjcInspectionApplicationServiceImpl.java
+24
-8
No files found.
amos-boot-system-tzs/amos-boot-module-
jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz
/service/ICompensateFlowDataOfRedis.java
→
amos-boot-system-tzs/amos-boot-module-
common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api
/service/ICompensateFlowDataOfRedis.java
View file @
7229c59b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
service
;
/**
* @author Administrator
...
...
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/JgChangeRegistrationNameServiceImpl.java
View file @
7229c59b
...
...
@@ -30,7 +30,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
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.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.common.StringUtil
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo
;
...
...
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/JgChangeRegistrationReformServiceImpl.java
View file @
7229c59b
...
...
@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.common.api.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent
;
import
com.yeejoin.amos.boot.module.jg.api.dto.*
;
import
com.yeejoin.amos.boot.module.jg.api.entity.*
;
...
...
@@ -92,7 +93,7 @@ import static java.util.stream.Collectors.toSet;
*/
@Service
@Slf4j
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
,
ICompensateFlowDataOfRedis
<
JgChangeRegistrationReform
>
{
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
,
ICompensateFlowDataOfRedis
<
JgChangeRegistrationReform
>
{
/**
* 安改维单位名称
*/
...
...
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/JgChangeRegistrationTransferServiceImpl.java
View file @
7229c59b
...
...
@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil
;
import
com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum
;
import
com.yeejoin.amos.boot.module.common.api.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent
;
import
com.yeejoin.amos.boot.module.jg.api.common.StringUtil
;
import
com.yeejoin.amos.boot.module.jg.api.dto.*
;
...
...
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/JgChangeRegistrationUnitServiceImpl.java
View file @
7229c59b
...
...
@@ -38,7 +38,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCur
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.jg.biz.service.ICommonService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
;
...
...
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @
7229c59b
...
...
@@ -29,7 +29,7 @@ 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.event.publisher.EventPublisher
;
import
com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
;
...
...
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/JgEnableDisableServiceImpl.java
View file @
7229c59b
...
...
@@ -27,7 +27,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCur
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.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
...
...
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/JgEquipTransferServiceImpl.java
View file @
7229c59b
...
...
@@ -33,7 +33,7 @@ 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.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService
;
import
com.yeejoin.amos.boot.module.ymt.api.common.BaseException
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
...
...
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/JgInstallationNoticeServiceImpl.java
View file @
7229c59b
...
...
@@ -45,7 +45,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import
com.yeejoin.amos.boot.module.jg.biz.handler.ToBeSubmitDetailStrategyFactory
;
import
com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStrategy
;
import
com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
...
...
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/JgMaintainNoticeServiceImpl.java
View file @
7229c59b
...
...
@@ -36,7 +36,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
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.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils
;
...
...
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/JgMaintenanceContractServiceImpl.java
View file @
7229c59b
...
...
@@ -33,7 +33,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
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.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
...
...
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/JgOverDesignServiceLifeServiceImpl.java
View file @
7229c59b
...
...
@@ -34,7 +34,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
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.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo
;
...
...
@@ -75,7 +75,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
java.nio.charset.StandardCharsets
;
import
java.time.LocalDate
;
import
java.time.ZoneId
;
import
java.time.format.DateTimeFormatter
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
...
...
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/JgReformNoticeServiceImpl.java
View file @
7229c59b
...
...
@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
import
com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.ConstructionTypeEnum
;
import
com.yeejoin.amos.boot.module.common.api.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent
;
import
com.yeejoin.amos.boot.module.jg.api.dto.*
;
import
com.yeejoin.amos.boot.module.jg.api.entity.*
;
...
...
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 @
7229c59b
...
...
@@ -32,7 +32,7 @@ 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.event.publisher.EventPublisher
;
import
com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
...
...
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/JgTransferNoticeServiceImpl.java
View file @
7229c59b
...
...
@@ -30,7 +30,7 @@ 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.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.ObjectCleanerUtils
;
...
...
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/JgUseRegistrationServiceImpl.java
View file @
7229c59b
...
...
@@ -56,7 +56,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import
com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService
;
import
com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent
;
import
com.yeejoin.amos.boot.module.jg.biz.service.ICommonService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils
;
...
...
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/JgVehicleInformationServiceImpl.java
View file @
7229c59b
...
...
@@ -49,7 +49,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import
com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService
;
import
com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent
;
import
com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService
;
import
com.yeejoin.amos.boot.module.
jg.biz
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.
common.api
.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/application.properties
View file @
7229c59b
...
...
@@ -3,7 +3,6 @@ server.servlet.context-path=/jg
server.port
=
11007
spring.profiles.active
=
dev
spring.feign.client.config.default.clockSkew
=
0m
spring.jackson.time-zone
=
GMT+8
spring.jackson.date-format
=
yyyy-MM-dd HH:mm:ss
logging.config
=
classpath:logback-${spring.profiles.active}.xml
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @
7229c59b
...
...
@@ -24,6 +24,8 @@ import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import
com.yeejoin.amos.boot.module.common.api.dto.ContraptionQueryParams
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum
;
import
com.yeejoin.amos.boot.module.common.api.service.ICompensateFlowDataOfRedis
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration
;
import
com.yeejoin.amos.boot.module.jg.api.vo.SortVo
;
import
com.yeejoin.amos.boot.module.jyjc.api.common.BizCommonConstant
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.*
;
...
...
@@ -119,7 +121,7 @@ import java.util.stream.Collectors;
*/
@Service
@Slf4j
public
class
JyjcInspectionApplicationServiceImpl
extends
BaseService
<
JyjcInspectionApplicationModel
,
JyjcInspectionApplication
,
JyjcInspectionApplicationMapper
>
implements
IJyjcInspectionApplicationService
{
public
class
JyjcInspectionApplicationServiceImpl
extends
BaseService
<
JyjcInspectionApplicationModel
,
JyjcInspectionApplication
,
JyjcInspectionApplicationMapper
>
implements
IJyjcInspectionApplicationService
,
ICompensateFlowDataOfRedis
<
JyjcInspectionApplicationModel
>
{
private
static
final
String
EQU_STATE
=
"EQU_STATE"
;
private
static
final
String
EQU_CODE
=
"EQU_CODE"
;
...
...
@@ -595,7 +597,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
SortVo
sortMap
=
commonService
.
sortFieldConversion
(
sort
);
String
companyCode
=
CommonServiceImpl
.
getUnitCode
(
reginParams
.
getCompany
());
String
agencyClassify
=
this
.
getAgencyClassify
(
companyCode
);
String
agencyClassify
=
this
.
getAgencyClassify
(
companyCode
);
Page
<
JyjcInspectionApplicationModel
>
result
=
this
.
getBaseMapper
().
selectForPage2
(
page
,
model
,
client
,
companyCode
,
sortMap
,
reginParams
.
getCompany
().
getOrgCode
(),
agencyClassify
);
result
.
getRecords
().
forEach
(
r
->
{
r
.
setLoginPersonCompanyCode
(
companyCode
);
...
...
@@ -622,7 +624,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
// 进行筛选时,返回筛选的状态
if
(
StringUtils
.
isNotEmpty
(
filter
.
getStatus
()))
{
Optional
.
ofNullable
(
InspectPlanStatusEnum
.
getByValue
(
filter
.
getStatus
())).
ifPresent
(
e
->
{
Optional
.
ofNullable
(
InspectPlanStatusEnum
.
getByValue
(
filter
.
getStatus
())).
ifPresent
(
e
->
{
r
.
setStatusName
(
e
.
getName
());
});
}
...
...
@@ -661,6 +663,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
public
Map
<
String
,
Object
>
selectBySeq
(
Long
sequenceNbr
,
String
companyType
)
{
JyjcInspectionApplicationModel
model
=
this
.
getBaseMapper
().
selectDataBySeq
(
sequenceNbr
);
// 补偿redis缓存的下一流程节点数据
this
.
doCompensate
(
model
);
Map
<
String
,
Object
>
map
=
BeanUtil
.
beanToMap
(
model
);
// 附件
Map
<
String
,
Object
>
attMap
=
getAttachmentMap
(
sequenceNbr
);
...
...
@@ -957,7 +961,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
queryWrapper
.
select
(
JyjcOpeningApplication:
:
getResultType
,
BaseEntity:
:
getSequenceNbr
,
JyjcOpeningApplication:
:
getDockingUnitCode
,
JyjcOpeningApplication:
:
getAgencyClassify
);
queryWrapper
.
orderByDesc
(
JyjcOpeningApplication:
:
getRecDate
);
queryWrapper
.
last
(
"limit 1"
);
return
jyjcOpeningApplicationService
.
getOne
(
queryWrapper
);
return
jyjcOpeningApplicationService
.
getOne
(
queryWrapper
);
}
...
...
@@ -999,7 +1003,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
}
}
String
getDictNameByCode
(
String
code
)
{
String
getDictNameByCode
(
String
code
)
{
DataDictionary
dataDictionary
=
dataDictionaryService
.
getByCode
(
code
,
"JYJC"
);
return
dataDictionary
!=
null
?
dataDictionary
.
getName
()
:
""
;
}
...
...
@@ -1214,7 +1218,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
commonService
.
saveExecuteFlowData2Redis
(
instanceId
,
this
.
buildInstanceRuntimeData
(
jyjcInspectionApplication
));
return
true
;
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
(
);
log
.
error
(
"撤回流程办理单失败:{}"
,
e
.
getMessage
(),
e
);
}
finally
{
if
(
lock
.
isHeldByCurrentThread
())
{
lock
.
unlock
();
...
...
@@ -1687,11 +1691,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
/**
* 西安电梯时不让做报检
*
* @param equListCode 设备种类
* @param boolMust 匹配条件
* @param boolMust
匹配条件
*/
private
void
disableXADT
(
String
equListCode
,
BoolQueryBuilder
boolMust
)
{
if
(
xaDtInspectDisabled
&&
EquipmentClassifityEnum
.
DT
.
getCode
().
equals
(
equListCode
))
{
if
(
xaDtInspectDisabled
&&
EquipmentClassifityEnum
.
DT
.
getCode
().
equals
(
equListCode
))
{
boolMust
.
mustNot
(
QueryBuilders
.
wildcardQuery
(
"ORG_BRANCH_CODE.keyword"
,
QueryParser
.
escape
(
BizCommonConstant
.
XA_ORG_CODE
)
+
"*"
));
}
}
...
...
@@ -2019,4 +2024,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
log
.
info
(
"生成报检申请表耗时:{}秒"
,
watch
.
getTotalTimeSeconds
());
return
path
;
}
@Override
public
boolean
beforeCheck
(
JyjcInspectionApplicationModel
application
)
{
return
application
.
getProcessInstanceId
()
!=
null
&&
!
application
.
getStatus
().
equals
(
String
.
valueOf
(
FlowStatusEnum
.
TO_BE_FINISHED
.
getCode
()));
}
@Override
public
void
compensate
(
JyjcInspectionApplicationModel
application
)
{
commonService
.
saveExecuteFlowData2Redis
(
application
.
getProcessInstanceId
(),
this
.
buildInstanceRuntimeData
(
application
));
}
}
\ 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