Skip to content

A
amos-boot-biz
Commit 900f131f authored by suhuiguang's avatar suhuiguang
Browse files
Options

fix(jg)： 单位变更

1.管道单位变更选择装置慢 2.报废业务所有管道报废后，装置变为已报废3
parent ff44649d
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 48 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 900f131f
......@@ -522,9 +522,6 @@
ibjpc.equ_category,
ibjpc.equ_define_name,
ibjpc.equ_define,
ibjpc.content,
ibjpc.rec_date,
ibjpc.rec_user_id,
ibjpc.pipeline_length,
ibjpc.org_code,
ibjpc.org_name,
......@@ -537,8 +534,6 @@
ibjpc.city_name,
ibjpc.county_name,
ibjpc.street_name,
ibjpc.create_date,
ibjpc.create_user_name,
ibjpc.supervisory_code,
ibjpc.use_registration_code,
ibjpc.is_into_management,
......@@ -546,8 +541,8 @@
ibjpc.equ_code,
ibjpc.use_date,
(SELECT ei.sequence_nbr from idx_biz_jg_use_info ui
LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = ui."ESTATE_UNIT_CREDIT_CODE"
WHERE ui."PROJECT_CONTRAPTION_ID" = ibjpc.sequence_nbr ORDER BY ui."REC_DATE" DESC LIMIT 1) AS estateUnitName
LEFT JOIN tzs_tcm_unit_info ei ON ei.unit_code = ui."ESTATE_UNIT_CREDIT_CODE"
WHERE ui."PROJECT_CONTRAPTION_ID" = ibjpc.sequence_nbr LIMIT 1) AS estateUnitName
FROM
idx_biz_jg_project_contraption ibjpc
LEFT JOIN tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
......@@ -555,48 +550,116 @@
ibjpc.use_unit_credit_code = #{dto.originalUseUnitCreditCode}
and ibjpc.is_delete = 0
and tjurm.is_delete = 0
and tjurm.certificate_status = '已登记'
and (ibjpc.project_contraption_parent_id is null or ibjpc.project_contraption_parent_id = '')
AND EXISTS (
SELECT 1
FROM idx_biz_jg_use_info ui
WHERE ui."PROJECT_CONTRAPTION_ID" = ibjpc.sequence_nbr
AND (ui."EQU_STATE" is null or ui."EQU_STATE" <![CDATA[<>]]> '3' )
and (ibjpc.EQU_STATE <![CDATA[<>]]> '3' or ibjpc."EQU_STATE" is null)
and not exists
(
select 1 from tzs_jg_change_registration_reform a where (a.audit_status
<![CDATA[ <> ]]>
'使用单位待提交' and a.audit_status
<![CDATA[ <> ]]>
'一级受理已驳回' and a.audit_status
<![CDATA[ <> ]]>
'使用单位已撤回' and a.audit_status
<![CDATA[ <> ]]>
'已作废')
and a.use_unit_credit_code = #{dto.originalUseUnitCreditCode}
and a.project_contraption_id = ibjpc.sequence_nbr
UNION
select b.project_contraption_id from tzs_jg_change_registration_unit a, tzs_jg_change_registration_unit_eq b where a.sequence_nbr = b.unit_change_registration_id and ((a.status
<![CDATA[ <> ]]>
'使用单位待提交' and a.status
<![CDATA[ <> ]]>
'一级受理已驳回' and a.status
<![CDATA[ <> ]]>
'使用单位已撤回' and a.status
<![CDATA[ <> ]]>
'已作废')
or a.status = '已完成')
and a.use_unit_credit_code =#{dto.originalUseUnitCreditCode}
and b.project_contraption_id = ibjpc.sequence_nbr
UNION select project_contraption_id from tzs_jg_enable_disable a where (a.audit_status
<![CDATA[ <> ]]>
'已驳回' and a.audit_status
<![CDATA[ <> ]]>
'已撤回' and a.audit_status
<![CDATA[ <> ]]>
'待提交' and a.audit_status
<![CDATA[ <> ]]>
'已作废')
and a.use_unit_credit_code = #{dto.originalUseUnitCreditCode}
and a.project_contraption_id = ibjpc.sequence_nbr
UNION select project_contraption_id from tzs_jg_maintain_notice a where (a.notice_status
<![CDATA[ <> ]]>
'6614' and a.notice_status
<![CDATA[ <> ]]>
'6615' and a.notice_status
<![CDATA[ <> ]]>
'6610' and a.notice_status
<![CDATA[ <> ]]>
'6617')
and a.use_unit_credit_code = #{dto.originalUseUnitCreditCode}
and a.project_contraption_id = ibjpc.sequence_nbr
UNION select project_contraption_id from tzs_jg_reform_notice a where (a.notice_status
<![CDATA[ <> ]]>
'6614' and a.notice_status
<![CDATA[ <> ]]>
'6615' and a.notice_status
<![CDATA[ <> ]]>
'6610' and a.notice_status
<![CDATA[ <> ]]>
'6617')
and a.use_unit_credit_code = #{dto.originalUseUnitCreditCode}
and a.project_contraption_id = ibjpc.sequence_nbr
UNION
select project_contraption_id from tzs_jg_scrap_cancel a where (a.audit_status
<![CDATA[ <> ]]>
'使用单位已撤回' and a.audit_status
<![CDATA[ <> ]]>
'一级受理已驳回' and a.audit_status
<![CDATA[ <> ]]>
'使用单位待提交' and a.audit_status
<![CDATA[ <> ]]>
'已作废')
and a.use_unit_code = #{dto.originalUseUnitCreditCode}
and a.project_contraption_id = ibjpc.sequence_nbr
)
<if test="dto.equList != null and dto.equList != ''">
and tjurm.equ_list = #{dto.equList}
</if>
<if test="dto.equListCode != null and dto.equListCode != ''">
and tjurm.equ_list_code = #{dto.equListCode}
</if>
<if test="dto.equCategory != null and dto.equCategory != ''">
and tjurm.equ_category = #{dto.equCategory}
</if>
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and tjurm.equ_category_code = #{dto.equCategoryCode}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define = #{dto.equDefineCode}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define_code = #{dto.equDefineCode}
</if>
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
and tjurm.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
</if>
<if test="dto.certificateStatus != null and dto.certificateStatus != ''">
and tjurm.certificate_status = #{dto.certificateStatus}
</if>
<if test="dto.projectContraption != null and dto.projectContraption != ''">
and ibjpc.project_contraption like concat('%',#{dto.projectContraption},'%')
</if>
<if test="dto.projectContraptionNo != null and dto.projectContraptionNo != ''">
and ibjpc.project_contraption_no like concat('%', #{dto.projectContraptionNo},'%')
</if>
ORDER BY
<if test="sort != null">
ibjpc.${sort.field} ${sort.sortType},
</if>
ibjpc.rec_date DESC
<if test="dto.equList != null and dto.equList != ''">
and tjurm.equ_list = #{dto.equList}
</if>
<if test="dto.equListCode != null and dto.equListCode != ''">
and tjurm.equ_list_code = #{dto.equListCode}
</if>
<if test="dto.equCategory != null and dto.equCategory != ''">
and tjurm.equ_category = #{dto.equCategory}
</if>
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and tjurm.equ_category_code = #{dto.equCategoryCode}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define = #{dto.equDefineCode}
</if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''">
and tjurm.equ_define_code = #{dto.equDefineCode}
</if>
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
and tjurm.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
</if>
<if test="dto.certificateStatus != null and dto.certificateStatus != ''">
and tjurm.certificate_status = #{dto.certificateStatus}
</if>
<if test="dto.projectContraption != null and dto.projectContraption != ''">
and ibjpc.project_contraption like concat('%',#{dto.projectContraption},'%')
</if>
<if test="dto.projectContraptionNo != null and dto.projectContraptionNo != ''">
and ibjpc.project_contraption_no like concat('%', #{dto.projectContraptionNo},'%')
</if>
ORDER BY
<if test="sort != null">
ibjpc.${sort.field} ${sort.sortType},
</if>
ibjpc.rec_date DESC
</select>
<select id="getLatestJgUseRegistrationManage"
......
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 @ 900f131f
......@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
......@@ -38,10 +39,13 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.utils.JsonDiffUtil;
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.entity.IdxBizJgProjectContraption;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
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.IdxBizJgProjectContraptionMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
......@@ -138,6 +142,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Autowired
private ESEquipmentCategory esEquipmentCategory;
@Autowired
private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
@Autowired
private IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionServiceImplService;
/**
* 移装移装注销/报废注销判断
......@@ -1185,6 +1193,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
useRegistrationManage.setIsDoBusiness("3");
jgUseRegistrationManageService.updateById(useRegistrationManage);
}
// 装置下所有管道报废后，装置表冗余写上状态，便于单位变更装置的选择筛选
this.updateProjectContraption(jgScrapCancel.getProjectContraptionId());
}
} else {
map1.put("EQU_STATE", String.valueOf(EquipmentEnum.ZHUXIAO.getCode()));
......@@ -1225,6 +1235,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setAuditPassDate(new Date());
}
private void updateProjectContraption(String projectContraptionId) {
// 装置下管道总数
Integer totalNum = idxBizJgUseInfoMapper.selectCount(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId));
// 报废的管道数量
Integer scrappedNum = idxBizJgUseInfoMapper.selectCount(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getEquState, String.valueOf(EquipmentEnum.BAOFEI.getCode())));
if(Objects.equals(totalNum, scrappedNum)){
LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionId);
updateWrapper.set(IdxBizJgProjectContraption::getEquState, String.valueOf(EquipmentEnum.BAOFEI.getCode()));
idxBizJgProjectContraptionServiceImplService.update(updateWrapper);
}
}
private List<JgUseRegistrationManage> getJgUseRegistrationManages(List<JgScrapCancelEq> jgScrapCancelEqList) {
List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgProjectContraptionDto.java
View file @ 900f131f
......@@ -147,7 +147,11 @@ public class IdxBizJgProjectContraptionDto extends BaseDto {
@ApiModelProperty(value = "工程装置id")
private Long projectContraptionId;
public Long getProjectContraptionId(){
@ApiModelProperty(value = "设备状态")
private String equState;
public Long getProjectContraptionId() {
return this.sequenceNbr;
}
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java
View file @ 900f131f
......@@ -308,6 +308,12 @@ public class IdxBizJgProjectContraption extends BaseEntity {
private String dataQualityScore;
/**
* 设备状态
*/
@TableField("equ_state")
private String equState;
/**
* 创建日期
*/
@TableField("create_date")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment