Skip to content

A
amos-boot-biz
Commit 455f4bd0 authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents e67fc8d0 ca24bad2
Show whitespace changes
Inline Side-by-side
Showing with 1069 additions and 361 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java
View file @ 455f4bd0
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -25,9 +29,13 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -25,9 +29,13 @@ public class JgScrapCancelDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "注销类型（1报废注销，2移装注销）") @ApiModelProperty(value = "注销类型code（1报废注销，2移装注销）")
private String cancelType; private String cancelType;
@ApiModelProperty(value = "注销类型每次")
private String cancelTypeDesc;
@ApiModelProperty(value = "申请编号") @ApiModelProperty(value = "申请编号")
private String applyNo; private String applyNo;
...@@ -47,6 +55,8 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -47,6 +55,8 @@ public class JgScrapCancelDto extends BaseDto {
private String createUserId; private String createUserId;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
@ApiModelProperty(value = "流程状态") @ApiModelProperty(value = "流程状态")
...@@ -109,14 +119,11 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -109,14 +119,11 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "转办后执行人的Id逗号分割") @ApiModelProperty(value = "转办后执行人的Id逗号分割")
private String transferToUserIds; private String transferToUserIds;
@ApiModelProperty("设备品种") @ApiModelProperty(value = "设备种类code")
private String equDefine; private String equListCode;
@ApiModelProperty(value = "设备种类") @ApiModelProperty(value = "设备种类name")
private String equList; private String equListName;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "设备代码") @ApiModelProperty(value = "设备代码")
private String equCode; private String equCode;
...@@ -127,16 +134,14 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -127,16 +134,14 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "96333识别码") @ApiModelProperty(value = "96333识别码")
private String code96333; private String code96333;
@ApiModelProperty(value = "设备名称") @ApiModelProperty(value = "其他附件")
private String productName;
@ApiModelProperty(value = "设备地址")
private String fullAddress;
@ApiModelProperty (value = "其他附件")
private String otherAccessories; private String otherAccessories;
@ApiModelProperty(value = "申请日期，接收查询参数") @ApiModelProperty(value = "申请日期，接收查询参数")
private String applicationDate; private String applicationDate;
@ApiModelProperty(value = "使用登记证id，多个逗号分割")
private String registrationManageId;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelEqDto.java
View file @ 455f4bd0
package com.yeejoin.amos.boot.module.jg.api.dto; package com.yeejoin.amos.boot.module.jg.api.dto;
import com.alibaba.fastjson.JSONArray; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 报废注销设备关系表 * 报废注销设备关系表
...@@ -17,7 +14,7 @@ import java.util.Date; ...@@ -17,7 +14,7 @@ import java.util.Date;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgScrapCancelEqDto", description="报废注销设备关系表") @ApiModel(value = "JgScrapCancelEqDto", description = "报废注销设备关系表")
public class JgScrapCancelEqDto extends BaseDto { public class JgScrapCancelEqDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -29,10 +26,10 @@ public class JgScrapCancelEqDto extends BaseDto { ...@@ -29,10 +26,10 @@ public class JgScrapCancelEqDto extends BaseDto {
@ApiModelProperty(value = "设备id") @ApiModelProperty(value = "设备id")
private String equId; private String equId;
@ApiModelProperty(value = "使用登记id") @ApiModelProperty(value = "使用登记证编号")
private String certificateSeq; private String useRegistrationCode;
@ApiModelProperty(value = "设备信息") @ApiModelProperty(value = "设备代码")
private JSONArray equipInfo; private String equCode;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java
View file @ 455f4bd0
...@@ -155,25 +155,28 @@ public class JgScrapCancel extends BaseEntity { ...@@ -155,25 +155,28 @@ public class JgScrapCancel extends BaseEntity {
private String nextExecuteUserIds; private String nextExecuteUserIds;
/** /**
* 使用登记证id，多个逗号分割
*/
@TableField("registration_manage_id")
private String registrationManageId;
/**
* 使用登记证编号，多个逗号分割（冗余前端检索使用）
*/
@TableField("use_registration_code")
private String useRegistrationCode;
/**
* 转办后执行人的Id逗号分割 * 转办后执行人的Id逗号分割
*/ */
@TableField("transfer_to_user_ids") @TableField("transfer_to_user_ids")
private String transferToUserIds; private String transferToUserIds;
@TableField(exist = false) /**
private String equList; * 设备种类code
*/
@TableField(exist = false) @TableField("equ_list_code")
private String equListDesc; private String equListCode;
@TableField(exist = false)
private String equCategoryDesc;
@TableField(exist = false)
private String productName;
@TableField(exist = false)
private String fullAddress;
/** /**
* 其他附件 * 其他附件
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancelEq.java
View file @ 455f4bd0
package com.yeejoin.amos.boot.module.jg.api.entity; package com.yeejoin.amos.boot.module.jg.api.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 报废注销设备关系表 * 报废注销设备关系表
...@@ -38,15 +35,17 @@ public class JgScrapCancelEq extends BaseEntity { ...@@ -38,15 +35,17 @@ public class JgScrapCancelEq extends BaseEntity {
/** /**
* 使用登记id * 使用登记证编号
*/ */
@TableField("certificate_seq") @TableField("use_registration_code")
private String certificateSeq; private String useRegistrationCode;
/** /**
* 设备信息 * 设备代码
*/ */
@TableField("equip_info") @TableField("equ_code")
private String equipInfo; private String equCode;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java
View file @ 455f4bd0
...@@ -84,7 +84,7 @@ public class JgUseRegistration extends BaseEntity { ...@@ -84,7 +84,7 @@ public class JgUseRegistration extends BaseEntity {
private Date auditPassDate; private Date auditPassDate;
/** /**
* 登记类别 * 登记类别（1：历史设备登记，0：other）
*/ */
@TableField("reg_type") @TableField("reg_type")
private String regType; private String regType;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelMapper.java
View file @ 455f4bd0
...@@ -20,7 +20,7 @@ import java.util.Map; ...@@ -20,7 +20,7 @@ import java.util.Map;
*/ */
public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> { public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, Page<JgScrapCancelDto> getListPage(@Param("page") Page<JgScrapCancelDto> page,
@Param("sort") SortVo sortMap, @Param("sort") SortVo sortMap,
@Param("dto") JgScrapCancelDto dto, @Param("dto") JgScrapCancelDto dto,
@Param("roleIds") List<String> roleIds, @Param("roleIds") List<String> roleIds,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java
View file @ 455f4bd0
...@@ -50,14 +50,20 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> { ...@@ -50,14 +50,20 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
Map<String, Object> getMaintenanceDetail(@Param("id") String id); Map<String, Object> getMaintenanceDetail(@Param("id") String id);
Map<String, Object> getMaintenanceDetailByIdx(@Param("id") String id);
Map<String, Object> getiInstallDetail(@Param("id") String id); Map<String, Object> getiInstallDetail(@Param("id") String id);
Map<String, Object> getiInstallDetailByIdx(@Param("id") String id);
Map<String, Object> getUseRegistrationDetail(@Param("id") String id); Map<String, Object> getUseRegistrationDetail(@Param("id") String id);
Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records); Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
Page<JSONObject> queryForEquipUsedByVehiclePage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject); Page<JSONObject> queryForEquipUsedByVehiclePage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
Page<JSONObject> queryForEquipUsedByVehiclePageHistory(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
@MapKey("records") @MapKey("records")
List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records") List<String> records); List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records") List<String> records);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml
View file @ 455f4bd0
...@@ -9,52 +9,36 @@ ...@@ -9,52 +9,36 @@
</update> </update>
<select id="getListPage" resultType="java.util.Map"> <select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto">
select select
DISTINCT tjsc.sequence_nbr as sequenceNbr, tjsc.sequence_nbr,
tjsc.instance_id as instanceId, tjsc.instance_id,
tjsc.create_user_id as createUserId, tjsc.create_user_id,
tjsc.audit_status as auditStatus, tjsc.audit_status,
DATE_FORMAT(tjsc.rec_date,'%Y-%m-%d') as recDate, DATE_FORMAT(tjsc.rec_date,'%Y-%m-%d') as recDate,
DATE_FORMAT(tjsc.create_date,'%Y-%m-%d') as createDate, DATE_FORMAT(tjsc.create_date,'%Y-%m-%d') as createDate,
tjsc.receive_org_code as receiveOrgCode, tjsc.receive_org_code,
tjsc.receive_org_name as receiveOrgName, tjsc.receive_org_name,
tjsc.receive_company_code as receiveCompanyCode, tjsc.receive_company_code,
tjsc.cancel_certificate as cancelCertificate, tjsc.cancel_certificate,
tjsc.cancel_type as cancelType, tjsc.cancel_type,
tjsc.apply_no as applyNo, tjsc.apply_no,
tjsc.status, tjsc.status,
tjsc.remark, tjsc.remark,
tjsc.instance_status as instanceStatus, tjsc.instance_status,
tjsc.promoter, tjsc.promoter,
tjsc.next_execute_user_ids as nextExecuteUserIds, tjsc.next_execute_user_ids,
tjsc.supervisory_code as supervisoryCode, tjsc.supervisory_code,
tjsc.next_task_id as nextTaskId, tjsc.next_task_id,
ifnull(tjsc.next_execute_ids,'') as nextExecuteIds, ifnull(tjsc.next_execute_ids,'') as nextExecuteIds,
DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate, DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate,
use.USE_UNIT_CREDIT_CODE as useUnitCreditCode, tjsc.use_unit_name,
tjsc.use_unit_name as useUnitName, tjsc.use_unit_code,
tjsc.use_unit_code as useUnitCode, tjsc.use_registration_code,
jri.USE_ORG_CODE AS useRegistrationCode, tjsc.equ_list_code
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
use.ADDRESS as address,
oi.SUPERVISORY_CODE AS supervisoryCode,
oi.CODE96333 as code96333,
(SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name) AS place,
use."ADDRESS" as detailedAddress,
re.equ_id as equipId
from tzs_jg_scrap_cancel tjsc from tzs_jg_scrap_cancel tjsc
LEFT JOIN tzs_jg_scrap_cancel_eq re on tjsc.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
LEFT JOIN idx_biz_jg_other_info oi ON oi.RECORD = re.equ_id
<where> <where>
and tjsc.is_delete = 0 tjsc.is_delete = 0
<if test="dto.auditStatus != null and dto.auditStatus != ''"> <if test="dto.auditStatus != null and dto.auditStatus != ''">
and tjsc.audit_status = #{dto.auditStatus} and tjsc.audit_status = #{dto.auditStatus}
</if> </if>
...@@ -70,34 +54,12 @@ ...@@ -70,34 +54,12 @@
<if test="dto.applicationDate != null and dto.applicationDate != ''"> <if test="dto.applicationDate != null and dto.applicationDate != ''">
and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%') and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
</if> </if>
<if test="dto.equList != null and dto.equList != ''"> <if test="dto.equListCode != null and dto.equListCode != ''">
AND jri."EQU_LIST" = #{dto.equList} AND tjsc."equ_list_code" = #{dto.equListCode}
</if>
<if test="dto.equCategory != null and dto.equCategory != ''">
AND jri."equ_category" = #{dto.equCategory}
</if>
<if test="dto.equDefine != null and dto.equDefine != ''">
AND jri."EQU_DEFINE" = #{dto.equDefine}
</if>
<if test="dto.equCode != null and dto.equCode != ''">
AND jri."EQU_CODE" like concat('%',#{dto.equCode},'%')
</if> </if>
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''"> <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
AND jri."USE_ORG_CODE" like concat('%',#{dto.useRegistrationCode},'%') AND tjsc."use_registration_code" like concat('%',#{dto.useRegistrationCode},'%')
</if>
<if test="dto.code96333 != null and dto.code96333 != ''">
AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
</if>
<if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
AND oi.SUPERVISORY_CODE like concat('%',#{dto.supervisoryCode},'%')
</if>
<if test="dto.fullAddress != null and dto.fullAddress != ''">
AND (
use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."CITY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."COUNTY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
OR use."STREET_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
)
</if> </if>
<if test="roleIds != null and dto.type == 'supervision'"> <if test="roleIds != null and dto.type == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'> <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 455f4bd0
...@@ -310,6 +310,26 @@ ...@@ -310,6 +310,26 @@
LIMIT 1 LIMIT 1
</select> </select>
<select id="getiInstallDetailByIdx" resultType="java.util.Map">
SELECT
ibjci."CONSTRUCTION_LEADER_NAME" as installLeaderName ,
ibjci."CONSTRUCTION_LEADER_PHONE" as installLeaderPhone ,
ibjci."USC_DATE" as installStartDate ,
ibjci."USC_UNIT_NAME" as installPropertyUnitName ,
ibjci."PROXY_STATEMENT_ATTACHMENT" as installProxyStatementAttachment ,
ibjci."CONSTRUCTION_CONTRACT_ATTACHMENT" as installContractAttachment ,
ibjci."CONSTRUCTION_OTHER_ACCESSORIES" as insOtherAccessories,
ibjui."STREET_NAME" as installStreet,
ibjui."PROVINCE_NAME" as installProvince,
ibjui."CITY_NAME" as installCity,
ibjui."COUNTY_NAME" as installCounty
FROM "idx_biz_jg_construction_info" AS ibjci
left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
WHERE ibjci."RECORD" = #{id}
ORDER BY ibjci."rec_date" desc
LIMIT 1
</select>
<select id="getUseRegistrationDetail" resultType="java.util.Map"> <select id="getUseRegistrationDetail" resultType="java.util.Map">
SELECT tjur."status" as UseRegistratStatus, SELECT tjur."status" as UseRegistratStatus,
tjur."sequence_nbr" as UseRegistratSequenceNbr, tjur."sequence_nbr" as UseRegistratSequenceNbr,
...@@ -342,6 +362,23 @@ ...@@ -342,6 +362,23 @@
ORDER BY tjmce."rec_date" desc ORDER BY tjmce."rec_date" desc
LIMIT 1 LIMIT 1
</select> </select>
<select id="getMaintenanceDetailByIdx" resultType="java.util.Map">
SELECT ibjmri."ME_UNIT_NAME" as maintenanceUnitName,
ibjui."USE_UNIT_NAME" as maintenanceUseUnitName,
-- ibjmri."ME_MASTER" as maintenanceManagerName,
-- ibjmri."ME_MASTER_PHONE" as maintenanceManagerPhone,
ibjmri."ME_MASTER" as maintenanceManagerOneName,
ibjmri."ME_MASTER_PHONE" as maintenanceManagerOnePhone,
ibjmri."ME_MASTER1" as maintenanceManagerTwoName,
ibjmri."ME_MASTER1_PHONE" as maintenanceManagerTwoPhone,
ibjmri."REPAIR_INFORM" as maintenanceContract
FROM "idx_biz_jg_maintenance_record_info" as ibjmri
left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjmri."RECORD"
WHERE ibjmri."RECORD" = #{id}
ORDER BY ibjmri."rec_date" desc
LIMIT 1
</select>
<select id="selectEquipList" resultType="java.util.Map"> <select id="selectEquipList" resultType="java.util.Map">
select jui.RECORD as SEQUENCE_NBR, select jui.RECORD as SEQUENCE_NBR,
(SELECT name from tz_equipment_category where code = jri.EQU_LIST) as EQU_LIST, (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as EQU_LIST,
...@@ -405,7 +442,16 @@ ...@@ -405,7 +442,16 @@
<include refid="page-list-pipeline"/> <include refid="page-list-pipeline"/>
WHERE WHERE
ri."EQU_CATEGORY" = '8300' ri."EQU_CATEGORY" = '8300'
<if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
and ui."DATA_SOURCE" not like 'jg_his%'
</if>
<if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
and ui."DATA_SOURCE" like 'jg_his%'
</if>
<if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
and ui."DATA_SOURCE" like 'jg%'
</if>
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备 -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null"> <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
...@@ -469,6 +515,16 @@ ...@@ -469,6 +515,16 @@
ri."EQU_CATEGORY" = '2300' ri."EQU_CATEGORY" = '2300'
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1) and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
<if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
and ui."DATA_SOURCE" like 'jg%'
and ui."DATA_SOURCE" not like 'jg_his%'
</if>
<if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
and ui."DATA_SOURCE" like 'jg_his%'
</if>
<if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
and ui."DATA_SOURCE" like 'jg%'
</if>
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备 -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null"> <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
...@@ -494,6 +550,47 @@ ...@@ -494,6 +550,47 @@
WHERE WHERE
ri."EQU_DEFINE" = '23T0' ri."EQU_DEFINE" = '23T0'
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
-- and ui."DATA_SOURCE" not like 'jg_his%'
and ri.whether_vehicle_cylinder = 1
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
</if>
<if test="jsonObject.record != null and jsonObject.record != ''">
and ui."RECORD" = #{jsonObject.record}
</if>
<if test="jsonObject.record == null">
and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
</if>
ORDER BY ui.REC_DATE DESC
</select>
<select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/>
WHERE
ri."EQU_DEFINE" = '23T0'
and ui."DATA_SOURCE" like 'jg_his%'
and ri.whether_vehicle_cylinder = 1
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
</if>
<if test="jsonObject.record != null and jsonObject.record != ''">
and ui."RECORD" = #{jsonObject.record}
</if>
<if test="jsonObject.record == null">
and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
</if>
ORDER BY ui.REC_DATE DESC
</select>
<select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/>
WHERE
ri."EQU_DEFINE" = '23T0'
and ui."DATA_SOURCE" like 'jg%'
and ri.whether_vehicle_cylinder = 1 and ri.whether_vehicle_cylinder = 1
-- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备 -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null"> <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
...@@ -509,7 +606,6 @@ ...@@ -509,7 +606,6 @@
</if> </if>
ORDER BY ui.REC_DATE DESC ORDER BY ui.REC_DATE DESC
</select> </select>
<select id="queryForUnitVesselEquipment" resultType="java.util.Map"> <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
<include refid="page-list-vessel"/> <include refid="page-list-vessel"/>
WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1) WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java
View file @ 455f4bd0
...@@ -110,7 +110,19 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -110,7 +110,19 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
JSONObject jsonObject = new JSONObject(map); JSONObject jsonObject = new JSONObject(map);
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject)); return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
} }
// /**
// * 查询设备注册列表
// *
// * @param map
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/pageHistory")
// @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
// public ResponseModel<Page<JSONObject>> queryForPageHistory(@RequestParam Map<String, Object> map) {
// JSONObject jsonObject = new JSONObject(map);
// return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPageHistory(jsonObject));
// }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/category/list") @GetMapping(value = "/category/list")
@ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表") @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
...@@ -143,7 +155,13 @@ public class IdxBizJqEquipmentRegisterController extends BaseController { ...@@ -143,7 +155,13 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
JSONObject jsonObject = new JSONObject(queryMap); JSONObject jsonObject = new JSONObject(queryMap);
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject)); return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipCanUsedByVessel/pageHistory")
@ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
public ResponseModel<Page<JSONObject>> queryEquipCanUsedByVesselPageHistory(@RequestParam Map<String, Object> queryMap) {
JSONObject jsonObject = new JSONObject(queryMap);
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPageHistory(jsonObject));
}
/** /**
* 压力容器设备批量导入 * 压力容器设备批量导入
*/ */
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java
View file @ 455f4bd0
...@@ -40,7 +40,7 @@ public class JgScrapCancelController extends BaseController { ...@@ -40,7 +40,7 @@ public class JgScrapCancelController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增/新增并提交", notes = "新增/新增并提交") @ApiOperation(httpMethod = "POST", value = "暂存、工作台提交", notes = "暂存、工作台提交")
public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) { public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
return ResponseHelper.buildResponse(jgScrapCancelService.save(submitType, model)); return ResponseHelper.buildResponse(jgScrapCancelService.save(submitType, model));
} }
...@@ -52,7 +52,7 @@ public class JgScrapCancelController extends BaseController { ...@@ -52,7 +52,7 @@ public class JgScrapCancelController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/updateInfo") @PostMapping(value = "/updateInfo")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新") @ApiOperation(httpMethod = "POST", value = "保存、保存并提交、提交", notes = "保存、保存并提交、提交")
public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType, public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
@RequestBody Map<String, Object> model, @RequestBody Map<String, Object> model,
@RequestParam(value = "op", required = false) String op) { @RequestParam(value = "op", required = false) String op) {
...@@ -77,7 +77,7 @@ public class JgScrapCancelController extends BaseController { ...@@ -77,7 +77,7 @@ public class JgScrapCancelController extends BaseController {
jgScrapCancelInfo.remove("SEQUENCE_NBR"); jgScrapCancelInfo.remove("SEQUENCE_NBR");
JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class); JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(), jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquListCode(),
Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
jgScrapCancelDto.getInstanceId(), jgScrapCancelDto.getInstanceId(),
String.valueOf(map.get("operate")), String.valueOf(map.get("operate")),
...@@ -106,13 +106,13 @@ public class JgScrapCancelController extends BaseController { ...@@ -106,13 +106,13 @@ public class JgScrapCancelController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "POST", value = "分页查询", notes = "分页查询")
@PostMapping(value = "/getList") @PostMapping(value = "/getList")
public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto, public ResponseModel<Page<JgScrapCancelDto>> getList(JgScrapCancelDto dto,
@RequestParam(value = "sort",required = false) String sort, @RequestParam(value = "sort",required = false) String sort,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size) {
Page<Map<String, Object>> page = new Page<>(current, size); Page<JgScrapCancelDto> page = new Page<>(current, size);
dto.setType(String.valueOf(iJgInstallationNoticeService.getCompanyType().get("companyLevel"))); dto.setType(String.valueOf(iJgInstallationNoticeService.getCompanyType().get("companyLevel")));
return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto,sort, page, dto.getRoleIds())); return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto,sort, page, dto.getRoleIds()));
} }
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java
View file @ 455f4bd0
...@@ -25,6 +25,8 @@ public interface IIdxBizJgRegisterInfoService { ...@@ -25,6 +25,8 @@ public interface IIdxBizJgRegisterInfoService {
Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject); Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject jsonObject);
Map<String, Object> getDetailByRecord(String record); Map<String, Object> getDetailByRecord(String record);
Map<String, Object> getDetailFieldCamelCaseByRecord(String record); Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
...@@ -35,6 +37,8 @@ public interface IIdxBizJgRegisterInfoService { ...@@ -35,6 +37,8 @@ public interface IIdxBizJgRegisterInfoService {
Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject); Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
Page<JSONObject> queryEquipCanUsedByVesselPageHistory(JSONObject jsonObject);
Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile); Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
Object importPressureData(MultipartFile multipartFile) throws Exception; Object importPressureData(MultipartFile multipartFile) throws Exception;
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 455f4bd0
...@@ -28,7 +28,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentInfoDto; ...@@ -28,7 +28,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentInfoDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecord; import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecord;
import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecordEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecordEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
import com.yeejoin.amos.boot.module.jg.api.enums.*; import com.yeejoin.amos.boot.module.jg.api.enums.*;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
...@@ -43,7 +42,10 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*; ...@@ -43,7 +42,10 @@ 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.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*; import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.component.feign.utils.FeignUtil; import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
...@@ -76,6 +78,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -76,6 +78,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -86,6 +89,7 @@ import java.time.ZoneId; ...@@ -86,6 +89,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString; import static com.alibaba.fastjson.JSON.toJSONString;
import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER; import static com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
...@@ -539,9 +543,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -539,9 +543,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
@Override @Override
public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList,String businessScenarios,String dataSource) { public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList, String businessScenarios, String dataSource) {
// 历史设备录入 直接取所有的设备种类（equList）下的所有设备类别 // 历史设备录入 直接取所有的设备种类（equList）下的所有设备类别
if ("his".equals(dataSource)){ if ("his".equals(dataSource)) {
return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList); return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
} }
...@@ -552,7 +556,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -552,7 +556,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
String dictCode = String.format("%s_%s", dictCodePrefix, equipAddDictCodeSuffix); String dictCode = String.format("%s_%s", dictCodePrefix, equipAddDictCodeSuffix);
List<DictionarieValueModel> result = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode)); List<DictionarieValueModel> result = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode));
if (CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType) || ValidationUtil.isEmpty(businessScenarios)){ if (CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType) || ValidationUtil.isEmpty(businessScenarios)) {
return result; return result;
} }
// 初始化collect列表 // 初始化collect列表
...@@ -1262,7 +1266,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1262,7 +1266,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return new Page<>(); return new Page<>();
} }
Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number"); Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size"); Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
Page<JSONObject> result = new Page<>(pageNumber, size); Page<JSONObject> result = new Page<>(pageNumber, size);
...@@ -1315,7 +1318,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1315,7 +1318,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备） // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
// 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增 // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
BoolQueryBuilder dBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
if (map.containsKey("DATA_SOURCE") && !ObjectUtils.isEmpty(map.get("DATA_SOURCE"))) {
if ("jg_his".equals(map.get("DATA_SOURCE"))) {//只查历史，前缀jg_his
dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
} else if (!"jg_his".equals(map.getString("DATA_SOURCE"))) {//只查新增，前缀为jg且前缀不为jg_his
dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
dBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
}
} else {
//查所有，前缀jg
dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg")); dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg"));
}
boolMust.must(dBuilder); boolMust.must(dBuilder);
String queryType = map.getString("QUERY_TYPE"); String queryType = map.getString("QUERY_TYPE");
...@@ -1338,14 +1352,357 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1338,14 +1352,357 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
syBuilder.mustNot(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*")); syBuilder.mustNot(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(syBuilder); boolMust.must(syBuilder);
this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister"); this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister");
} else if(ValidationUtil.equals(queryType, "FINISH_SY")){ } else if (ValidationUtil.equals(queryType, "FINISH_SY")) {
// 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备 // 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备
// 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】 // 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.must(QueryBuilders.existsQuery("EQU_STATE")) syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"))
.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*")); .must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(syBuilder); boolMust.must(syBuilder);
} else if(ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")){ } else if (ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")) {
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"));
syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(syBuilder);
}
}
// 通用匹配规则，其他条件构建
if (!ObjectUtils.isEmpty(map.getString(SEQUENCE_NBR))) {
BoolQueryBuilder seqBuilder = QueryBuilders.boolQuery();
String param = map.getString(SEQUENCE_NBR);
List<String> strings = Arrays.asList(param.split(","));
seqBuilder.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", strings));
boolMust.must(seqBuilder);
}
if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
boolMust.must(pBuilder);
}
if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getString(EQU_CATEGORY));
pBuilder.must(QueryBuilders.matchPhraseQuery(EQU_CATEGORY, "*" + param + "*"));
boolMust.must(pBuilder);
}
if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getString("USE_PLACE"));
pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
boolMust.must(pBuilder);
}
// 设备状态
if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));
boolMust.must(esBuilder);
}
// 使用单位 //安装改造维修单位
if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
ubuilder.should(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
ubuilder.minimumShouldMatch(1);
boolMust.must(ubuilder);
} else {
if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) || !ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
String param = QueryParser.escape(uucc);
param = param.contains("_") ? param.split("_")[0] : param;
uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
boolMust.must(uuccBuilder);
}
if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
uuccBuilder.must(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
boolMust.must(uuccBuilder);
}
}
// 监管码
if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
String param = map.getString("SUPERVISORY_CODE");
List<String> strings = Arrays.asList(param.split(","));
scBuilder.must(QueryBuilders.termsQuery("SUPERVISORY_CODE", strings));
boolMust.must(scBuilder);
}
// 设备种类编码
if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
boolMust.must(elcBuilder);
}
// 设备类别编码
if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {
BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_DEFINE_CODE"));
elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", test));
boolMust.must(elcBuilder);
}
// 设备种类名称
if (!ObjectUtils.isEmpty(map.getString(EQU_LIST))) {
BoolQueryBuilder elBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(EQU_LIST));
elBuilder.must(QueryBuilders.matchPhraseQuery(EQU_LIST, "*" + test + "*"));
boolMust.must(elBuilder);
}
// 设备类别
if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test));
boolMust.must(pBuilder);
}
// 是否车用气瓶
if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(WHETHER_VEHICLE_CYLINDER));
pBuilder.must(QueryBuilders.termQuery(WHETHER_VEHICLE_CYLINDER, test));
boolMust.must(pBuilder);
}
// 是否撬装式压力容器
if (!ObjectUtils.isEmpty(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL)) && !"0".equals(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL));
pBuilder.must(QueryBuilders.termQuery(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL, test));
boolMust.must(pBuilder);
}
// 设备代码模糊查询
if (!ObjectUtils.isEmpty(map.getString(EQU_CODE))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(EQU_CODE));
pBuilder.must(QueryBuilders.wildcardQuery(EQU_CODE, "*" + test.toLowerCase() + "*"));
boolMust.must(pBuilder);
}
// 单位内部编号模糊查询
if (!ObjectUtils.isEmpty(map.getString("USE_INNER_CODE"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
boolMust.must(pBuilder);
}
// 出厂编号/产品编码模糊查询
if (!ObjectUtils.isEmpty(map.getString(FACTORY_NUM))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(FACTORY_NUM));
pBuilder.must(QueryBuilders.wildcardQuery(FACTORY_NUM, "*" + test.toLowerCase() + "*"));
boolMust.must(pBuilder);
}
// 制造单位（生产单位）名称模糊查询
if (!ObjectUtils.isEmpty(map.getString("PRODUCE_UNIT_NAME"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("PRODUCE_UNIT_NAME"));
pBuilder.must(QueryBuilders.wildcardQuery("PRODUCE_UNIT_NAME", "*" + test.toLowerCase() + "*"));
boolMust.must(pBuilder);
}
builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC);
builder.from((pageNumber - 1) * size);
builder.size(size);
request.source(builder);
List<JSONObject> list = new LinkedList<>();
long totle = 0;
if (log.isDebugEnabled()) {
log.debug("查询es 的查询条件: {}", request);
}
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (SearchHit hit : response.getHits().getHits()) {
System.out.println(hit);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
if (!ValidationUtil.isEmpty(dto2.get(CONSTRUCTIONTYPE))) {
// 转化施工类型
String constructionType = dto2.get(CONSTRUCTIONTYPE).toString();
if (!ValidationUtil.isEmpty(constructionType)) {
List<String> constructionTypeList = Arrays.asList(constructionType.split(","));
List<String> statusList = new ArrayList<>();
for (String cType : constructionTypeList) {
Integer integer = Integer.valueOf(cType);
String status = ConstructionEnum.getName.get(integer);
statusList.add(status);
}
dto2.put(CONSTRUCTIONTYPE, Joiner.on(",").join(statusList));
}
}
if (!ValidationUtil.isEmpty(dto2.get(EQUSTATE))) {
Integer integer = Integer.valueOf(dto2.get(EQUSTATE).toString());
String status = EquimentEnum.getName.get(integer);
dto2.put(EQUSTATE, status);
}
if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
String s = dto2.get(DATA_SOURCE).toString();
dto2.put(DATA_SOURCE, s);
dto2.put(DATA_SOURCE_NAME, Arrays.stream(EquipSourceEnum.values())
.filter(e -> s.startsWith(e.getCode()))
.map(EquipSourceEnum::getName)
.findFirst()
.orElse(EquipSourceEnum.jg.getName()));
}
dto2.put("record", dto2.get(SEQUENCE_NBR));
list.add(dto2);
}
// 获取所有设备的Id
List<String> equIds = null;
if (!ValidationUtil.isEmpty(list)) {
equIds = list.stream().map(item -> item.get(SEQUENCE_NBR).toString()).collect(Collectors.toList());
}
if (!ValidationUtil.isEmpty(equIds)) {
// 查询设备地址
List<IdxBizJgUseInfo> useInfoListByEquIds = idxBizJgUseInfoService.getUseInfoListByEquIds(equIds);
Map<String, String> equAddressMap = new HashMap<>();
if (!ValidationUtil.isEmpty(useInfoListByEquIds)) {
equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
useInfo -> {
String fulladdress = "";
if (!ValidationUtil.isEmpty(useInfo.getProvinceName())) {
fulladdress += useInfo.getProvinceName();
}
if (!ValidationUtil.isEmpty(useInfo.getCityName())) {
fulladdress += useInfo.getCityName();
}
if (!ValidationUtil.isEmpty(useInfo.getCountyName())) {
fulladdress += useInfo.getCountyName();
}
if (!ValidationUtil.isEmpty(useInfo.getStreetName())) {
fulladdress += useInfo.getStreetName();
}
if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
fulladdress += useInfo.getAddress();
}
return fulladdress;
}
)
);
}
// 更新设备使用情况和设备地址
for (JSONObject item : list) {
String fullAddress = equAddressMap.get(item.getString(SEQUENCE_NBR));
item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
item.put("CAN_EDIT", this.checkEquipIsCanEdit(item.getString(SEQUENCE_NBR)));
item.put("CAN_DELETE", this.checkEquipIsCanDelete(item.getString(SEQUENCE_NBR)));
}
}
totle = response.getInternalResponse().hits().getTotalHits().value;
result.setRecords(list);
result.setTotal(totle);
} catch (IOException e) {
throw new RuntimeException(e);
}
return result;
}
/**
* 设备注册信息分页查询
*
* @param map
* @return
*/
public Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject map) {
if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
return new Page<>();
}
Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
Page<JSONObject> result = new Page<>(pageNumber, size);
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.trackTotalHits(true);
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
// 获取当前登录人单位类型
JSONObject company = getCompanyType();
if (ValidationUtil.isEmpty(company)) {
result.setRecords(new ArrayList<>());
result.setTotal(0);
return result;
}
String companyCode = company.getString("companyCode").contains("_") ?
company.getString("companyCode").split("_")[1] : company.getString("companyCode");
String type = company.getString("companyType");
// 根据当前登录人查询
if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
}
// 根据当前登录用户类型及管辖机构筛选条件添加对应参数
if (ObjectUtils.isEmpty(map.getString(SEQUENCE_NBR)) && ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
if (!ValidationUtil.isEmpty(type) && type.contains("使用单位")) {
if (ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
map.put("USE_UNIT_CREDIT_CODE", companyCode);
}
}
if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
map.put("USC_UNIT_CREDIT_CODE", companyCode);
}
if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
map.put("USE_UNIT_CREDIT_CODE", companyCode);
}
}
// 默认条件【STATUS==="" || null】
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
meBuilder.minimumShouldMatch(1);
boolMust.must(meBuilder);
// DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
// 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
BoolQueryBuilder dBuilder = QueryBuilders.boolQuery();
dBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
boolMust.must(dBuilder);
String queryType = map.getString("QUERY_TYPE");
if (!ObjectUtils.isEmpty(queryType)) {
// 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null || ""】
if (ValidationUtil.equals(queryType, "AZ")) {
BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
.mustNot(QueryBuilders.wildcardQuery("USE_UNIT_CREDIT_CODE", "*"));
boolMust.must(nullOrEmptyQuery);
this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "installNotice");
} else if (ValidationUtil.equals(queryType, "WB")) {
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null || ""）】
BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
boolMust.must(wbBuilder);
} else if (ValidationUtil.equals(queryType, "SY")) {
// 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE（使用登记证编号） ==="" || null)】
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
syBuilder.mustNot(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(syBuilder);
this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister");
} else if (ValidationUtil.equals(queryType, "FINISH_SY")) {
// 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备
// 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"))
.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
boolMust.must(syBuilder);
} else if (ValidationUtil.equals(queryType, "GZ_GZ") || ValidationUtil.equals(queryType, "GZ_WX") || ValidationUtil.equals(queryType, "GZ_YZ")) {
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.must(QueryBuilders.existsQuery("EQU_STATE")); syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"));
syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*")); syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
...@@ -2019,9 +2376,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2019,9 +2376,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
jsonObject.put("useUnitCreditCode", useUnitCreditCode); jsonObject.put("useUnitCreditCode", useUnitCreditCode);
Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size")); Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").getEquipInFlow(useUnitCreditCode); Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").getEquipInFlow(useUnitCreditCode);
if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) { if ("8300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {//管道
return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records); return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);
} else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) { } else if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {//气瓶
List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult(); List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue)); Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records); Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records);
...@@ -2053,6 +2410,25 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2053,6 +2410,25 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
@Override @Override
public Page<JSONObject> queryEquipCanUsedByVesselPageHistory(JSONObject jsonObject) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String useUnitCreditCode = reginParams.getCompany().getCompanyCode();
// 使用单位为个人时候 特殊处理
if (useUnitCreditCode.split("_").length > 1) {
useUnitCreditCode = useUnitCreditCode.split("_")[1];
}
jsonObject.put("useUnitCreditCode", useUnitCreditCode);
Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
Page<JSONObject> result = jgUseRegistrationMapper.queryForEquipUsedByVehiclePageHistory(page, jsonObject);
result.getRecords().forEach(i -> {
i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium")));
});
return result;
}
@Override
public String importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile) { public String importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile) {
try { try {
PressureVesselListener pressureVesselListener = new PressureVesselListener(); PressureVesselListener pressureVesselListener = new PressureVesselListener();
...@@ -2064,7 +2440,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2064,7 +2440,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
.doRead(); .doRead();
return pressureVesselListener.getResult(); return pressureVesselListener.getResult();
} catch (Exception e) { } catch (Exception e) {
String err = (e.getCause() instanceof BadRequest) ? "模版数据填写有误：" + e.getCause().getMessage() : "导入时出现异常：请联系管理员！" ; String err = (e.getCause() instanceof BadRequest) ? "模版数据填写有误：" + e.getCause().getMessage() : "导入时出现异常：请联系管理员！";
throw new BadRequest(err); throw new BadRequest(err);
} }
} }
...@@ -2072,7 +2448,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2072,7 +2448,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
@Override @Override
public Object importPressureData(MultipartFile multipartFile) throws Exception { public Object importPressureData(MultipartFile multipartFile) throws Exception {
List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>(); List<EquipInfoCylinderExcelDto> aircraftList = new ArrayList<>();
resultError.clear();useInnerCodeList.clear(); resultError.clear();
useInnerCodeList.clear();
equCodeList.clear(); equCodeList.clear();
factoryNumList.clear(); factoryNumList.clear();
try { try {
...@@ -2081,13 +2458,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2081,13 +2458,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
@Override @Override
public void invoke(EquipInfoCylinderExcelDto data, AnalysisContext context) { public void invoke(EquipInfoCylinderExcelDto data, AnalysisContext context) {
EquipInfoCylinderExcelDto fireExperts = new EquipInfoCylinderExcelDto(); EquipInfoCylinderExcelDto fireExperts = new EquipInfoCylinderExcelDto();
BeanUtils.copyProperties(data,fireExperts); BeanUtils.copyProperties(data, fireExperts);
resultError.add(checkExcelData(data, context).toString()); resultError.add(checkExcelData(data, context).toString());
aircraftList.add(fireExperts); aircraftList.add(fireExperts);
useInnerCodeList.add(data.getUseInnerCode()); useInnerCodeList.add(data.getUseInnerCode());
equCodeList.add(data.getEquCode()); equCodeList.add(data.getEquCode());
factoryNumList.add("0".equals(data.getWhetherVehicleCylinder()) ? data.getFactoryNum() : null); factoryNumList.add("0".equals(data.getWhetherVehicleCylinder()) ? data.getFactoryNum() : null);
} }
// 全部读取完成就调用该方法 // 全部读取完成就调用该方法
@Override @Override
public void doAfterAllAnalysed(AnalysisContext context) { public void doAfterAllAnalysed(AnalysisContext context) {
...@@ -2141,37 +2519,37 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2141,37 +2519,37 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
LinkedHashMap attachmentUpload = (LinkedHashMap) checkAndCast(paramMap.get(ATTACHMENT_UPLOAD)); LinkedHashMap attachmentUpload = (LinkedHashMap) checkAndCast(paramMap.get(ATTACHMENT_UPLOAD));
EquipmentInfoDto equipInfoDto = this.createEquipmentInfoDto(equipmentInfoForm, jgVehicleInformationMapper); EquipmentInfoDto equipInfoDto = this.createEquipmentInfoDto(equipmentInfoForm, jgVehicleInformationMapper);
// 登记证记录表主键 // 登记证记录表主键
Long changeRecordId= sequence.nextId(); Long changeRecordId = sequence.nextId();
List<EquipInfoCylinderExcelDto> equipInfoCylinderExcelDtoList =JSON.parseArray(JSON.toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoCylinderExcelDto.class); List<EquipInfoCylinderExcelDto> equipInfoCylinderExcelDtoList = JSON.parseArray(JSON.toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoCylinderExcelDto.class);
equipInfoCylinderExcelDtoList.forEach(data->{ equipInfoCylinderExcelDtoList.forEach(data -> {
if ("his".equals(equipInfoDto.getDataSource())&& "1".equals(data.getWhetherVehicleCylinder())) { if ("his".equals(equipInfoDto.getDataSource()) && "1".equals(data.getWhetherVehicleCylinder())) {
throw new BadRequest("车用气瓶历史设备不能批量导入!"); throw new BadRequest("车用气瓶历史设备不能批量导入!");
} }
String record = UUID.randomUUID().toString(); String record = UUID.randomUUID().toString();
List<Map<String, Object>> fileDataList = (List<Map<String, Object>>)(data.getFileData()); List<Map<String, Object>> fileDataList = (List<Map<String, Object>>) (data.getFileData());
String productPhoto = getUrlByKey(fileDataList,"PRODUCT_PHOTO"); String productPhoto = getUrlByKey(fileDataList, "PRODUCT_PHOTO");
String otherAccessoriesReg = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_REG"); String otherAccessoriesReg = getUrlByKey(fileDataList, "OTHER_ACCESSORIES_REG");
String designDoc = getUrlByKey(fileDataList,"DESIGN_DOC"); String designDoc = getUrlByKey(fileDataList, "DESIGN_DOC");
String designStandard = getUrlByKey(fileDataList,"DESIGN_STANDARD"); String designStandard = getUrlByKey(fileDataList, "DESIGN_STANDARD");
String otherAccessoriesDes = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_DES"); String otherAccessoriesDes = getUrlByKey(fileDataList, "OTHER_ACCESSORIES_DES");
String productQualityYieldProve = getUrlByKey(fileDataList,"PRODUCT_QUALITY_YIELD_PROVE"); String productQualityYieldProve = getUrlByKey(fileDataList, "PRODUCT_QUALITY_YIELD_PROVE");
String factoryStandard = getUrlByKey(fileDataList,"FACTORY_STANDARD"); String factoryStandard = getUrlByKey(fileDataList, "FACTORY_STANDARD");
String insUseMaintainExplain = getUrlByKey(fileDataList,"INS_USE_MAINTAIN_EXPLAIN"); String insUseMaintainExplain = getUrlByKey(fileDataList, "INS_USE_MAINTAIN_EXPLAIN");
String otherAccessoriesFact = getUrlByKey(fileDataList,"OTHER_ACCESSORIES_FACT"); String otherAccessoriesFact = getUrlByKey(fileDataList, "OTHER_ACCESSORIES_FACT");
String factSupervisionInspectionReport = getUrlByKey(fileDataList,"FACT_SUPERVISION_INSPECTION_REPORT"); String factSupervisionInspectionReport = getUrlByKey(fileDataList, "FACT_SUPERVISION_INSPECTION_REPORT");
//使用信息 //使用信息
IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo(); IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
BeanUtils.copyProperties(data, useInfo); BeanUtils.copyProperties(data, useInfo);
useInfo.setRecord(record); useInfo.setRecord(record);
useInfo.setRecDate(new Date()); useInfo.setRecDate(new Date());
useInfo.setDataSource("his".equals(equipInfoDto.getDataSource())? "jg_his" : "jg");//区分历史设备和新增设备 useInfo.setDataSource("his".equals(equipInfoDto.getDataSource()) ? "jg_his" : "jg");//区分历史设备和新增设备
useInfo.setEquState(null); useInfo.setEquState(null);
useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));//历史气瓶导入为已纳管设备 useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));//历史气瓶导入为已纳管设备
// 使用单位信息 // 使用单位信息
if("个人主体".equals(company.getCompanyType())){ if ("个人主体".equals(company.getCompanyType())) {
useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]); useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
useInfo.setUseUnitName(company.getCompanyName().split("_")[1]); useInfo.setUseUnitName(company.getCompanyName().split("_")[1]);
}else { } else {
useInfo.setUseUnitCreditCode(company.getCompanyCode()); useInfo.setUseUnitCreditCode(company.getCompanyCode());
useInfo.setUseUnitName(company.getCompanyName()); useInfo.setUseUnitName(company.getCompanyName());
} }
...@@ -2182,7 +2560,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2182,7 +2560,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
BeanUtils.copyProperties(data, designInfo); BeanUtils.copyProperties(data, designInfo);
designInfo.setRecord(record); designInfo.setRecord(record);
designInfo.setRecDate(new Date()); designInfo.setRecDate(new Date());
if (data.getDesignDate() != null){ if (data.getDesignDate() != null) {
designInfo.setDesignDate(DateUtil.parse(data.getDesignDate(), "yyyy-MM-dd")); designInfo.setDesignDate(DateUtil.parse(data.getDesignDate(), "yyyy-MM-dd"));
} }
designInfo.setDesignDoc(designDoc); designInfo.setDesignDoc(designDoc);
...@@ -2216,7 +2594,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2216,7 +2594,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
registerInfo.setProductPhoto(productPhoto); registerInfo.setProductPhoto(productPhoto);
registerInfo.setOtherAccessoriesReg(otherAccessoriesReg); registerInfo.setOtherAccessoriesReg(otherAccessoriesReg);
registerInfo.setUseOrgCode(equipInfoDto.getUseOrgCode()); registerInfo.setUseOrgCode(equipInfoDto.getUseOrgCode());
if ("his".equals(equipInfoDto.getDataSource())){ if ("his".equals(equipInfoDto.getDataSource())) {
registerInfo.setEquCode(this.getEquCode(registerInfo, factoryInfo, equipInfoDto.getReceiveOrgCode())); registerInfo.setEquCode(this.getEquCode(registerInfo, factoryInfo, equipInfoDto.getReceiveOrgCode()));
} }
registerInfoList.add(registerInfo); registerInfoList.add(registerInfo);
...@@ -2224,7 +2602,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2224,7 +2602,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
//检验检测 //检验检测
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo(); IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
BeanUtils.copyProperties(data, inspectionDetectionInfo); BeanUtils.copyProperties(data, inspectionDetectionInfo);
inspectionDetectionInfo.setInspectOrgCode( data.getInspectOrgCode()); inspectionDetectionInfo.setInspectOrgCode(data.getInspectOrgCode());
inspectionDetectionInfo.setRecord(record); inspectionDetectionInfo.setRecord(record);
inspectionDetectionInfo.setRecDate(new Date()); inspectionDetectionInfo.setRecDate(new Date());
inspectionDetectionInfo.setInspectType("ZZJDJY"); inspectionDetectionInfo.setInspectType("ZZJDJY");
...@@ -2243,7 +2621,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2243,7 +2621,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
BeanUtils.copyProperties(data, otherInfo); BeanUtils.copyProperties(data, otherInfo);
otherInfo.setRecord(record); otherInfo.setRecord(record);
otherInfo.setRecDate(new Date()); otherInfo.setRecDate(new Date());
if ("his".equals(equipInfoDto.getDataSource())){ if ("his".equals(equipInfoDto.getDataSource())) {
otherInfo.setSupervisoryCode(this.getSupervisoryCode(equipInfoDto.getPossession(), registerInfo)); otherInfo.setSupervisoryCode(this.getSupervisoryCode(equipInfoDto.getPossession(), registerInfo));
otherInfo.setClaimStatus("已认领"); otherInfo.setClaimStatus("已认领");
} }
...@@ -2265,7 +2643,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2265,7 +2643,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
esEquipmentDto.setUSE_INNER_CODE(useInfo.getUseInnerCode()); esEquipmentDto.setUSE_INNER_CODE(useInfo.getUseInnerCode());
esEquipmentDto.setUSE_ORG_CODE(equipInfoDto.getUseOrgCode()); esEquipmentDto.setUSE_ORG_CODE(equipInfoDto.getUseOrgCode());
esEquipmentDto.setIS_INTO_MANAGEMENT("his".equals(equipInfoDto.getDataSource())); esEquipmentDto.setIS_INTO_MANAGEMENT("his".equals(equipInfoDto.getDataSource()));
if ("his".equals(equipInfoDto.getDataSource())){ if ("his".equals(equipInfoDto.getDataSource())) {
esEquipmentDto.setEQU_CODE(registerInfo.getEquCode()); esEquipmentDto.setEQU_CODE(registerInfo.getEquCode());
} }
esEquipmentDto.setEQU_CATEGORY_CODE(equipInfoDto.getEquCategoryCode()); esEquipmentDto.setEQU_CATEGORY_CODE(equipInfoDto.getEquCategoryCode());
...@@ -2276,15 +2654,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2276,15 +2654,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
esEquipmentDto.setEQU_DEFINE(equipInfoDto.getEquDefine()); esEquipmentDto.setEQU_DEFINE(equipInfoDto.getEquDefine());
// 使用单位信息 // 使用单位信息
if("个人主体".equals(company.getCompanyType())){ if ("个人主体".equals(company.getCompanyType())) {
esEquipmentDto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode().split("_")[1]); esEquipmentDto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode().split("_")[1]);
esEquipmentDto.setUSE_UNIT_NAME(company.getCompanyName().split("_")[1]); esEquipmentDto.setUSE_UNIT_NAME(company.getCompanyName().split("_")[1]);
}else { } else {
esEquipmentDto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode()); esEquipmentDto.setUSE_UNIT_CREDIT_CODE(company.getCompanyCode());
esEquipmentDto.setUSE_UNIT_NAME(company.getCompanyName()); esEquipmentDto.setUSE_UNIT_NAME(company.getCompanyName());
} }
esEquipmentCategoryList.add(esEquipmentDto); esEquipmentCategoryList.add(esEquipmentDto);
if ("his".equals(equipInfoDto.getDataSource())){ if ("his".equals(equipInfoDto.getDataSource())) {
// 生成tzs_jg_certificate_change_record_eq记录 // 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq(); JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键 changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
...@@ -2301,7 +2679,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2301,7 +2679,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Optional.of(paramsVesselList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgTechParamsVesselService::saveBatch); Optional.of(paramsVesselList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgTechParamsVesselService::saveBatch);
Optional.of(inspectionDetectionInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgInspectionDetectionInfoService::saveBatch); Optional.of(inspectionDetectionInfoList).filter(list -> !list.isEmpty()).ifPresent(idxBizJgInspectionDetectionInfoService::saveBatch);
Optional.of(esEquipmentCategoryList).filter(list -> !list.isEmpty()).ifPresent(esEquipmentCategory::saveAll); Optional.of(esEquipmentCategoryList).filter(list -> !list.isEmpty()).ifPresent(esEquipmentCategory::saveAll);
if ("his".equals(equipInfoDto.getDataSource())){ if ("his".equals(equipInfoDto.getDataSource())) {
// 生成证书管理表记录 // 生成证书管理表记录
JgUseRegistrationManage registrationManage = this.saveRegistrationManage(equipInfoDto, company); JgUseRegistrationManage registrationManage = this.saveRegistrationManage(equipInfoDto, company);
// 生成一条tzs_jg_certificate_change_record记录 // 生成一条tzs_jg_certificate_change_record记录
...@@ -2323,7 +2701,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2323,7 +2701,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
dto.setEquDefine(jgVehicleInformationMapper.getEquCategoryNameByCode(equDefineCode)); dto.setEquDefine(jgVehicleInformationMapper.getEquCategoryNameByCode(equDefineCode));
dto.setDataSource((String) equipmentInfoForm.get("DATA_SOURCE")); dto.setDataSource((String) equipmentInfoForm.get("DATA_SOURCE"));
dto.setUseOrgCode((String) equipmentInfoForm.get("USE_ORG_CODE")); dto.setUseOrgCode((String) equipmentInfoForm.get("USE_ORG_CODE"));
if ("his".equals(equipmentInfoForm.get("DATA_SOURCE"))){ if ("his".equals(equipmentInfoForm.get("DATA_SOURCE"))) {
dto.setReceiveOrgCode(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[0]); dto.setReceiveOrgCode(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[0]);
dto.setReceiveOrgName(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[1]); dto.setReceiveOrgName(((String) equipmentInfoForm.get("RECEIVE_ORG_CODE")).split("_")[1]);
} }
...@@ -2380,18 +2758,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2380,18 +2758,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
private String buildRecordContent(JgUseRegistrationManage registrationManage) { private String buildRecordContent(JgUseRegistrationManage registrationManage) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return registrationManage.getRecUserName() + "批量上传了【"+BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName()+"】，" + return registrationManage.getRecUserName() + "批量上传了【" + BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName() + "】，" +
"单号【" + registrationManage.getApplyNo() + "】，上传日期" + simpleDateFormat.format(registrationManage.getRecDate()); "单号【" + registrationManage.getApplyNo() + "】，上传日期" + simpleDateFormat.format(registrationManage.getRecDate());
} }
/** /**
* 生成使用登记证书唯一标识 * 生成使用登记证书唯一标识
*
* @param dto 包含有 设备种类 & 设备类别 & 设备品种 的map * @param dto 包含有 设备种类 & 设备类别 & 设备品种 的map
* @param date 生成证日期 （不传取当前时间） * @param date 生成证日期 （不传取当前时间）
* @param receiveCompanyCode 接收机构统一信用代码 * @param receiveCompanyCode 接收机构统一信用代码
* @return 使用登记证书唯一标识 * @return 使用登记证书唯一标识
*/ */
private String generateCertificateNo(EquipmentInfoDto dto,Date date,String receiveCompanyCode){ private String generateCertificateNo(EquipmentInfoDto dto, Date date, String receiveCompanyCode) {
String ym = ""; String ym = "";
try { try {
ym = Optional.of(DateUtils.dateFormat(date, DateUtils.DATE_PATTERN_MM)).orElse(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM)); ym = Optional.of(DateUtils.dateFormat(date, DateUtils.DATE_PATTERN_MM)).orElse(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM));
...@@ -2404,7 +2783,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2404,7 +2783,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return responseModel.getResult(); return responseModel.getResult();
} }
private String getApplicationNo(){ private String getApplicationNo() {
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1); ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) { if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
log.error("车用气瓶使用登记申请单单号获取失败！"); log.error("车用气瓶使用登记申请单单号获取失败！");
...@@ -2500,7 +2879,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2500,7 +2879,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
} }
} }
private void checkInspectOrg(String inspectOrgCode, StringBuilder result){ private void checkInspectOrg(String inspectOrgCode, StringBuilder result) {
List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("inspection"); List<Map<String, Object>> InspectOrgList = commonService.getAllInspectionInfo("inspection");
if (findUseCode(InspectOrgList, inspectOrgCode) == null) { if (findUseCode(InspectOrgList, inspectOrgCode) == null) {
result.append("未查询到该检验机构；"); result.append("未查询到该检验机构；");
...@@ -2523,6 +2902,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2523,6 +2902,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
/** /**
* 生成设备代码 * 生成设备代码
*
* @param registerInfo registerInfo * @param registerInfo registerInfo
* @param factoryInfo factoryInfo * @param factoryInfo factoryInfo
* @param receiveCompanyCode 接收机构 * @param receiveCompanyCode 接收机构
......
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 @ 455f4bd0
...@@ -153,6 +153,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -153,6 +153,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired @Autowired
JgUseRegistrationManageServiceImpl useRegistrationManageService; JgUseRegistrationManageServiceImpl useRegistrationManageService;
@Autowired
private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
/** /**
* 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表 * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
* *
...@@ -1057,7 +1060,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1057,7 +1060,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
registrationManage.setReceiveOrgName(registration.getReceiveOrgName()); registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode()); registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
registrationManage.setAuditPassDate(registration.getAuditPassDate()); registrationManage.setAuditPassDate(registration.getAuditPassDate());
// registrationManage.setUseUnitAddress(); todo 设备使用地址需要更新 if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
if (useCodeResult != null) {
registrationManage.setUseUnitAddress(useCodeResult.getAddress());
}
}
} }
useRegistrationManageService.updateBatchById(list); useRegistrationManageService.updateBatchById(list);
} else { } else {
......
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 @ 455f4bd0
...@@ -1069,26 +1069,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1069,26 +1069,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto); BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
taskMap.put("model", taskMessageDto); taskMap.put("model", taskMessageDto);
TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap); TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
// 生成证记录表主键
// 生成一条tzs_jg_certificate_change_record记录 long certChangeSeq = sequence.nextId();
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord(); // 生成jg证书变更记录
jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo()); genJgCertificateChangeRecord(jgInstallationNotice,certChangeSeq, registrationCode, idxBizJgRegisterInfo, taskV2Model1);
jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
jgCertificateChangeRecord.setAuditPassDate(new Date());
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
certificateChangeRecordService.save(jgCertificateChangeRecord);
// 查询设备制造信息 // 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId()); factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
...@@ -1096,7 +1080,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1096,7 +1080,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 生成tzs_jg_certificate_change_record_eq记录 // 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq(); JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键 changeRecordEq.setChangeRecordId(String.valueOf(certChangeSeq));//登记证记录主键
changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键 changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum()); changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq); certificateChangeRecordEqService.save(changeRecordEq);
...@@ -1184,6 +1168,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1184,6 +1168,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} }
} }
public void genJgCertificateChangeRecord(JgInstallationNotice jgInstallationNotice,Long sequenceNbr, String registrationCode, IdxBizJgRegisterInfo idxBizJgRegisterInfo, TaskV2Model taskV2Model1) {
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
jgCertificateChangeRecord.setAuditPassDate(new Date());
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
private void createConstruction2Db(JgInstallationNotice jgInstallationNotice, JgInstallationNoticeEq jgRelationEquip) { private void createConstruction2Db(JgInstallationNotice jgInstallationNotice, JgInstallationNoticeEq jgRelationEquip) {
IdxBizJgConstructionInfo idxBizJgConstructionInfo = new IdxBizJgConstructionInfo(); IdxBizJgConstructionInfo idxBizJgConstructionInfo = new IdxBizJgConstructionInfo();
idxBizJgConstructionInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode()); idxBizJgConstructionInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode());
......
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 @ 455f4bd0
...@@ -7,8 +7,10 @@ import com.alibaba.fastjson.JSONObject; ...@@ -7,8 +7,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; 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.RedisUtils;
...@@ -113,6 +115,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -113,6 +115,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Autowired @Autowired
private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl; private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl;
@Autowired
private Sequence sequence;
/** /**
* 移装移装注销/报废注销判断 * 移装移装注销/报废注销判断
* *
...@@ -122,19 +127,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -122,19 +127,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE; return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE;
} }
public Page<Map<String, Object>> getList(JgScrapCancelDto dto,String sort, Page<Map<String, Object>> page, List<String> roleIds) { public Page<JgScrapCancelDto> getList(JgScrapCancelDto dto, String sort, Page<JgScrapCancelDto> page, List<String> roleIds) {
ReginParams reginParams = this.getSelectedOrgInfo(); ReginParams reginParams = this.getSelectedOrgInfo();
String orgCode = reginParams.getCompany().getCompanyCode(); String orgCode = reginParams.getCompany().getCompanyCode();
dto.setCreateUserId(reginParams.getUserModel().getUserId()); dto.setCreateUserId(reginParams.getUserModel().getUserId());
String currentUserId = reginParams.getUserModel().getUserId(); String currentUserId = reginParams.getUserModel().getUserId();
SortVo sortMap = commonService.sortFieldConversion(sort); SortVo sortMap = commonService.sortFieldConversion(sort);
Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page,sortMap, dto, roleIds, orgCode, currentUserId); Page<JgScrapCancelDto> listPage = this.baseMapper.getListPage(page, sortMap, dto, roleIds, orgCode, currentUserId);
listPage.getRecords().forEach(item -> { listPage.getRecords().forEach(item -> {
if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) { if (item.getCancelType() != null) {
item.put("auditStatusDesc", item.get("auditStatus").toString()); item.setCancelTypeDesc(CancelTypeEnum.getNameByType(item.getCancelType()));
} }
if (item.containsKey("cancelType") && Objects.nonNull(item.get("cancelType"))) { if (item.getEquListCode() != null) {
item.put("cancelTypeDesc", CancelTypeEnum.getNameByType(item.get("cancelType").toString())); item.setEquListName(EquipmentClassifityEnum.getNameByCode(item.getEquListCode()));
} }
}); });
return listPage; return listPage;
...@@ -166,14 +171,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -166,14 +171,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<JgScrapCancel> saveList(String submitType, Map<String, Object> mapParams) { public List<JgScrapCancelDto> saveList(String submitType, Map<String, Object> mapParams) {
return Collections.singletonList(this.save(submitType, mapParams)); return Collections.singletonList(this.save(submitType, mapParams));
} }
@SuppressWarnings({"Duplicates", "rawtypes"}) @SuppressWarnings({"Duplicates", "rawtypes"})
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class) @GlobalTransactional(rollbackFor = Exception.class)
public JgScrapCancel save(String submitType, Map<String, Object> mapParams) { public JgScrapCancelDto save(String submitType, Map<String, Object> mapParams) {
ReginParams reginParams = this.getSelectedOrgInfo(); ReginParams reginParams = this.getSelectedOrgInfo();
Map<String, Object> noticeParams = (Map) mapParams.get(PAGE_KEY); Map<String, Object> noticeParams = (Map) mapParams.get(PAGE_KEY);
String[] receiveOrg = String.valueOf(noticeParams.get("receiveOrgCreditCode")).split("_"); String[] receiveOrg = String.valueOf(noticeParams.get("receiveOrgCreditCode")).split("_");
...@@ -185,7 +190,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -185,7 +190,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
model.setReceiveOrgName(receiveOrg[1]); model.setReceiveOrgName(receiveOrg[1]);
// 字段转换 // 字段转换
convertField(model); convertField(model);
// 获取告知单号 // 获取告知单号 TODO 待修改 bug
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(noticeParams.get("businessCode"))), 1); ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(noticeParams.get("businessCode"))), 1);
if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) { if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
log.error(" 获取告知单号失败"); log.error(" 获取告知单号失败");
...@@ -247,65 +252,93 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -247,65 +252,93 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setUseUnitCode(reginParams.getCompany().getCompanyCode()); jgScrapCancel.setUseUnitCode(reginParams.getCompany().getCompanyCode());
jgScrapCancel.setUseUnitName(reginParams.getCompany().getCompanyName()); jgScrapCancel.setUseUnitName(reginParams.getCompany().getCompanyName());
jgScrapCancel.setCreateUserId(RequestContext.getExeUserId()); jgScrapCancel.setCreateUserId(RequestContext.getExeUserId());
this.setUseRegisterInfo(jgScrapCancel, noticeParams);
this.save(jgScrapCancel); this.save(jgScrapCancel);
// 新增代办 // 新增代办
this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds); this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
// 保存设备关系表 // 保存设备关系表
saveEquip(noticeParams, jgScrapCancel); saveEquip(noticeParams, jgScrapCancel);
jgScrapCancel.setCancelTypeDesc(getRegistrationClass(jgScrapCancel.getCancelType())); jgScrapCancel.setCancelTypeDesc(getRegistrationClass(jgScrapCancel.getCancelType()));
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(noticeParams)); JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(noticeParams));
commonService.saveExecuteFlowData2Redis(instanceId, buildInstanceRuntimeData(jgScrapCancel)); commonService.saveExecuteFlowData2Redis(instanceId, buildInstanceRuntimeData(jgScrapCancel));
String equListName = EquipmentClassifityEnum.getNameByCode(jsonObject.get("equListCode").toString()); String equListName = EquipmentClassifityEnum.getNameByCode(jsonObject.get("equListCode").toString());
jgScrapCancel.setEquListDesc(equListName); save2HisData(jsonObject, jgScrapCancel.getSequenceNbr().toString());
save2HisData(jsonObject, jgScrapCancel); JgScrapCancelDto dto = new JgScrapCancelDto();
return jgScrapCancel; BeanUtil.copyProperties(jgScrapCancel, dto);
dto.setEquListName(equListName);
return dto;
} }
//单位维度设备处理
private void saveEquip(Map<String, Object> noticeParams, JgScrapCancel jgScrapCancel) { /**
* 设置登记证信息
*
* @param jgScrapCancel 对象
* @param noticeParams 参数
*/
private void setUseRegisterInfo(JgScrapCancel jgScrapCancel, Map<String, Object> noticeParams) {
List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>(); List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>();
// 判断是否是报废气瓶业务处理 // 判断是否是报废气瓶业务处理
if (CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) && if (CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) &&
CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) { CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) {
// 证ids // 证ids
List<String> certificates = (List<String>) noticeParams.get("sequenceNbrs"); List<String> certificates = (List<String>) noticeParams.get("sequenceNbrs");
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, certificates.stream().map(Long::parseLong).collect(Collectors.toList()));
lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode);
List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
jgScrapCancel.setRegistrationManageId(String.join(",", certificates));
jgScrapCancel.setUseRegistrationCode(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.joining(",")));
} else {
List<Map<String, Object>> certificates;
// 证列表
if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) {
certificates = (List<Map<String, Object>>) noticeParams.get("cylCertificates");
} else {
certificates = (List<Map<String, Object>>) noticeParams.get("certificates");
}
if (ObjectUtils.isEmpty(certificates)) { if (ObjectUtils.isEmpty(certificates)) {
throw new BadRequest("请选择使用登记证"); throw new BadRequest("请选择使用登记证");
} }
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper(); // 使用登记证表idList
lambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, certificates.stream().map(Long::parseLong).collect(Collectors.toList())); List<String> registrationIdList = certificates.stream().map(item -> item.get("sequenceNbr").toString()).collect(Collectors.toList());
List<String> useRegistrationCodeList = certificates.stream().map(item -> item.get("useRegistrationCode").toString()).collect(Collectors.toList());
jgScrapCancel.setRegistrationManageId(String.join(",", registrationIdList));
jgScrapCancel.setUseRegistrationCode(String.join(",", useRegistrationCodeList));
}
}
List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
private void saveEquip(Map<String, Object> noticeParams, JgScrapCancel jgScrapCancel) {
List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>();
// 判断是否是报废气瓶业务处理
if (CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) &&
CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) {
List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments"); List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments");
if (ObjectUtils.isEmpty(list)) { for (Map<String, Object> equip : list) {
throw new BadRequest("请选择设备");
}
for (JgUseRegistrationManage jgUseRegistrationManage : jgUseRegistrationManageList) {
JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq(); JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
jgScrapCancelEq.setCertificateSeq(jgUseRegistrationManage.getSequenceNbr().toString()); jgScrapCancelEq.setEquId(equip.get("SEQUENCE_NBR").toString());
jgScrapCancelEq.setEquipInfo(JSON.parseArray(JSONObject.toJSONString(list.stream().filter(item -> item.get("USE_ORG_CODE").toString().equals(jgUseRegistrationManage.getUseRegistrationCode())).collect(Collectors.toList()))).toString()); jgScrapCancelEq.setUseRegistrationCode(equip.get("USE_ORG_CODE").toString());
jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr())); jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
jgScrapCancelEq.setEquCode(equip.get("EQU_CODE") != null ? equip.get("EQU_CODE").toString() : "");
JgScrapCancelEqList.add(jgScrapCancelEq); JgScrapCancelEqList.add(jgScrapCancelEq);
} }
} else { } else {
List<Map<String, Object>> certificates = new ArrayList<>(); List<Map<String, Object>> certificates;
// 证列表 // 证列表
if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) { if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) {
certificates = (List<Map<String, Object>>) noticeParams.get("cylCertificates"); certificates = (List<Map<String, Object>>) noticeParams.get("cylCertificates");
} else { } else {
certificates = (List<Map<String, Object>>) noticeParams.get("certificates"); certificates = (List<Map<String, Object>>) noticeParams.get("certificates");
} }
if (ObjectUtils.isEmpty(certificates)) {
throw new BadRequest("请选择使用登记证");
}
// 使用登记证表idList // 使用登记证表idList
List<String> registrationIdList = certificates.stream().map(item -> item.get("sequenceNbr").toString()).collect(Collectors.toList()); List<String> registrationIdList = certificates.stream().map(item -> item.get("sequenceNbr").toString()).collect(Collectors.toList());
List<JSONObject> equipmentList = jgUseRegistrationManageService.queryEquByCertificateSeqList(registrationIdList.stream().map(Long::parseLong).collect(Collectors.toList())); List<JSONObject> equipmentList = jgUseRegistrationManageService.queryEquByCertificateSeqList(registrationIdList.stream().map(Long::parseLong).collect(Collectors.toList()));
for (Map<String, Object> certificate : certificates) { for (JSONObject equip : equipmentList) {
JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq(); JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
jgScrapCancelEq.setCertificateSeq(certificate.get("sequenceNbr").toString()); jgScrapCancelEq.setUseRegistrationCode(equip.getString("USE_ORG_CODE"));
jgScrapCancelEq.setEquipInfo(JSON.parseArray(String.valueOf(equipmentList.stream().filter(item -> item.get("USE_ORG_CODE").toString().equals(certificate.get("useRegistrationCode"))).collect(Collectors.toList()))).toString());
jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr())); jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
jgScrapCancelEq.setEquId(equip.getString("SEQUENCE_NBR"));
jgScrapCancelEq.setEquCode(equip.getString("EQU_CODE"));
JgScrapCancelEqList.add(jgScrapCancelEq); JgScrapCancelEqList.add(jgScrapCancelEq);
} }
} }
...@@ -313,18 +346,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -313,18 +346,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
} }
private void save2HisData(JSONObject jsonObject, JgScrapCancel jgScrapCancel) { private void save2HisData(JSONObject jsonObject, String currentDocumentId) {
commonService.saveOrUpdateHistory(jgScrapCancel.getCancelTypeDesc(), jsonObject, null, jgScrapCancel.getSequenceNbr().toString()); commonService.saveOrUpdateHistory("", jsonObject, null, currentDocumentId);
} }
private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) { private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
ReginParams reginParams = this.getSelectedOrgInfo();
TaskModelDto taskModelDto = new TaskModelDto(); TaskModelDto taskModelDto = new TaskModelDto();
if ("1".equals(submitType)) { if ("1".equals(submitType)) {
taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate()); taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
taskModelDto.setTaskName(taskName); taskModelDto.setTaskName(taskName);
taskModelDto.setTaskCode(scrapCancel.getApplyNo()); taskModelDto.setTaskCode(scrapCancel.getApplyNo());
taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getCancelType(), scrapCancel.getApplyNo())); taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquListCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
taskModelDto.setTaskDesc(""); taskModelDto.setTaskDesc("");
taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode()); taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName()); taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName());
...@@ -389,18 +421,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -389,18 +421,19 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
lambda.eq(JgScrapCancel::getSequenceNbr, id); lambda.eq(JgScrapCancel::getSequenceNbr, id);
JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda); JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
// 删除代办 + 中止流程 // 删除代办 + 中止流程
commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()),jgScrapCancel.getInstanceId()); commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()), jgScrapCancel.getInstanceId());
// 删除单子 // 删除单子
this.baseMapper.deleteById(jgScrapCancel.getSequenceNbr()); this.baseMapper.deleteById(jgScrapCancel.getSequenceNbr());
// 删除对应eq // 删除对应eq
jgScrapCancelEqMapper.delete(new LambdaQueryWrapper<JgScrapCancelEq>() jgScrapCancelEqMapper.delete(new LambdaQueryWrapper<JgScrapCancelEq>()
.eq(JgScrapCancelEq::getEquipTransferId,jgScrapCancel.getSequenceNbr())); .eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr()));
// 删除单子对应历史表数据 // 删除单子对应历史表数据
jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>() jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getSequenceNbr())); .eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getSequenceNbr()));
} }
} }
} }
@GlobalTransactional(rollbackFor = Exception.class) @GlobalTransactional(rollbackFor = Exception.class)
public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op, JSONObject pageData) { public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op, JSONObject pageData) {
...@@ -501,11 +534,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -501,11 +534,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord()); jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper); jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
} }
save2HisData(pageData, jgScrapCancelDto.getSequenceNbr().toString());
commonService.saveOrUpdateHistory(getRegistrationClass(jgScrapCancelDto.getCancelType()), pageData, jgScrapCancelDto.getRecord(), jgScrapCancelDto.getSequenceNbr().toString()); commonService.saveOrUpdateHistory(getRegistrationClass(jgScrapCancelDto.getCancelType()), pageData, jgScrapCancelDto.getRecord(), jgScrapCancelDto.getSequenceNbr().toString());
return jgScrapCancelDto; return jgScrapCancelDto;
} }
private String getRegistrationClass (String cancelType){ private String getRegistrationClass(String cancelType) {
return CancelTypeEnum.SCRAPPED.getCode().equals(cancelType) ? CancelTypeEnum.SCRAPPED.getName() : CancelTypeEnum.TRANSFER.getName(); return CancelTypeEnum.SCRAPPED.getCode().equals(cancelType) ? CancelTypeEnum.SCRAPPED.getName() : CancelTypeEnum.TRANSFER.getName();
} }
...@@ -597,55 +631,28 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -597,55 +631,28 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true); Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true);
beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate())); beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate()));
beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories())); beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories()));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)); JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
// 根据不同类型返回不同的字段、用于台套设备、气瓶、车用气瓶 // 根据不同类型返回不同的字段、用于台套设备、气瓶、车用气瓶
if(jgRegistrationHistory != null){ if (jgRegistrationHistory != null) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) { if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
beanMap.put("cylCertificates", JSONArray.parse(jsonObject.get("cylCertificates").toString())); beanMap.put("cylCertificates", JSONArray.parse(jsonObject.get("cylCertificates").toString()));
beanMap.put("EQU_CATEGORY_CODE",CylinderTypeEnum.SPECIAL_CYLINDER.getCode()); beanMap.put("EQU_CATEGORY_CODE", CylinderTypeEnum.SPECIAL_CYLINDER.getCode());
} else if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) { } else if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
beanMap.put("equipments", JSONArray.parse(jsonObject.get("equipments").toString())); beanMap.put("equipments", JSONArray.parse(jsonObject.get("equipments").toString()));
beanMap.put("EQU_CATEGORY_CODE",CylinderTypeEnum.CYLINDER.getCode()); beanMap.put("EQU_CATEGORY_CODE", CylinderTypeEnum.CYLINDER.getCode());
beanMap.put("sequenceNbrs",jsonObject.get("sequenceNbrs")); beanMap.put("sequenceNbrs", jsonObject.get("sequenceNbrs"));
} else { } else {
beanMap.put("certificates", JSONArray.parse(jsonObject.get("certificates").toString())); beanMap.put("certificates", JSONArray.parse(jsonObject.get("certificates").toString()));
} }
} }
if(scrapCancel.getAuditStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
// 完成状态查询历史表
JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr);
// 兼容老数据
if(jsonObject == null){
// 老数据逻辑
// fillRuntimeData(sequenceNbr, resultMap);
} else {
CommonServiceImpl.formatTime2StrDateForEquip(jsonObject);
// 新数据逻辑
resultMap.putAll(jsonObject);
}
resultMap.putAll(beanMap);
} else {
// 其他状态显示实时数据
// fillRuntimeData(sequenceNbr, resultMap);
resultMap.putAll(beanMap); resultMap.putAll(beanMap);
}
resultMap.put("receiveOrgCode", scrapCancel.getReceiveCompanyCode() + '_' + scrapCancel.getReceiveOrgName()); resultMap.put("receiveOrgCode", scrapCancel.getReceiveCompanyCode() + '_' + scrapCancel.getReceiveOrgName());
return new HashMap<String, Object>() {{ return new HashMap<String, Object>() {{
this.put(PAGE_KEY, resultMap); this.put(PAGE_KEY, resultMap);
}}; }};
} }
private void fillRuntimeData(Long sequenceNbr, Map<String, Object> resultMap) {
JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(new LambdaQueryWrapper<JgScrapCancelEq>().eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr));
if (!ObjectUtils.isEmpty(jgScrapCancelEq)) {
Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
resultMap.putAll(map);
}
}
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class) @GlobalTransactional(rollbackFor = Exception.class)
...@@ -773,7 +780,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -773,7 +780,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
String taskName = ""; String taskName = "";
String nextTaskId = ""; String nextTaskId = "";
JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr); JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr);
jgScrapCancel.setEquList(equList);
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) { if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
taskCode = processTaskDTO.getNextTask().get(0).getKey(); taskCode = processTaskDTO.getNextTask().get(0).getKey();
taskName = processTaskDTO.getNextTask().get(0).getName(); taskName = processTaskDTO.getNextTask().get(0).getName();
...@@ -820,38 +826,20 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -820,38 +826,20 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
this.getBaseMapper().updateById(jgScrapCancel); this.getBaseMapper().updateById(jgScrapCancel);
} }
public void updateInfoOther(JgScrapCancel jgScrapCancel, String routePath) { private void updateInfoOther(JgScrapCancel jgScrapCancel, String routePath) {
LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda(); LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new LambdaQueryWrapper<>();
lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr()); lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
lambdaEq.select(JgScrapCancelEq::getEquId);
List<JgScrapCancelEq> jgScrapCancelEqList = jgScrapCancelEqMapper.selectList(lambdaEq); List<JgScrapCancelEq> jgScrapCancelEqList = jgScrapCancelEqMapper.selectList(lambdaEq);
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
ArrayList<String> equipIds = new ArrayList<>(); List<String> equipIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getEquId).collect(Collectors.toList());
jgScrapCancelEqList.forEach(item ->{ List<JgUseRegistrationManage> jgUseRegistrationManageList = getJgUseRegistrationManages(jgScrapCancelEqList);
if (!ObjectUtils.isEmpty(item.getEquipInfo())){
JSONArray jsonArray = JSONObject.parseArray(item.getEquipInfo());
jsonArray.forEach(info ->{
JSONObject jsonObject = JSONObject.parseObject(info.toString());
if (jsonObject.containsKey("SEQUENCE_NBR")){
equipIds.add(jsonObject.get("SEQUENCE_NBR").toString());
}
});
}
});
// ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
// String newUseRegistrationCertificateNumber = responseModel.getResult().split("-")[0];
Map<String, Map<String, Object>> resultMap = new HashMap<>(); Map<String, Map<String, Object>> resultMap = new HashMap<>();
// map1.put("USE_ORG_CODE", newUseRegistrationCertificateNumber);
if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) { if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.BAOFEI.getCode()); idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.BAOFEI.getCode());
map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode())); map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
// 修改证管理表中的证的状态 // 修改证管理表中的证的状态
// 查出所有需要改的使用登记证 // 查出所有需要改的使用登记证
List<String> certificateIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getCertificateSeq).collect(Collectors.toList());
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, certificateIds);
List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
// 过滤出非气瓶 或是车用气瓶的使用登记证 // 过滤出非气瓶 或是车用气瓶的使用登记证
jgUseRegistrationManageList = jgUseRegistrationManageList.stream().filter(item -> !CylinderTypeEnum.CYLINDER.getCode().equals(item.getEquCategoryCode()) || item.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())).collect(Collectors.toList()); jgUseRegistrationManageList = jgUseRegistrationManageList.stream().filter(item -> !CylinderTypeEnum.CYLINDER.getCode().equals(item.getEquCategoryCode()) || item.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())).collect(Collectors.toList());
List<Long> seqList = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList()); List<Long> seqList = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList());
...@@ -873,20 +861,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -873,20 +861,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
map1.put("ORG_BRANCH_NAME", ""); map1.put("ORG_BRANCH_NAME", "");
map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode())); map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode()); idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode());
// 修改证管理表中的证的状态 // 修改证管理表中的证的状态
List<String> certificateIds = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getCertificateSeq).collect(Collectors.toList()); LambdaUpdateWrapper<JgUseRegistrationManage> updateWrapper = new LambdaUpdateWrapper<>();
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage(); updateWrapper.in(JgUseRegistrationManage::getSequenceNbr, jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList()));
jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName()); updateWrapper.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>(); jgUseRegistrationManageMapper.update(null, updateWrapper);
lambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, certificateIds);
jgUseRegistrationManageMapper.update(jgUseRegistrationManage, lambdaQueryWrapper);
} }
for (String equipId : equipIds) { for (String equipId : equipIds) {
resultMap.put(equipId, map1); resultMap.put(equipId, map1);
} }
// 流水表 // 流水表
saveRecord(jgScrapCancel, jgScrapCancelEqList,routePath); saveRecord(jgScrapCancel, jgScrapCancelEqList, routePath, jgUseRegistrationManageList);
try { try {
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap); tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
} catch (Exception e) { } catch (Exception e) {
...@@ -896,6 +881,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -896,6 +881,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setAuditPassDate(new Date()); jgScrapCancel.setAuditPassDate(new Date());
} }
private List<JgUseRegistrationManage> getJgUseRegistrationManages(List<JgScrapCancelEq> jgScrapCancelEqList) {
List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCodes);
lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode, JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr);
return jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
}
public String getNextUserOrgCode(String operate, JgScrapCancel jgScrapCancel) { public String getNextUserOrgCode(String operate, JgScrapCancel jgScrapCancel) {
String code = null; String code = null;
if ("0".equals(operate)) { if ("0".equals(operate)) {
...@@ -912,44 +905,44 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -912,44 +905,44 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
} }
private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList,String routePath) { private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String userName = reginParams.getUserModel().getRealName(); String userName = reginParams.getUserModel().getRealName();
String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" + String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
"单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr(); "单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
LambdaQueryWrapper<JgRegistrationHistory> lambdaQueryWrapper = new LambdaQueryWrapper<>(); List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
lambdaQueryWrapper.eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getSequenceNbr()); List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(lambdaQueryWrapper); for (JgUseRegistrationManage jgUseRegistrationManage : jgUseRegistrationManageList) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); long seq = sequence.nextId();
for (JgScrapCancelEq jgScrapCancelEq : jgScrapCancelEqList) {
JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord(); JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
changeRecord.setSequenceNbr(seq);
changeRecord.setApplyNo(jgScrapCancel.getApplyNo()); changeRecord.setApplyNo(jgScrapCancel.getApplyNo());
changeRecord.setReceiveOrgName(jgScrapCancel.getReceiveOrgName()); changeRecord.setReceiveOrgName(jgScrapCancel.getReceiveOrgName());
changeRecord.setAuditPassDate(new Date()); changeRecord.setAuditPassDate(new Date());
changeRecord.setRegType(CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType())); changeRecord.setRegType(CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()));
changeRecord.setRegDate(jgScrapCancel.getCreateDate()); changeRecord.setRegDate(jgScrapCancel.getCreateDate());
changeRecord.setChangeContent(content); changeRecord.setChangeContent(content);
changeRecord.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode()); changeRecord.setUseRegistrationCode(jgUseRegistrationManage.getUseRegistrationCode());
changeRecord.setReceiveCompanyCode(jgScrapCancel.getReceiveOrgCode()); changeRecord.setReceiveCompanyCode(jgScrapCancel.getReceiveOrgCode());
changeRecord.setCertificateNo(String.valueOf(jsonObject.get("certificateNo")));
changeRecord.setUseUnitCreditCode(jgScrapCancel.getUseUnitCode()); changeRecord.setUseUnitCreditCode(jgScrapCancel.getUseUnitCode());
changeRecord.setUseUnitName(jgScrapCancel.getUseUnitName()); changeRecord.setUseUnitName(jgScrapCancel.getUseUnitName());
changeRecord.setEquCategory(String.valueOf(jsonObject.get("equCategory"))); changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategory());
changeRecord.setCreateDate(new Date()); changeRecord.setCreateDate(new Date());
changeRecord.setCreateUserId(reginParams.getUserModel().getUserId()); changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
changeRecord.setRoutePath(routePath); changeRecord.setRoutePath(routePath);
certificateChangeRecordService.save(changeRecord); certificateChangeRecords.add(changeRecord);
List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>(); jgScrapCancelEqList.stream().filter(eq -> eq.getUseRegistrationCode().equals(jgUseRegistrationManage.getUseRegistrationCode())).forEach(e -> {
JSONArray jsonArray = JSONObject.parseArray(jgScrapCancelEq.getEquipInfo());
jsonArray.forEach(e->{
JSONObject equip = JSONObject.parseObject(e.toString());
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq(); JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString());//登记证记录主键 changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString()); //登记证记录主键
changeRecordEq.setEquId(equip.getString("SEQUENCE_NBR"));//设备主键 changeRecordEq.setEquId(e.getEquId()); //设备主键
changeRecordEq.setProductCode(equip.getString("PRODUCT_NUM"));//设备产品编码（设备ES数据无编码，先存放名称） changeRecordEq.setProductCode(e.getEquCode()); //设备代码
changeRecordEqList.add(changeRecordEq); changeRecordEqList.add(changeRecordEq);
}); });
}
if (certificateChangeRecords.size() > 0) {
certificateChangeRecordService.saveBatch(certificateChangeRecords);
}
if (changeRecordEqList.size() > 0) {
jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList); jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
} }
} }
......
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/JgUseRegistrationManageServiceImpl.java
View file @ 455f4bd0
...@@ -270,7 +270,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -270,7 +270,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) { public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>() List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
.in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList) .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
.eq(JgUseRegistrationManage::getIsDelete, 0)); .eq(JgUseRegistrationManage::getIsDelete, 0)
.select(JgUseRegistrationManage::getUseRegistrationCode));
if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) { if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
return new ArrayList<>(); return new ArrayList<>();
} }
......
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 @ 455f4bd0
...@@ -175,6 +175,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -175,6 +175,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService; private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
@Autowired @Autowired
private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService; private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
@Autowired
private IdxBizJgConstructionInfoServiceImpl idxBizJgConstructionInfoService;
@Autowired
private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
/** /**
* @param auditPassDate 通过时间 * @param auditPassDate 通过时间
...@@ -878,15 +882,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -878,15 +882,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData()); JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
String useRegistrationCode = null; String useRegistrationCode = null;
Long useRegistrationManageSeq = null;
Boolean flag = Boolean.FALSE; Boolean flag = Boolean.FALSE;
String equCategoryCode = String.valueOf(mapData.get("EQU_CATEGORY_CODE")); String equCategoryCode = String.valueOf(mapData.get("EQU_CATEGORY_CODE"));
String equDefineCode = String.valueOf(mapData.get("EQU_DEFINE_CODE")); String equDefineCode = String.valueOf(mapData.get("EQU_DEFINE_CODE"));
if (mapData.containsKey("equipmentLists") && !ObjectUtils.isEmpty(mapData.get("equipmentLists"))){
JSONArray objects = JSONObject.parseArray(mapData.get("equipmentLists").toString());
if (!ObjectUtils.isEmpty(objects)){
JSONObject object = JSONObject.parseObject(JSON.toJSONString(objects.get(0)));
if (object.containsKey("equDefine")){
equDefineCode = String.valueOf(object.get("equDefine"));
}
}
}
//如果是气瓶或工业管道判断之前是否已经做过使用登记 //如果是气瓶或工业管道判断之前是否已经做过使用登记
if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) { if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
// 获取最新的使用登记记录 // 获取最新的使用登记记录
String useUnitCreditCode = jgUseRegistration.getUseUnitCreditCode(); String useUnitCreditCode = jgUseRegistration.getUseUnitCreditCode();
JgUseRegistrationManage jgUseRegistrationManage = commonServiceImpl.getLatestJgUseRegistrationManage(useUnitCreditCode, equDefineCode); JgUseRegistrationManage jgUseRegistrationManage = commonServiceImpl.getLatestJgUseRegistrationManage(useUnitCreditCode, equDefineCode);
useRegistrationCode = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationCode : jgUseRegistrationManage.getUseRegistrationCode(); useRegistrationCode = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationCode : jgUseRegistrationManage.getUseRegistrationCode();
useRegistrationManageSeq = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationManageSeq : jgUseRegistrationManage.getSequenceNbr();
flag = ObjectUtils.isEmpty(useRegistrationCode) ? flag : Boolean.TRUE; flag = ObjectUtils.isEmpty(useRegistrationCode) ? flag : Boolean.TRUE;
} }
...@@ -926,7 +941,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -926,7 +941,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg); IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
// 生成证书管理表 // 生成证书管理表
generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationCode); generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationManageSeq);
// 生成一条tzs_jg_certificate_change_record记录 // 生成一条tzs_jg_certificate_change_record记录
generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag); generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag);
...@@ -957,7 +972,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -957,7 +972,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
changeRecord.setAuditPassDate(new Date()); changeRecord.setAuditPassDate(new Date());
changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()); changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
changeRecord.setRegDate(jgUseRegistration.getCreateDate()); changeRecord.setRegDate(jgUseRegistration.getCreateDate());
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, flag));//变更内容 changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration,BusinessTypeEnum.JG_USAGE_REGISTRATION.getName(), flag));//变更内容
changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号 changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码 changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,new Date(),jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码 changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,new Date(),jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码
...@@ -975,13 +990,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -975,13 +990,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
* @param jgUseRegistration 使用登记单 * @param jgUseRegistration 使用登记单
* @param registerInfo 一码通设备注册信息表 * @param registerInfo 一码通设备注册信息表
*/ */
private void generateRegistrationManage(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, Boolean flag, String useRegistrationCode) { private void generateRegistrationManage(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, Boolean flag, Long useRegistrationManageSeq) {
if (flag) { if (flag) {
LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode); // queryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode);
JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper); // JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate()); jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
jgUseRegistrationManage.setSequenceNbr(useRegistrationManageSeq);
jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage); jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
return; return;
} }
...@@ -1249,10 +1266,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1249,10 +1266,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate()); "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
} }
private String buildRecordContent(JgUseRegistration obj, Boolean flag) { private String buildRecordContent(JgUseRegistration obj,String businessName, Boolean flag) {
//张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05 //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + (flag ? "设备增补" : "") + "】，" + return obj.getRecUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate()); "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
} }
...@@ -1560,6 +1577,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1560,6 +1577,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record); LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper); IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber()); jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
jsonObject.put("regType", jgUseRegistration.getRegType());
} else { } else {
// 完成、作废时显示历史数据,其他状态显示实时数据 // 完成、作废时显示历史数据,其他状态显示实时数据
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) { if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) {
...@@ -2040,7 +2058,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2040,7 +2058,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/ */
private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) { private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
// 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程 // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) { if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())
|| jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))
|| jgUseRegistration.getRegType().equals("1")) {
// 基本信息 + 制造信息 // 基本信息 + 制造信息
Map<String, Object> detail = this.baseMapper.getDetail(record); Map<String, Object> detail = this.baseMapper.getDetail(record);
// 设计信息 // 设计信息
...@@ -2050,8 +2070,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2050,8 +2070,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
} }
// 安装信息 // 安装信息
Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record); Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(installDetail)){
installDetail = this.baseMapper.getiInstallDetailByIdx(record);
}
// 维保信息 // 维保信息
Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record); Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
// 历史设备登记来的数据没有维保业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(maintenanceDetail)){
maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
}
if (!ObjectUtils.isEmpty(maintenanceDetail)) { if (!ObjectUtils.isEmpty(maintenanceDetail)) {
detail.putAll(maintenanceDetail); detail.putAll(maintenanceDetail);
} }
...@@ -2448,11 +2476,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2448,11 +2476,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 使用登记信息 // 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration(); JgUseRegistration jgUseRegistration = new JgUseRegistration();
jgUseRegistration.setRegDate(new Date()); jgUseRegistration.setRegDate(new Date());
LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
String supervisoryCode = otherInfo.getSupervisoryCode();
jgUseRegistration.setSupervisoryCode(supervisoryCode);
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) { if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories"))); jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
} }
...@@ -2536,13 +2560,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2536,13 +2560,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 业务管理设备信息保存 // 业务管理设备信息保存
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq(); JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
jgRelationEquip.setEquId(map.get("equipId").toString()); jgRelationEquip.setEquId(map.get("equipId").toString());
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("type"))), 1); ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
if (!ObjectUtils.isEmpty(listResponseModel)) { if (!ObjectUtils.isEmpty(listResponseModel)) {
jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0)); jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
} }
jgUseRegistration.setAuditPassDate(new Date()); jgUseRegistration.setAuditPassDate(new Date());
jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName()); jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName()); jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useRegistrationCode")) ? "" : String.valueOf(map.get("useRegistrationCode")));
jgUseRegistration.setRegType("1");//历史登记 jgUseRegistration.setRegType("1");//历史登记
this.save(jgUseRegistration); this.save(jgUseRegistration);
jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString()); jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
...@@ -2551,41 +2576,62 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2551,41 +2576,62 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 暂存历史表 // 暂存历史表
updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode()); updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, jgUseRegistration.getSequenceNbr());
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
TaskV2Model taskV2Model = new TaskV2Model(); TaskV2Model taskV2Model = new TaskV2Model();
taskV2Model.setRoutePath(""); taskV2Model.setRoutePath("");
// 登记证记录主键
Long changeRecordId= sequence.nextId();
// 注册信息 // 注册信息
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda(); LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId()); lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg); IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
processMapData(null, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, map, Boolean.FALSE, null); idxBizJgRegisterInfoMapper.updateById(registerInfo);
// 生成证书管理表记录
generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);
// 生成一条使用登记证变更记录
generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, Boolean.FALSE);
// 查询设备制造信息 // 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId()); factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper); IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
// 生成tzs_jg_certificate_change_record_eq记录 // 使用信息
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq(); LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键 lambda.eq(IdxBizJgUseInfo::getRecord, String.valueOf(map.get("equipId")));
changeRecordEq.setEquId(registerInfo.getRecord());//设备主键 IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum()); String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() +"/" + useInfo.getStreetName();
certificateChangeRecordEqService.save(changeRecordEq); useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
useInfo.setUseUnitName(String.valueOf(map.get("useUnitName")));
useInfo.setProvince("610000");
useInfo.setProvinceName("陕西省");
useInfo.setCity(String.valueOf(map.get("city")).split("_")[0]);
// useInfo.setCityName(String.valueOf(map.get("city")).split("_")[1]);
useInfo.setCounty(String.valueOf(map.get("county")).split("_")[0]);
// useInfo.setCountyName(String.valueOf(map.get("county")).split("_")[1]);
useInfo.setFactoryUseSiteStreet(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[0]);
// useInfo.setStreetName(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[1]);
useInfo.setAddress(String.valueOf(map.get("address")));
useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
useInfo.setEstateUnitName(String.valueOf(map.get("estateUnitName")).split("_")[1]);
useInfoMapper.updateById(useInfo);
LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
// 生成监管码 96333码
this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
// 更新es
updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
// 设备安装信息更新
this.historyEquUpdateInstallInfo(map);
// 设备维保信息更新
this.historyEquUpdateMaintenanceInfo(map);
// 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
historyEquGenManageRelated(map,jgUseRegistration, registerInfo,idxBizJgFactoryInfo);
} }
return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr()); return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
} catch (BadRequest | LocalBadRequest e) { } catch (BadRequest | LocalBadRequest e) {
...@@ -2600,4 +2646,154 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2600,4 +2646,154 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
FlowingEquipRedisContext.clean(); FlowingEquipRedisContext.clean();
} }
} }
/**
* 历史设备登记-》更新维保信息
*/
private void historyEquUpdateMaintenanceInfo(JSONObject map){
SimpleDateFormat format = new SimpleDateFormat();
IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (!ValidationUtil.isEmpty(info)) {
info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
info.setMeMaster(ValidationUtil.isEmpty(map.get("meMaster")) ? null : String.valueOf(map.get("meMaster")).split("_")[1]);
info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("meMasterPhone")) ? null : String.valueOf(map.get("meMasterPhone")));
info.setMeMasterId(ValidationUtil.isEmpty(map.get("meMasterId")) ? null : String.valueOf(map.get("meMasterId")));
info.setMeMaster1(ValidationUtil.isEmpty(map.get("meMaster1")) ? null : String.valueOf(map.get("meMaster1")).split("_")[1]);
info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("meMaster1Phone")) ? null : String.valueOf(map.get("meMaster1Phone")));
info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("meMaster1Id")) ? null : String.valueOf(map.get("meMaster1Id")));
try {
info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
}catch (Exception exception){
exception.printStackTrace();
log.info("date转化失败");
}
info.setRepairInform(ValidationUtil.isEmpty(map.get("repairInform")) ? null : JSONObject.toJSONString(map.get("repairInform")));
}
idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
}
/**
* 历史设备登记-》更新安装信息
*/
private void historyEquUpdateInstallInfo(JSONObject map){
IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (!ValidationUtil.isEmpty(constructionInfo)) {
constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[0]);
constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[1]);
constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")).split("_")[1]);
constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
}
idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
}
private void historyEquGenManageRelated(JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo,IdxBizJgFactoryInfo idxBizJgFactoryInfo){
// 生成证书管理表记录
generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);
// 使用登记证变更记录 -> 使用登记记录
long jgUseRegSeq = sequence.nextId();
generateCertificateChangeRecord(jgUseRegistration, registerInfo, jgUseRegSeq, new TaskV2Model(), Boolean.FALSE);
// 使用登记证变更记录 -> 使用登记记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(jgUseRegSeq));//登记证记录主键
changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq);
// 使用登记证变更记录 -> 安装告知记录
if (!ValidationUtil.isEmpty(map.get("uscUnitCodeAndName"))){
long jgInstallSeq = sequence.nextId();//登记证记录主键
String useRegistrationCode = jgUseRegistration.getUseRegistrationCode();// 使用登记证编号
genJgCertChangeRecordForInstall(jgInstallSeq,useRegistrationCode,map,jgUseRegistration,registerInfo);
// 使用登记证变更记录 -> 安装告知记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq1 = new JgCertificateChangeRecordEq();
changeRecordEq1.setChangeRecordId(String.valueOf(jgInstallSeq));
changeRecordEq1.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq1.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq1);
}
// 使用登记证变更记录 -> 维保备案记录
if (!ValidationUtil.isEmpty(map.get("meUnitName"))){
long jgMaintenanceSeq = sequence.nextId();//登记证记录主键
String useRegistrationCode = jgUseRegistration.getUseRegistrationCode();// 使用登记证编号
genJgCertChangeRecordForMaintenance(jgMaintenanceSeq,useRegistrationCode,map,jgUseRegistration,registerInfo);
// 使用登记证变更记录 -> 维保备案记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq2 = new JgCertificateChangeRecordEq();
changeRecordEq2.setChangeRecordId(String.valueOf(jgMaintenanceSeq));
changeRecordEq2.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq2.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq2);
}
}
public void genJgCertChangeRecordForInstall(Long sequenceNbr, String registrationCode,JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo idxBizJgRegisterInfo) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String changeContent = "";
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo("");
try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
"办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate")));
}catch (Exception e){
e.printStackTrace();
log.info("date转化错误");
}
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath("");
jgCertificateChangeRecord.setCreateUserId(RequestContext.getExeUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
public void genJgCertChangeRecordForMaintenance(Long sequenceNbr, String registrationCode,JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo idxBizJgRegisterInfo) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String changeContent = "";
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo("");
try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，" +
"办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart")));
}catch (Exception e){
e.printStackTrace();
log.info("date转化错误");
}
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath("");
jgCertificateChangeRecord.setCreateUserId(RequestContext.getExeUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json
View file @ 455f4bd0
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
{ {
"name": "移装告知", "name": "移装告知",
"code": "GZ_YZ", "code": "GZ_YZ",
"image": "upload/tzs/common/image/移装告知.png" "image": "upload/tzs/common/image/移装告知.png",
"disable": true
} }
], ],
"DJGL": [ "DJGL": [
...@@ -47,7 +48,8 @@ ...@@ -47,7 +48,8 @@
{ {
"name": "移装变更登记", "name": "移装变更登记",
"code": "DJ_YZ", "code": "DJ_YZ",
"image": "upload/tzs/common/image/移装变更登记.png" "image": "upload/tzs/common/image/移装变更登记.png",
"disable": true
}, },
{ {
"name": "单位变更登记", "name": "单位变更登记",
...@@ -78,12 +80,14 @@ ...@@ -78,12 +80,14 @@
{ {
"name": "设备启用", "name": "设备启用",
"code": "SB_QY", "code": "SB_QY",
"image": "upload/tzs/common/image/设备启用.png" "image": "upload/tzs/common/image/设备启用.png",
"disable": true
}, },
{ {
"name": "设备停用", "name": "设备停用",
"code": "SB_TY", "code": "SB_TY",
"image": "upload/tzs/common/image/设备停用.png" "image": "upload/tzs/common/image/设备停用.png",
"disable": true
}, },
{ {
"name": "注销", "name": "注销",
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ 455f4bd0
...@@ -236,37 +236,37 @@ ...@@ -236,37 +236,37 @@
{ {
"type": "113-1", "type": "113-1",
"pageType": "draft", "pageType": "draft",
"name": "移装注销", "name": "注销",
"url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit" "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
}, },
{ {
"type": "113-1", "type": "113-1",
"pageType": "look", "pageType": "look",
"name": "移装注销", "name": "注销",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look" "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
}, },
{ {
"type": "113-1", "type": "113-1",
"pageType": "edit", "pageType": "edit",
"name": "移装注销", "name": "注销",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit" "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
}, },
{ {
"type": "113-2", "type": "113-2",
"pageType": "draft", "pageType": "draft",
"name": "报废注销", "name": "报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit" "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
}, },
{ {
"type": "113-2", "type": "113-2",
"pageType": "look", "pageType": "look",
"name": "报废注销", "name": "报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look" "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
}, },
{ {
"type": "113-2", "type": "113-2",
"pageType": "edit", "pageType": "edit",
"name": "报废注销", "name": "报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit" "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
}, },
{ {
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgConstructionInfo.java
View file @ 455f4bd0
...@@ -54,13 +54,13 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity { ...@@ -54,13 +54,13 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
private String uscUnitCreditCode; private String uscUnitCreditCode;
/** /**
* * 施工单位名称
*/ */
@TableField("\"USC_UNIT_NAME\"") @TableField("\"USC_UNIT_NAME\"")
private String uscUnitName; private String uscUnitName;
/** /**
* * 施工时间
*/ */
@TableField("\"USC_DATE\"") @TableField("\"USC_DATE\"")
private Date uscDate; private Date uscDate;
...@@ -94,5 +94,35 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity { ...@@ -94,5 +94,35 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
@TableField(value = "\"INFORM_FILE_PATH\"") @TableField(value = "\"INFORM_FILE_PATH\"")
private String informFilePath; private String informFilePath;
/**
* 施工负责人
*/
@TableField(value = "\"CONSTRUCTION_LEADER_NAME\"")
private String constructionLeaderName;
/**
* 施工负责人手机
*/
@TableField(value = "\"CONSTRUCTION_LEADER_PHONE\"")
private String constructionLeaderPhone;
/**
* 施工委托书图片
*/
@TableField(value = "\"PROXY_STATEMENT_ATTACHMENT\"")
private String proxyStatementAttachment;
/**
* 施工合同照片
*/
@TableField(value = "\"CONSTRUCTION_CONTRACT_ATTACHMENT\"")
private String constructionContractAttachment;
/**
* 其他附件
*/
@TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
private String constructionOtherAccessories;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java
View file @ 455f4bd0
...@@ -56,19 +56,19 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity { ...@@ -56,19 +56,19 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
private String meUnitName; private String meUnitName;
/** /**
* * 维保备案合同
*/ */
@TableField("\"REPAIR_INFORM\"") @TableField("\"REPAIR_INFORM\"")
private String repairInform; private String repairInform;
/** /**
* * 维保合同开始日期
*/ */
@TableField("\"INFORM_START\"") @TableField("\"INFORM_START\"")
private Date informStart; private Date informStart;
/** /**
* * 维保合同结束日期
*/ */
@TableField("\"INFORM_END\"") @TableField("\"INFORM_END\"")
private Date informEnd; private Date informEnd;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
View file @ 455f4bd0
...@@ -34,8 +34,7 @@ public enum ApplicationFormTypeEnum { ...@@ -34,8 +34,7 @@ public enum ApplicationFormTypeEnum {
ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销 ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销
GMBG("GMBG", "DJ_GM"),//更名变更 GMBG("GMBG", "DJ_GM"),//更名变更
SBQY("SBQY", "SB_QY"),//设备启用 SBQY("SBQY", "SB_QY"),//设备启用
SBTY("SBTY", "SB_TY")//设备启用 SBTY("SBTY", "SB_TY");//设备启用
;
/** /**
* 编号 * 编号
......
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