Commit de0d4b2f authored by suhuiguang's avatar suhuiguang

1.历史无证设备创建表结构调整

parent 91239f73
......@@ -149,10 +149,14 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
@RequestParam(value = "type", required = false) String type) {
List<DictionarieValueModel> dictionarieValueModels = idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios, dataSource, type);
//bug 24467 新增历史设备--有移动式压力容器,需禁用或者删除
if ("his".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
//bug 24467 新增历史设备--有移动式压力容器,需禁用或者删除 (历史设备录入(有证-his,无证-black))
if ("his".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
}
// 历史无证设备录入(有证-his,无证-black))
if ( "black".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器") && !dictionarieValueModel.getDictDataValue().equals("气瓶")).collect(Collectors.toList());
}
return ResponseHelper.buildResponse(dictionarieValueModels);
}
......
......@@ -721,8 +721,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
@Override
public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList, String businessScenarios, String dataSource, String type) {
// 历史设备录入 直接取所有的设备种类(equList)下的所有设备类别
if ("his".equals(dataSource)) {
// 历史设备录入(有证-his,无证-black) 直接取所有的设备种类(equList)下的所有设备类别
if ("his".equals(dataSource) || "black".equals(dataSource)) {
// 历史数据导入设备类别限制 bug-21172
if (!ObjectUtils.isEmpty(type) && "PL_DR".equals(type)) {
return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
......
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
......@@ -17,19 +17,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgDesignInfoDto", description="安全追溯-设计信息表")
public class IdxBizJgDesignInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgDesignInfoDto", description = "安全追溯-设计信息表")
public class IdxBizJgDesignInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -76,4 +73,7 @@ public class IdxBizJgDesignInfoDto extends BaseDto {
@TableField("DESIGN_STANDARD")
private String designStandard;
@ApiModelProperty("资料是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】")
private String designIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
......@@ -17,19 +17,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgFactoryInfoDto", description="安全追溯-制造信息")
public class IdxBizJgFactoryInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgFactoryInfoDto", description = "安全追溯-制造信息")
public class IdxBizJgFactoryInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -84,4 +81,6 @@ public class IdxBizJgFactoryInfoDto extends BaseDto {
@TableField("TYPE_TEST_CREDENTIAL")
private String typeTestCredential;
@ApiModelProperty(value = "资料是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】")
private String factoryIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -87,4 +88,8 @@ public class IdxBizJgRegisterInfoDto extends BaseDto {
@ApiModelProperty(value = "最新使用登记证路径")
private String lastUseCertFilePath;
@ApiModelProperty(value = "检验是否在有限期内:1-有限期内 ;2-不在有效期内【历史无证设备需要】")
private String inInspectionPeriod;
}
......@@ -104,5 +104,10 @@ public class IdxBizJgTechParamsBoilerDto extends BaseDto {
private String safetyAccessoriesAndRelatedDevices;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-电梯
......@@ -17,19 +15,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgTechParamsElevatorDto", description="安全追溯-电梯")
public class IdxBizJgTechParamsElevatorDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgTechParamsElevatorDto", description = "安全追溯-电梯")
public class IdxBizJgTechParamsElevatorDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -308,4 +303,8 @@ public class IdxBizJgTechParamsElevatorDto extends BaseDto {
@TableField("KZG_OPERATION_MODE")
private String kzgOperationMode;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
......@@ -17,19 +17,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgTechParamsLiftingDto", description="安全追溯-起重机械")
public class IdxBizJgTechParamsLiftingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgTechParamsLiftingDto", description = "安全追溯-起重机械")
public class IdxBizJgTechParamsLiftingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -774,4 +771,9 @@ public class IdxBizJgTechParamsLiftingDto extends BaseDto {
@TableField("HANGING_CAGES_NUMBER")
private String hangingCagesNumber;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-游乐设施
......@@ -17,19 +15,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgTechParamsRidesDto", description="安全追溯-游乐设施")
public class IdxBizJgTechParamsRidesDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgTechParamsRidesDto", description = "安全追溯-游乐设施")
public class IdxBizJgTechParamsRidesDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -236,4 +231,9 @@ public class IdxBizJgTechParamsRidesDto extends BaseDto {
@TableField("OPERATOR_NUMBER")
private Integer operatorNumber;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-索道
......@@ -17,19 +15,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgTechParamsRopewayDto", description="安全追溯-索道")
public class IdxBizJgTechParamsRopewayDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgTechParamsRopewayDto", description = "安全追溯-索道")
public class IdxBizJgTechParamsRopewayDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -95,4 +90,9 @@ public class IdxBizJgTechParamsRopewayDto extends BaseDto {
@TableField("BALANCE_CABLE")
private String balanceCable;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
......@@ -210,4 +210,8 @@ public class IdxBizJgTechParamsVehicleDto extends BaseDto {
@TableField("MAIN_PARTS")
private String mainParts;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-压力容器
......@@ -17,19 +15,16 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="IdxBizJgTechParamsVesselDto", description="安全追溯-压力容器")
public class IdxBizJgTechParamsVesselDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModel(value = "IdxBizJgTechParamsVesselDto", description = "安全追溯-压力容器")
public class IdxBizJgTechParamsVesselDto extends BaseDto {
private static final long serialVersionUID = 1L;
@TableField("RECORD")
private String record;
@TableField("INSTANCE_ID")
private String instanceId;
......@@ -360,4 +355,10 @@ public class IdxBizJgTechParamsVesselDto extends BaseDto {
@TableField("PER_CAPITA_CABIN_CAPACITY")
private String perCapitaCabinCapacity;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
private String techParamIsComplete;
}
......@@ -107,4 +107,10 @@ public class IdxBizJgDesignInfo extends TzsBaseEntity {
@TableField("\"OTHER_ACCESSORIES_DES\"")
private String otherAccessoriesDes;
/**
* 资料是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"DESIGN_IS_COMPLETE\"")
private String designIsComplete;
}
......@@ -142,4 +142,11 @@ public class IdxBizJgFactoryInfo extends TzsBaseEntity {
@TableField(value = "\"BOILER_ENERGY_EFFICIENCY_CERTIFICATE\"")
private String boilerEnergyEfficiencyCertificate;
/**
* 资料是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"FACTORY_IS_COMPLETE\"")
private String factoryIsComplete;
}
......@@ -209,4 +209,12 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
@TableField("\"CYLINDER_CATEGORY\"")
private String cylinderCategory;
/**
* 检验是否在有限期内:1-有限期内 ;2-不在有效期内【历史无证设备需要】
*/
@TableField("\"IN_INSPECTION_PERIOD\"")
private String inInspectionPeriod;
}
......@@ -461,4 +461,10 @@ public class IdxBizJgTechParamsElevator extends TzsBaseEntity {
*/
@TableField("\"RATED_SPEED\"")
private String ratedSpeed;
/**
* 参数是否完整齐全:1-齐全;2-不齐全 【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
......@@ -1235,4 +1235,10 @@ public class IdxBizJgTechParamsLifting extends TzsBaseEntity {
@TableField("\"BICYCLE_MAX_COME_TIME\"")
private String bicycleMaxComeTime;
/**
* 参数是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
......@@ -166,5 +166,4 @@ public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
}
......@@ -342,4 +342,11 @@ public class IdxBizJgTechParamsRides extends TzsBaseEntity {
@TableField("\"OPERATOR_NUMBER\"")
private Integer operatorNumber;
/**
* 参数是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
......@@ -136,4 +136,11 @@ public class IdxBizJgTechParamsRopeway extends TzsBaseEntity {
@TableField("\"BALANCE_CABLE\"")
private String balanceCable;
/**
* 参数是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
......@@ -304,4 +304,11 @@ public class IdxBizJgTechParamsVehicle extends TzsBaseEntity {
@TableField("\"MAIN_PARTS\"")
private String mainParts;
/**
* 参数是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
......@@ -546,4 +546,11 @@ public class IdxBizJgTechParamsVessel extends TzsBaseEntity {
@TableField(value = "\"VIN\"")
private String vin;
/**
* 参数是否完整齐全:1-齐全;2-不齐全【历史无证设备需要】
*/
@TableField("\"TECH_PARAM_IS_COMPLETE\"")
private String techParamIsComplete;
}
package com.yeejoin.amos.boot.module.ymt.api.enums;
import lombok.Getter;
/**
*资料是否完整齐全枚举
*/
@Getter
public enum InfoIsCompleteEnum {
INFO_COMPLETE_YES("齐全完整", "1"),
INFO_COMPLETE_NO("不齐全", "2");
private final String name;
private final String value;
InfoIsCompleteEnum(String name, String value) {
this.name = name;
this.value = value;
}
}
package com.yeejoin.amos.boot.module.ymt.api.enums;
import lombok.Getter;
/**
* 检验是否在有限期内
*/
@Getter
public enum InspectIsInPeriodEnum {
IN_PERIOD_YES("有限期内", "1"),
IN_PERIOD_NO("不在有效期内", "2");
private final String name;
private final String value;
InspectIsInPeriodEnum(String name, String value) {
this.name = name;
this.value = value;
}
}
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