update table t_electron_component

cirs-biz/src/main/java/com/cirs/biz/domain/TElectronComponent.java

@@ -12,16 +12,23 @@ import com.cirs.common.core.domain.BaseEntity;
  * 元器件对象 t_electron_component
  * 
  * @author allen
- * @date 2023-11-03
+ * @date 2024-04-25
  */
 public class TElectronComponent extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
-//    @Excel(name = "元器件id")
     private Long id;
 
+    /** 元器件类别 */
+    @Excel(name = "元器件类别")
+    private String componentCategory;
+
+    /** 分类代码 */
+    @Excel(name = "分类代码")
+    private String componentCategoryCode;
+
     /** 元器件名称 */
     @Excel(name = "元器件名称")
     private String componentName;
@@ -43,6 +50,10 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "质量等级")
     private String qualityGrade;
 
+    /** 质量问题 */
+    @Excel(name = "质量问题")
+    private String qualityProblem;
+
     /** 供货周期（周） */
 //    @Excel(name = "供货周期", readConverterExp = "周=")//供货周期最优
     @Excel(name = "供货周期（周）")//供货周期最优
@@ -61,15 +72,35 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "ZZKK等级")
     private String zzkkLevel;
 
+    /** WKB情况 */
+    @Excel(name = "WKB情况")
+    private String wkbInfo;
+
     /** 是否在优选目录内 */
     @Excel(name = "是否在优选目录内")
     private String inPreference;
 
+    /** 质量检验（PDA) */
+    @Excel(name = "质量检验", readConverterExp = "质量检验（PDA)")
+    private String qualityInspection;
+
     /** 停产断档日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "停产断档日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shutdownDate;
 
+    /** 是否禁限用 */
+    @Excel(name = "是否禁限用")
+    private String forbidden;
+
+    /** 应用验证数据 */
+    @Excel(name = "应用验证数据")
+    private String appValidationData;
+
+    /** 风险测评指标 */
+    @Excel(name = "风险测评指标")
+    private String riskEvaluationIndex;
+
     /** 阻值 */
     @Excel(name = "阻值")
     private BigDecimal resistanceValue;
@@ -118,111 +149,15 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "直流电阻")
     private BigDecimal dcResistance;
 
-    public BigDecimal getResistanceValue() {
-        return resistanceValue;
-    }
-
-    public void setResistanceValue(BigDecimal resistanceValue) {
-        this.resistanceValue = resistanceValue;
-    }
-
-    public String getResistancePrecision() {
-        return resistancePrecision;
-    }
-
-    public void setResistancePrecision(String resistancePrecision) {
-        this.resistancePrecision = resistancePrecision;
-    }
-
-    public String getResistanceTemperature() {
-        return resistanceTemperature;
-    }
-
-    public void setResistanceTemperature(String resistanceTemperature) {
-        this.resistanceTemperature = resistanceTemperature;
-    }
-
-    public BigDecimal getResistancePower() {
-        return resistancePower;
-    }
-
-    public void setResistancePower(BigDecimal resistancePower) {
-        this.resistancePower = resistancePower;
-    }
-
-    public BigDecimal getCapacitanceValue() {
-        return capacitanceValue;
-    }
-
-    public void setCapacitanceValue(BigDecimal capacitanceValue) {
-        this.capacitanceValue = capacitanceValue;
-    }
-
-    public BigDecimal getCapacitanceLoss() {
-        return capacitanceLoss;
-    }
-
-    public void setCapacitanceLoss(BigDecimal capacitanceLoss) {
-        this.capacitanceLoss = capacitanceLoss;
-    }
-
-    public String getTemperatureCoefficient() {
-        return temperatureCoefficient;
-    }
-
-    public void setTemperatureCoefficient(String temperatureCoefficient) {
-        this.temperatureCoefficient = temperatureCoefficient;
-    }
-
-    public BigDecimal getRatedVoltage() {
-        return ratedVoltage;
-    }
-
-    public void setRatedVoltage(BigDecimal ratedVoltage) {
-        this.ratedVoltage = ratedVoltage;
-    }
-
-    public BigDecimal getInductance() {
-        return inductance;
-    }
-
-    public void setInductance(BigDecimal inductance) {
-        this.inductance = inductance;
-    }
-
-    public BigDecimal getQualityFactor() {
-        return qualityFactor;
-    }
-
-    public void setQualityFactor(BigDecimal qualityFactor) {
-        this.qualityFactor = qualityFactor;
-    }
-
-    public BigDecimal getDcResistance() {
-        return dcResistance;
-    }
-
-    public void setDcResistance(BigDecimal dcResistance) {
-        this.dcResistance = dcResistance;
-    }
-
-    public BigDecimal getRatedCurrent() {
-        return ratedCurrent;
-    }
-
-    public void setRatedCurrent(BigDecimal ratedCurrent) {
-        this.ratedCurrent = ratedCurrent;
-    }
-
     /** 额定电流 */
     @Excel(name = "额定电流")
     private BigDecimal ratedCurrent;
+
     /** 最大正向电流IFM（mA） */
 //    @Excel(name = "最大正向电流IFM", readConverterExp = "m=A")
     @Excel(name = "最大正向电流IFM（mA）")
     private BigDecimal paramIfm;
 
-
     /** 最大反向工作电压VRRM（V） */
 //    @Excel(name = "最大反向工作电压VRRM", readConverterExp = "V=")
     @Excel(name = "最大反向工作电压VRRM（V）")
@@ -253,7 +188,6 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "最大集电极-基极电压VCBO（V）")
     private BigDecimal paramVcbo;
 
-
     /** 集电极-发射极电压VCEO（V） */
 //    @Excel(name = "集电极-发射极电压VCEO", readConverterExp = "V=")
     @Excel(name = "集电极-发射极电压VCEO（V）")
@@ -279,7 +213,6 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "漏-源通态电阻RDS(on)（mΩ）")
     private BigDecimal paramRdsOn;
 
-
     /** 抗静电能力 */
     @Excel(name = "抗静电能力")
     private String antistaticCapacity;
@@ -309,6 +242,24 @@ public class TElectronComponent extends BaseEntity
     {
         return id;
     }
+    public void setComponentCategory(String componentCategory) 
+    {
+        this.componentCategory = componentCategory;
+    }
+
+    public String getComponentCategory() 
+    {
+        return componentCategory;
+    }
+    public void setComponentCategoryCode(String componentCategoryCode) 
+    {
+        this.componentCategoryCode = componentCategoryCode;
+    }
+
+    public String getComponentCategoryCode() 
+    {
+        return componentCategoryCode;
+    }
     public void setComponentName(String componentName) 
     {
         this.componentName = componentName;
@@ -354,6 +305,15 @@ public class TElectronComponent extends BaseEntity
     {
         return qualityGrade;
     }
+    public void setQualityProblem(String qualityProblem) 
+    {
+        this.qualityProblem = qualityProblem;
+    }
+
+    public String getQualityProblem() 
+    {
+        return qualityProblem;
+    }
     public void setDeliveryCycle(BigDecimal deliveryCycle) 
     {
         this.deliveryCycle = deliveryCycle;
@@ -390,6 +350,15 @@ public class TElectronComponent extends BaseEntity
     {
         return zzkkLevel;
     }
+    public void setWkbInfo(String wkbInfo) 
+    {
+        this.wkbInfo = wkbInfo;
+    }
+
+    public String getWkbInfo() 
+    {
+        return wkbInfo;
+    }
     public void setInPreference(String inPreference) 
     {
         this.inPreference = inPreference;
@@ -399,6 +368,15 @@ public class TElectronComponent extends BaseEntity
     {
         return inPreference;
     }
+    public void setQualityInspection(String qualityInspection) 
+    {
+        this.qualityInspection = qualityInspection;
+    }
+
+    public String getQualityInspection() 
+    {
+        return qualityInspection;
+    }
     public void setShutdownDate(Date shutdownDate) 
     {
         this.shutdownDate = shutdownDate;
@@ -408,6 +386,69 @@ public class TElectronComponent extends BaseEntity
     {
         return shutdownDate;
     }
+    public void setForbidden(String forbidden) 
+    {
+        this.forbidden = forbidden;
+    }
+
+    public String getForbidden() 
+    {
+        return forbidden;
+    }
+    public void setAppValidationData(String appValidationData) 
+    {
+        this.appValidationData = appValidationData;
+    }
+
+    public String getAppValidationData() 
+    {
+        return appValidationData;
+    }
+    public void setRiskEvaluationIndex(String riskEvaluationIndex) 
+    {
+        this.riskEvaluationIndex = riskEvaluationIndex;
+    }
+
+    public String getRiskEvaluationIndex() 
+    {
+        return riskEvaluationIndex;
+    }
+    public void setResistanceValue(BigDecimal resistanceValue) 
+    {
+        this.resistanceValue = resistanceValue;
+    }
+
+    public BigDecimal getResistanceValue() 
+    {
+        return resistanceValue;
+    }
+    public void setResistancePrecision(String resistancePrecision) 
+    {
+        this.resistancePrecision = resistancePrecision;
+    }
+
+    public String getResistancePrecision() 
+    {
+        return resistancePrecision;
+    }
+    public void setResistanceTemperature(String resistanceTemperature) 
+    {
+        this.resistanceTemperature = resistanceTemperature;
+    }
+
+    public String getResistanceTemperature() 
+    {
+        return resistanceTemperature;
+    }
+    public void setResistancePower(BigDecimal resistancePower) 
+    {
+        this.resistancePower = resistancePower;
+    }
+
+    public BigDecimal getResistancePower() 
+    {
+        return resistancePower;
+    }
     public void setEncapsulationMode(String encapsulationMode) 
     {
         this.encapsulationMode = encapsulationMode;
@@ -417,6 +458,78 @@ public class TElectronComponent extends BaseEntity
     {
         return encapsulationMode;
     }
+    public void setCapacitanceValue(BigDecimal capacitanceValue) 
+    {
+        this.capacitanceValue = capacitanceValue;
+    }
+
+    public BigDecimal getCapacitanceValue() 
+    {
+        return capacitanceValue;
+    }
+    public void setCapacitanceLoss(BigDecimal capacitanceLoss) 
+    {
+        this.capacitanceLoss = capacitanceLoss;
+    }
+
+    public BigDecimal getCapacitanceLoss() 
+    {
+        return capacitanceLoss;
+    }
+    public void setTemperatureCoefficient(String temperatureCoefficient) 
+    {
+        this.temperatureCoefficient = temperatureCoefficient;
+    }
+
+    public String getTemperatureCoefficient() 
+    {
+        return temperatureCoefficient;
+    }
+    public void setRatedVoltage(BigDecimal ratedVoltage) 
+    {
+        this.ratedVoltage = ratedVoltage;
+    }
+
+    public BigDecimal getRatedVoltage() 
+    {
+        return ratedVoltage;
+    }
+    public void setInductance(BigDecimal inductance) 
+    {
+        this.inductance = inductance;
+    }
+
+    public BigDecimal getInductance() 
+    {
+        return inductance;
+    }
+    public void setQualityFactor(BigDecimal qualityFactor) 
+    {
+        this.qualityFactor = qualityFactor;
+    }
+
+    public BigDecimal getQualityFactor() 
+    {
+        return qualityFactor;
+    }
+    public void setDcResistance(BigDecimal dcResistance) 
+    {
+        this.dcResistance = dcResistance;
+    }
+
+    public BigDecimal getDcResistance() 
+    {
+        return dcResistance;
+    }
+    public void setRatedCurrent(BigDecimal ratedCurrent) 
+    {
+        this.ratedCurrent = ratedCurrent;
+    }
+
+    public BigDecimal getRatedCurrent() 
+    {
+        return ratedCurrent;
+    }
     public void setParamIfm(BigDecimal paramIfm) 
     {
         this.paramIfm = paramIfm;
@@ -573,49 +686,62 @@ public class TElectronComponent extends BaseEntity
 
     @Override
     public String toString() {
-        return "TElectronComponent{" +
-                "id=" + id +
-                ", componentName='" + componentName + '\'' +
-                ", manufacturer='" + manufacturer + '\'' +
-                ", componentModel='" + componentModel + '\'' +
-                ", replaceDomesticModel='" + replaceDomesticModel + '\'' +
-                ", qualityGrade='" + qualityGrade + '\'' +
-                ", deliveryCycle=" + deliveryCycle +
-                ", supplyQuantity=" + supplyQuantity +
-                ", unitPrice=" + unitPrice +
-                ", zzkkLevel='" + zzkkLevel + '\'' +
-                ", inPreference='" + inPreference + '\'' +
-                ", shutdownDate=" + shutdownDate +
-                ", resistanceValue=" + resistanceValue +
-                ", resistancePrecision='" + resistancePrecision + '\'' +
-                ", resistanceTemperature='" + resistanceTemperature + '\'' +
-                ", resistancePower=" + resistancePower +
-                ", encapsulationMode='" + encapsulationMode + '\'' +
-                ", capacitanceValue=" + capacitanceValue +
-                ", capacitanceLoss=" + capacitanceLoss +
-                ", temperatureCoefficient='" + temperatureCoefficient + '\'' +
-                ", ratedVoltage=" + ratedVoltage +
-                ", inductance=" + inductance +
-                ", qualityFactor=" + qualityFactor +
-                ", dcResistance=" + dcResistance +
-                ", ratedCurrent=" + ratedCurrent +
-                ", paramIfm=" + paramIfm +
-                ", paramVrrm=" + paramVrrm +
-                ", paramIfsm=" + paramIfsm +
-                ", paramZz=" + paramZz +
-                ", paramPcm=" + paramPcm +
-                ", paramIcm=" + paramIcm +
-                ", paramVcbo=" + paramVcbo +
-                ", paramVceo=" + paramVceo +
-                ", paramVebo=" + paramVebo +
-                ", paramVdss=" + paramVdss +
-                ", paramId=" + paramId +
-                ", paramRdsOn=" + paramRdsOn +
-                ", antistaticCapacity='" + antistaticCapacity + '\'' +
-                ", radiationResistance='" + radiationResistance + '\'' +
-                ", materials='" + materials + '\'' +
-                ", craft='" + craft + '\'' +
-                ", weight='" + weight + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("componentCategory", getComponentCategory())
+            .append("componentCategoryCode", getComponentCategoryCode())
+            .append("componentName", getComponentName())
+            .append("manufacturer", getManufacturer())
+            .append("componentModel", getComponentModel())
+            .append("replaceDomesticModel", getReplaceDomesticModel())
+            .append("qualityGrade", getQualityGrade())
+            .append("qualityProblem", getQualityProblem())
+            .append("deliveryCycle", getDeliveryCycle())
+            .append("supplyQuantity", getSupplyQuantity())
+            .append("unitPrice", getUnitPrice())
+            .append("zzkkLevel", getZzkkLevel())
+            .append("wkbInfo", getWkbInfo())
+            .append("inPreference", getInPreference())
+            .append("qualityInspection", getQualityInspection())
+            .append("shutdownDate", getShutdownDate())
+            .append("forbidden", getForbidden())
+            .append("appValidationData", getAppValidationData())
+            .append("riskEvaluationIndex", getRiskEvaluationIndex())
+            .append("resistanceValue", getResistanceValue())
+            .append("resistancePrecision", getResistancePrecision())
+            .append("resistanceTemperature", getResistanceTemperature())
+            .append("resistancePower", getResistancePower())
+            .append("encapsulationMode", getEncapsulationMode())
+            .append("capacitanceValue", getCapacitanceValue())
+            .append("capacitanceLoss", getCapacitanceLoss())
+            .append("temperatureCoefficient", getTemperatureCoefficient())
+            .append("ratedVoltage", getRatedVoltage())
+            .append("inductance", getInductance())
+            .append("qualityFactor", getQualityFactor())
+            .append("dcResistance", getDcResistance())
+            .append("ratedCurrent", getRatedCurrent())
+            .append("paramIfm", getParamIfm())
+            .append("paramVrrm", getParamVrrm())
+            .append("paramIfsm", getParamIfsm())
+            .append("paramZz", getParamZz())
+            .append("paramPcm", getParamPcm())
+            .append("paramIcm", getParamIcm())
+            .append("paramVcbo", getParamVcbo())
+            .append("paramVceo", getParamVceo())
+            .append("paramVebo", getParamVebo())
+            .append("paramVdss", getParamVdss())
+            .append("paramId", getParamId())
+            .append("paramRdsOn", getParamRdsOn())
+            .append("antistaticCapacity", getAntistaticCapacity())
+            .append("radiationResistance", getRadiationResistance())
+            .append("materials", getMaterials())
+            .append("craft", getCraft())
+            .append("weight", getWeight())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
     }
 }

cirs-biz/src/main/resources/mapper/biz/TElectronComponentMapper.xml

@@ -3,20 +3,28 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cirs.biz.mapper.TElectronComponentMapper">
-
+    
     <resultMap type="TElectronComponent" id="TElectronComponentResult">
         <result property="id"    column="id"    />
+        <result property="componentCategory"    column="component_category"    />
+        <result property="componentCategoryCode"    column="component_category_code"    />
         <result property="componentName"    column="component_name"    />
         <result property="manufacturer"    column="manufacturer"    />
         <result property="componentModel"    column="component_model"    />
         <result property="replaceDomesticModel"    column="replace_domestic_model"    />
         <result property="qualityGrade"    column="quality_grade"    />
+        <result property="qualityProblem"    column="quality_problem"    />
         <result property="deliveryCycle"    column="delivery_cycle"    />
         <result property="supplyQuantity"    column="supply_quantity"    />
         <result property="unitPrice"    column="unit_price"    />
         <result property="zzkkLevel"    column="zzkk_level"    />
+        <result property="wkbInfo"    column="wkb_info"    />
         <result property="inPreference"    column="in_preference"    />
+        <result property="qualityInspection"    column="quality_inspection"    />
         <result property="shutdownDate"    column="shutdown_date"    />
+        <result property="forbidden"    column="forbidden"    />
+        <result property="appValidationData"    column="app_validation_data"    />
+        <result property="riskEvaluationIndex"    column="risk_evaluation_index"    />
         <result property="resistanceValue"    column="resistance_value"    />
         <result property="resistancePrecision"    column="resistance_precision"    />
         <result property="resistanceTemperature"    column="resistance_temperature"    />
@@ -55,25 +63,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTElectronComponentVo">
-        select id, component_name, manufacturer, component_model, replace_domestic_model, quality_grade, delivery_cycle, supply_quantity, unit_price, zzkk_level, in_preference, shutdown_date,
-               resistance_value, resistance_precision, resistance_temperature, resistance_power, encapsulation_mode, capacitance_value, capacitance_loss, temperature_coefficient, rated_voltage, inductance, quality_factor, dc_resistance, rated_current,param_ifm, param_vrrm, param_ifsm, param_zz, param_pcm, param_icm, param_vcbo, param_vceo, param_vebo, param_vdss, param_id, param_RDS_on, antistatic_capacity, radiation_resistance, materials, craft, weight, create_by, create_time, update_by, update_time, remark from t_electron_component
+        select id, component_category, component_category_code, component_name, manufacturer, component_model, replace_domestic_model, quality_grade, quality_problem, delivery_cycle, supply_quantity, unit_price, zzkk_level, wkb_info, in_preference, quality_inspection, shutdown_date, forbidden, app_validation_data, risk_evaluation_index, resistance_value, resistance_precision, resistance_temperature, resistance_power, encapsulation_mode, capacitance_value, capacitance_loss, temperature_coefficient, rated_voltage, inductance, quality_factor, dc_resistance, rated_current, param_ifm, param_vrrm, param_ifsm, param_zz, param_pcm, param_icm, param_vcbo, param_vceo, param_vebo, param_vdss, param_id, param_RDS_on, antistatic_capacity, radiation_resistance, materials, craft, weight, create_by, create_time, update_by, update_time, remark from t_electron_component
     </sql>
 
     <select id="selectTElectronComponentList" parameterType="TElectronComponent" resultMap="TElectronComponentResult">
         <include refid="selectTElectronComponentVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
+            <if test="componentCategory != null  and componentCategory != ''"> and component_category = #{componentCategory}</if>
+            <if test="componentCategoryCode != null  and componentCategoryCode != ''"> and component_category_code = #{componentCategoryCode}</if>
             <if test="componentName != null  and componentName != ''"> and component_name like concat('%', #{componentName}, '%')</if>
             <if test="manufacturer != null  and manufacturer != ''"> and manufacturer = #{manufacturer}</if>
             <if test="componentModel != null  and componentModel != ''"> and component_model = #{componentModel}</if>
             <if test="replaceDomesticModel != null  and replaceDomesticModel != ''"> and replace_domestic_model = #{replaceDomesticModel}</if>
             <if test="qualityGrade != null  and qualityGrade != ''"> and quality_grade = #{qualityGrade}</if>
+            <if test="qualityProblem != null  and qualityProblem != ''"> and quality_problem = #{qualityProblem}</if>
             <if test="deliveryCycle != null "> and delivery_cycle = #{deliveryCycle}</if>
             <if test="supplyQuantity != null "> and supply_quantity = #{supplyQuantity}</if>
             <if test="unitPrice != null "> and unit_price = #{unitPrice}</if>
             <if test="zzkkLevel != null  and zzkkLevel != ''"> and zzkk_level = #{zzkkLevel}</if>
+            <if test="wkbInfo != null  and wkbInfo != ''"> and wkb_info = #{wkbInfo}</if>
             <if test="inPreference != null  and inPreference != ''"> and in_preference = #{inPreference}</if>
+            <if test="qualityInspection != null  and qualityInspection != ''"> and quality_inspection = #{qualityInspection}</if>
             <if test="shutdownDate != null "> and shutdown_date = #{shutdownDate}</if>
+            <if test="forbidden != null  and forbidden != ''"> and forbidden = #{forbidden}</if>
+            <if test="appValidationData != null  and appValidationData != ''"> and app_validation_data = #{appValidationData}</if>
+            <if test="riskEvaluationIndex != null  and riskEvaluationIndex != ''"> and risk_evaluation_index = #{riskEvaluationIndex}</if>
             <if test="resistanceValue != null "> and resistance_value = #{resistanceValue}</if>
             <if test="resistancePrecision != null  and resistancePrecision != ''"> and resistance_precision = #{resistancePrecision}</if>
             <if test="resistanceTemperature != null  and resistanceTemperature != ''"> and resistance_temperature = #{resistanceTemperature}</if>
@@ -121,17 +136,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTElectronComponent" parameterType="TElectronComponent" useGeneratedKeys="true" keyProperty="id">
         insert into t_electron_component
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="componentCategory != null">component_category,</if>
+            <if test="componentCategoryCode != null">component_category_code,</if>
             <if test="componentName != null">component_name,</if>
             <if test="manufacturer != null">manufacturer,</if>
             <if test="componentModel != null">component_model,</if>
             <if test="replaceDomesticModel != null">replace_domestic_model,</if>
             <if test="qualityGrade != null">quality_grade,</if>
+            <if test="qualityProblem != null">quality_problem,</if>
             <if test="deliveryCycle != null">delivery_cycle,</if>
             <if test="supplyQuantity != null">supply_quantity,</if>
             <if test="unitPrice != null">unit_price,</if>
             <if test="zzkkLevel != null">zzkk_level,</if>
+            <if test="wkbInfo != null">wkb_info,</if>
             <if test="inPreference != null">in_preference,</if>
+            <if test="qualityInspection != null">quality_inspection,</if>
             <if test="shutdownDate != null">shutdown_date,</if>
+            <if test="forbidden != null">forbidden,</if>
+            <if test="appValidationData != null">app_validation_data,</if>
+            <if test="riskEvaluationIndex != null">risk_evaluation_index,</if>
             <if test="resistanceValue != null">resistance_value,</if>
             <if test="resistancePrecision != null">resistance_precision,</if>
             <if test="resistanceTemperature != null">resistance_temperature,</if>
@@ -169,17 +192,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="componentCategory != null">#{componentCategory},</if>
+            <if test="componentCategoryCode != null">#{componentCategoryCode},</if>
             <if test="componentName != null">#{componentName},</if>
             <if test="manufacturer != null">#{manufacturer},</if>
             <if test="componentModel != null">#{componentModel},</if>
             <if test="replaceDomesticModel != null">#{replaceDomesticModel},</if>
             <if test="qualityGrade != null">#{qualityGrade},</if>
+            <if test="qualityProblem != null">#{qualityProblem},</if>
             <if test="deliveryCycle != null">#{deliveryCycle},</if>
             <if test="supplyQuantity != null">#{supplyQuantity},</if>
             <if test="unitPrice != null">#{unitPrice},</if>
             <if test="zzkkLevel != null">#{zzkkLevel},</if>
+            <if test="wkbInfo != null">#{wkbInfo},</if>
             <if test="inPreference != null">#{inPreference},</if>
+            <if test="qualityInspection != null">#{qualityInspection},</if>
             <if test="shutdownDate != null">#{shutdownDate},</if>
+            <if test="forbidden != null">#{forbidden},</if>
+            <if test="appValidationData != null">#{appValidationData},</if>
+            <if test="riskEvaluationIndex != null">#{riskEvaluationIndex},</if>
             <if test="resistanceValue != null">#{resistanceValue},</if>
             <if test="resistancePrecision != null">#{resistancePrecision},</if>
             <if test="resistanceTemperature != null">#{resistanceTemperature},</if>
@@ -221,17 +252,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTElectronComponent" parameterType="TElectronComponent">
         update t_electron_component
         <trim prefix="SET" suffixOverrides=",">
+            <if test="componentCategory != null">component_category = #{componentCategory},</if>
+            <if test="componentCategoryCode != null">component_category_code = #{componentCategoryCode},</if>
             <if test="componentName != null">component_name = #{componentName},</if>
             <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
             <if test="componentModel != null">component_model = #{componentModel},</if>
             <if test="replaceDomesticModel != null">replace_domestic_model = #{replaceDomesticModel},</if>
             <if test="qualityGrade != null">quality_grade = #{qualityGrade},</if>
+            <if test="qualityProblem != null">quality_problem = #{qualityProblem},</if>
             <if test="deliveryCycle != null">delivery_cycle = #{deliveryCycle},</if>
             <if test="supplyQuantity != null">supply_quantity = #{supplyQuantity},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
             <if test="zzkkLevel != null">zzkk_level = #{zzkkLevel},</if>
+            <if test="wkbInfo != null">wkb_info = #{wkbInfo},</if>
             <if test="inPreference != null">in_preference = #{inPreference},</if>
+            <if test="qualityInspection != null">quality_inspection = #{qualityInspection},</if>
             <if test="shutdownDate != null">shutdown_date = #{shutdownDate},</if>
+            <if test="forbidden != null">forbidden = #{forbidden},</if>
+            <if test="appValidationData != null">app_validation_data = #{appValidationData},</if>
+            <if test="riskEvaluationIndex != null">risk_evaluation_index = #{riskEvaluationIndex},</if>
             <if test="resistanceValue != null">resistance_value = #{resistanceValue},</if>
             <if test="resistancePrecision != null">resistance_precision = #{resistancePrecision},</if>
             <if test="resistanceTemperature != null">resistance_temperature = #{resistanceTemperature},</if>

cirs-ui/src/views/biz/component/index.vue

@@ -316,41 +316,61 @@
     <el-table v-loading="loading" :data="componentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="元器件类别" align="center" prop="componentCategory" />
+      <el-table-column label="分类代码" align="center" prop="componentCategoryCode" />
       <el-table-column label="元器件名称" align="center" prop="componentName" width="100"  :show-overflow-tooltip="true"/>
       <el-table-column label="生产厂家" align="center" prop="manufacturer"  :show-overflow-tooltip="true"/>
       <el-table-column label="国产型号" align="center" prop="componentModel"  :show-overflow-tooltip="true"/>
       <el-table-column label="国产型号替代型号" align="center" prop="replaceDomesticModel" width="110"  :show-overflow-tooltip="true"/>
       <el-table-column label="质量等级" align="center" prop="qualityGrade" />
+      <el-table-column label="质量问题" align="center" prop="qualityProblem" />
       <el-table-column label="供货周期（周）" align="center" prop="deliveryCycle" width="120"/>
       <el-table-column label="供货量（个/年）" align="center" prop="supplyQuantity" width="140"/>
       <el-table-column label="价格" align="center" prop="unitPrice" />
       <el-table-column label="ZZKK等级" align="center" prop="zzkkLevel" width="100"/>
+      <el-table-column label="WKB情况" align="center" prop="wkbInfo" />
       <el-table-column label="是否在优选目录内" align="center" prop="inPreference" width="130"  :show-overflow-tooltip="true"/>
+      <el-table-column label="质量检验" align="center" prop="qualityInspection" />
       <el-table-column label="停产断档日期" align="center" prop="shutdownDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.shutdownDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否禁限用" align="center" prop="forbidden" />
+      <el-table-column label="应用验证数据" align="center" prop="appValidationData" />
+      <el-table-column label="风险测评指标" align="center" prop="riskEvaluationIndex" />
       <el-table-column label="封装形式" align="center" prop="encapsulationMode" />
-<!--      <el-table-column label="最大正向电流IFM" align="center" prop="paramIfm" width="130"/>-->
-<!--      <el-table-column label="最大反向工作电压VRRM" align="center" prop="paramVrrm" width="170"/>-->
-<!--      <el-table-column label="最大浪涌电流IFSM" align="center" prop="paramIfsm" width="130"/>-->
-<!--      <el-table-column label="稳压状态下的动态电阻ZZ" align="center" prop="paramZz" width="170"/>-->
-<!--      <el-table-column label="最大额定功率PCM" align="center" prop="paramPcm" width="130"/>-->
-<!--      <el-table-column label="最大集电极电流ICM" align="center" prop="paramIcm" width="170"/>-->
-<!--      <el-table-column label="最大集电极-基极电压VCBO" align="center" prop="paramVcbo" width="200"/>-->
-<!--      <el-table-column label="集电极-发射极电压VCEO" align="center" prop="paramVceo" width="180"/>-->
-<!--      <el-table-column label="发射极-基极电压VEBO" align="center" prop="paramVebo" width="170"/>-->
-<!--      <el-table-column label="漏源电压VDSS" align="center" prop="paramVdss" width="140"/>-->
-<!--      <el-table-column label="漏极直流电流ID" align="center" prop="paramId" width="130"/>-->
-<!--      <el-table-column label="漏-源通态电阻RDS(on)" align="center" prop="paramRdsOn" width="170"/>-->
-<!--      <el-table-column label="抗静电能力" align="center" prop="antistaticCapacity" width="100"/>-->
-<!--      <el-table-column label="抗辐照能力" align="center" prop="radiationResistance" width="100"/>-->
-<!--      <el-table-column label="材料" align="center" prop="materials" />-->
-<!--      <el-table-column label="工艺" align="center" prop="craft" />-->
-<!--      <el-table-column label="重量" align="center" prop="weight" />-->
-<!--      <el-table-column label="备注" align="center" prop="remark" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+      <!-- <el-table-column label="阻值" align="center" prop="resistanceValue" />
+      <el-table-column label="精度" align="center" prop="resistancePrecision" />
+      <el-table-column label="电阻温度特性" align="center" prop="resistanceTemperature" />
+      <el-table-column label="功耗" align="center" prop="resistancePower" />
+      <el-table-column label="电容量Cp" align="center" prop="capacitanceValue" />
+      <el-table-column label="损耗DF" align="center" prop="capacitanceLoss" />
+      <el-table-column label="温度系数" align="center" prop="temperatureCoefficient" />
+      <el-table-column label="额定电压WVDC" align="center" prop="ratedVoltage" />
+      <el-table-column label="电感量" align="center" prop="inductance" />
+      <el-table-column label="品质因数Qmin" align="center" prop="qualityFactor" />
+      <el-table-column label="直流电阻" align="center" prop="dcResistance" />
+      <el-table-column label="额定电流" align="center" prop="ratedCurrent" />
+      <el-table-column label="最大正向电流IFM" align="center" prop="paramIfm" />
+      <el-table-column label="最大反向工作电压VRRM" align="center" prop="paramVrrm" />
+      <el-table-column label="最大浪涌电流IFSM" align="center" prop="paramIfsm" />
+      <el-table-column label="稳压状态下的动态电阻ZZ" align="center" prop="paramZz" />
+      <el-table-column label="最大额定功率PCM" align="center" prop="paramPcm" />
+      <el-table-column label="最大集电极电流ICM" align="center" prop="paramIcm" />
+      <el-table-column label="最大集电极-基极电压VCBO" align="center" prop="paramVcbo" />
+      <el-table-column label="集电极-发射极电压VCEO" align="center" prop="paramVceo" />
+      <el-table-column label="发射极-基极电压VEBO" align="center" prop="paramVebo" />
+      <el-table-column label="漏源电压VDSS" align="center" prop="paramVdss" />
+      <el-table-column label="漏极直流电流ID" align="center" prop="paramId" />
+      <el-table-column label="漏-源通态电阻RDS(on)" align="center" prop="paramRdsOn" />
+      <el-table-column label="抗静电能力" align="center" prop="antistaticCapacity" />
+      <el-table-column label="抗辐照能力" align="center" prop="radiationResistance" />
+      <el-table-column label="材料" align="center" prop="materials" />
+      <el-table-column label="工艺" align="center" prop="craft" />
+      <el-table-column label="重量" align="center" prop="weight" />
+      <el-table-column label="备注" align="center" prop="remark" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -411,6 +431,12 @@
     <!-- 添加或修改元器件对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="220px">
+        <el-form-item label="元器件类别" prop="componentCategory">
+          <el-input v-model="form.componentCategory" placeholder="请输入元器件类别" />
+        </el-form-item>
+        <el-form-item label="分类代码" prop="componentCategoryCode">
+          <el-input v-model="form.componentCategoryCode" placeholder="请输入分类代码" />
+        </el-form-item>
         <el-form-item label="元器件名称" prop="componentName">
           <el-input v-model="form.componentName" placeholder="请输入元器件名称" />
         </el-form-item>
@@ -426,6 +452,9 @@
         <el-form-item label="质量等级" prop="qualityGrade">
           <el-input v-model="form.qualityGrade" placeholder="请输入质量等级" />
         </el-form-item>
+        <el-form-item label="质量问题" prop="qualityProblem">
+          <el-input v-model="form.qualityProblem" placeholder="请输入质量问题" />
+        </el-form-item>
         <el-form-item label="供货周期（周）" prop="deliveryCycle">
           <el-input v-model="form.deliveryCycle" placeholder="请输入供货周期" />
         </el-form-item>
@@ -438,9 +467,15 @@
         <el-form-item label="ZZKK等级" prop="zzkkLevel">
           <el-input v-model="form.zzkkLevel" placeholder="请输入ZZKK等级" />
         </el-form-item>
+        <el-form-item label="WKB情况" prop="wkbInfo">
+          <el-input v-model="form.wkbInfo" placeholder="请输入WKB情况" />
+        </el-form-item>
         <el-form-item label="是否在优选目录内" prop="inPreference">
           <el-input v-model="form.inPreference" placeholder="请输入是否在优选目录内" />
         </el-form-item>
+        <el-form-item label="质量检验" prop="qualityInspection">
+          <el-input v-model="form.qualityInspection" placeholder="请输入质量检验" />
+        </el-form-item>
         <el-form-item label="停产断档日期" prop="shutdownDate">
           <el-date-picker clearable
             v-model="form.shutdownDate"
@@ -449,9 +484,15 @@
             placeholder="请选择停产断档日期">
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item label="封装形式" prop="encapsulationMode">-->
-<!--          <el-input v-model="form.encapsulationMode" placeholder="请输入封装形式" />-->
-<!--        </el-form-item>-->
+        <el-form-item label="是否禁限用" prop="forbidden">
+          <el-input v-model="form.forbidden" placeholder="请输入是否禁限用" />
+        </el-form-item>
+        <el-form-item label="应用验证数据" prop="appValidationData">
+          <el-input v-model="form.appValidationData" placeholder="请输入应用验证数据" />
+        </el-form-item>
+        <el-form-item label="风险测评指标" prop="riskEvaluationIndex">
+          <el-input v-model="form.riskEvaluationIndex" placeholder="请输入风险测评指标" />
+        </el-form-item>
         <el-form-item label="阻值" prop="resistanceValue">
           <el-input v-model="form.resistanceValue" placeholder="请输入阻值" />
         </el-form-item>
@@ -553,13 +594,7 @@
     </el-dialog>
   </div>
 </template>
-<!--<style>-->
-
-<!--.sele {-->
-<!--  background-color: #48D1CC !important;-->
 
-<!--}-->
-<!--</style>-->
 <script>
 import { listComponent, getComponent, delComponent, addComponent, updateComponent,getall } from "@/api/biz/component";
 import { getToken } from "@/utils/auth";
@@ -609,18 +644,38 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        componentCategory: null,
+        componentCategoryCode: null,
         componentName: null,
         manufacturer: null,
         componentModel: null,
         replaceDomesticModel: null,
         qualityGrade: null,
+        qualityProblem: null,
         deliveryCycle: null,
         supplyQuantity: null,
         unitPrice: null,
         zzkkLevel: null,
+        wkbInfo: null,
         inPreference: null,
+        qualityInspection: null,
         shutdownDate: null,
+        forbidden: null,
+        appValidationData: null,
+        riskEvaluationIndex: null,
+        resistanceValue: null,
+        resistancePrecision: null,
+        resistanceTemperature: null,
+        resistancePower: null,
         encapsulationMode: null,
+        capacitanceValue: null,
+        capacitanceLoss: null,
+        temperatureCoefficient: null,
+        ratedVoltage: null,
+        inductance: null,
+        qualityFactor: null,
+        dcResistance: null,
+        ratedCurrent: null,
         paramIfm: null,
         paramVrrm: null,
         paramIfsm: null,
@@ -674,7 +729,6 @@ export default {
     /** 查询元器件列表 */
     getList() {
       this.loading = true;
-
       listComponent(this.queryParams).then(response => {
         this.componentList = response.rows;
         this.total = response.total;
@@ -690,17 +744,25 @@ export default {
     reset() {
       this.form = {
         id: null,
+        componentCategory: null,
+        componentCategoryCode: null,
         componentName: null,
         manufacturer: null,
         componentModel: null,
         replaceDomesticModel: null,
         qualityGrade: null,
+        qualityProblem: null,
         deliveryCycle: null,
         supplyQuantity: null,
         unitPrice: null,
         zzkkLevel: null,
+        wkbInfo: null,
         inPreference: null,
+        qualityInspection: null,
         shutdownDate: null,
+        forbidden: null,
+        appValidationData: null,
+        riskEvaluationIndex: null,
         resistanceValue: null,
         resistancePrecision: null,
         resistanceTemperature: null,
@@ -746,7 +808,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-
       this.resetForm("queryForm");
       this.handleQuery();
     },