2023/12/21 元器件表扩列和一些接口完善

cirs-biz/src/main/java/com/cirs/biz/controller/FactoryScoreController.java

@@ -1,5 +1,6 @@
 package com.cirs.biz.controller;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -157,13 +158,17 @@ public class FactoryScoreController extends BaseController
                     .bodyToMono(String.class); //响应数据类型转换
 
 
-            mono.subscribe(result -> {
-                logger.info(result);
-            });
+            String res = mono.block();
+            logger.info(res);
+
             //接下来就传入算法即可
 //            System.out.println(JSON.toJSONString(objectMap));
+            AjaxResult result = new AjaxResult();
+            result.put("msg","成功");
+            result.put("data",res);
+            result.put("code",200);
+            return result;
 
-            return success("训练成功");
         } catch (Exception e) {
 
             return error("训练失败");
@@ -172,13 +177,14 @@ public class FactoryScoreController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('biz:score:marking')")
     @PostMapping ("/marking")
-    public AjaxResult recommend(@RequestBody FactoryScore args) {
+    public AjaxResult marking(@RequestBody FactoryScore args) {
         try {
             String model_path = DictUtils.getDictValue("biz_factoryScore_algorithm_config","model_path");
             String marking_uri = DictUtils.getDictValue("biz_factoryScore_algorithm_config","marking_uri");
 
             Map<String, Object> objectMap=new HashMap<>();
-            objectMap.put("data", args);
+
+            objectMap.put("dataSet", args);
             objectMap.put("modelPath", model_path);
 
             //接下来就传入算法

cirs-biz/src/main/java/com/cirs/biz/controller/SysTrainController.java

@@ -196,14 +196,16 @@ public class SysTrainController extends BaseController
                     .bodyToMono(String.class); //响应数据类型转换
 
 
-            mono.subscribe(result -> {
-                logger.info(result);
+            String res = mono.block();
+            logger.info(res);
 
-            });
             //接下来就传入算法即可
 //            System.out.println(JSON.toJSONString(objectMap));
-
-            return success("训练成功");
+            AjaxResult result = new AjaxResult();
+            result.put("msg","成功");
+            result.put("data",res);
+            result.put("code",200);
+            return result;
         } catch (Exception e) {
 
             return error("训练失败");

cirs-biz/src/main/java/com/cirs/biz/controller/TMarkingrecordController.java

@@ -0,0 +1,104 @@
+package com.cirs.biz.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.cirs.common.annotation.Log;
+import com.cirs.common.core.controller.BaseController;
+import com.cirs.common.core.domain.AjaxResult;
+import com.cirs.common.enums.BusinessType;
+import com.cirs.biz.domain.TMarkingrecord;
+import com.cirs.biz.service.ITMarkingrecordService;
+import com.cirs.common.utils.poi.ExcelUtil;
+import com.cirs.common.core.page.TableDataInfo;
+
+/**
+ * 打分记录Controller
+ * 
+ * @author allen
+ * @date 2023-12-18
+ */
+@RestController
+@RequestMapping("/biz/markingrecord")
+public class TMarkingrecordController extends BaseController
+{
+    @Autowired
+    private ITMarkingrecordService tMarkingrecordService;
+
+    /**
+     * 查询打分记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TMarkingrecord tMarkingrecord)
+    {
+        startPage();
+        List<TMarkingrecord> list = tMarkingrecordService.selectTMarkingrecordList(tMarkingrecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出打分记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:export')")
+    @Log(title = "打分记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TMarkingrecord tMarkingrecord)
+    {
+        List<TMarkingrecord> list = tMarkingrecordService.selectTMarkingrecordList(tMarkingrecord);
+        ExcelUtil<TMarkingrecord> util = new ExcelUtil<TMarkingrecord>(TMarkingrecord.class);
+        util.exportExcel(response, list, "打分记录数据");
+    }
+
+    /**
+     * 获取打分记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tMarkingrecordService.selectTMarkingrecordById(id));
+    }
+
+    /**
+     * 新增打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:add')")
+    @Log(title = "打分记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TMarkingrecord tMarkingrecord)
+    {
+        return toAjax(tMarkingrecordService.insertTMarkingrecord(tMarkingrecord));
+    }
+
+    /**
+     * 修改打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:edit')")
+    @Log(title = "打分记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TMarkingrecord tMarkingrecord)
+    {
+        return toAjax(tMarkingrecordService.updateTMarkingrecord(tMarkingrecord));
+    }
+
+    /**
+     * 删除打分记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:markingrecord:remove')")
+    @Log(title = "打分记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tMarkingrecordService.deleteTMarkingrecordByIds(ids));
+    }
+}

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationScoretaskDetailController.java

@@ -226,4 +226,14 @@ public class TVerificationScoretaskDetailController extends BaseController
         PageInfo<TVerificationScoretaskDetail> Page = new PageInfo<>(tVerificationScoretaskDetailService.selectTVerificationScoreaskDetailByTaskIds(taskids));
         return Page;
     }
+
+    @PostMapping("/getTraindataset")
+    public PageInfo<TVerificationScoretaskDetail> getTraindataset(
+            @RequestBody List<Long> taskids,
+            @RequestParam(name = "pageNum", defaultValue = "1") int pageNum,
+            @RequestParam(name = "pageSize", defaultValue = "10") int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageInfo<TVerificationScoretaskDetail> Page = new PageInfo<>(tVerificationScoretaskDetailService.selectTrainDetailByTaskIds(taskids));
+        return Page;
+    }
 }

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -174,7 +174,7 @@ public class TVerificationTaskDetailController extends BaseController
             String verification_uri = DictUtils.getDictValue("biz_algorithm_config","verification_uri");
 
 
-            logger.info(taskid.toString());
+//            logger.info(taskid.toString());
 //            System.out.println(taskid);
 
 //            getComponentIds(taskid);
@@ -187,11 +187,11 @@ public class TVerificationTaskDetailController extends BaseController
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
             // 创建一个 ObjectMapper 实例
-            ObjectMapper objectMapper = new ObjectMapper();
+//            ObjectMapper objectMapper = new ObjectMapper();
 
 // 将对象转换为 JSON 字符串
-            String json = objectMapper.writeValueAsString(objectMap);
-            logger.info("post json: {}", json);
+//            String json = objectMapper.writeValueAsString(objectMap);
+//            logger.info("post json: {}", json);
             // 发送请求
             Mono<String> mono = webClient
                     .post() // POST 请求
@@ -248,8 +248,8 @@ public class TVerificationTaskDetailController extends BaseController
                 detail.setCalculate3(getDetailById(detail.getCalculate3Id()));
                 detail.setCalculate4(getDetailById(detail.getCalculate4Id()));
                 detail.setCalculate5(getDetailById(detail.getCalculate5Id()));
-
-                detail.setTested(1);
+                detail.setTrained(verificationData.getTrained());
+                detail.setTested(verificationData.getTested());
 
                 tVerificationTaskDetailService.updateTVerificationTaskDetail(detail);
             }
@@ -281,4 +281,15 @@ public class TVerificationTaskDetailController extends BaseController
         PageInfo<TVerificationTaskDetail> Page = new PageInfo<>(tVerificationTaskDetailService.selectTVerificationTaskDetailByTaskIds(taskids));
         return Page;
     }
+
+
+    @PostMapping("/getTraindataset")
+    public PageInfo<TVerificationTaskDetail> getTraindataset(
+            @RequestBody List<Long> taskids,
+            @RequestParam(name = "pageNum", defaultValue = "1") int pageNum,
+            @RequestParam(name = "pageSize", defaultValue = "10") int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageInfo<TVerificationTaskDetail> Page = new PageInfo<>(tVerificationTaskDetailService.selectTrainDetailByTaskIds(taskids));
+        return Page;
+    }
 }

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

@@ -70,10 +70,153 @@ public class TElectronComponent extends BaseEntity
     @Excel(name = "停产断档日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shutdownDate;
 
+    /** 阻值 */
+    @Excel(name = "阻值")
+    private BigDecimal resistanceValue;
+
+    /** 精度 */
+    @Excel(name = "精度")
+    private String resistancePrecision;
+
+    /** 电阻温度特性（10e-6/K) */
+    @Excel(name = "电阻温度特性（10e-6/K）")
+    private String resistanceTemperature;
+
+    /** 功耗（W） */
+    @Excel(name = "功耗")
+    private BigDecimal resistancePower;
+
     /** 封装形式 */
     @Excel(name = "封装形式")
     private String encapsulationMode;
 
+    /** 电容量Cp */
+    @Excel(name = "电容量Cp")
+    private BigDecimal capacitanceValue;
+
+    /** 损耗DF */
+    @Excel(name = "损耗DF")
+    private BigDecimal capacitanceLoss;
+
+    /** 温度系数 */
+    @Excel(name = "温度系数")
+    private String temperatureCoefficient;
+
+    /** 额定电压WVDC */
+    @Excel(name = "额定电压WVDC")
+    private BigDecimal ratedVoltage;
+
+    /** 电感量 */
+    @Excel(name = "电感量")
+    private BigDecimal inductance;
+
+    /** 品质因数Qmin */
+    @Excel(name = "品质因数Qmin")
+    private BigDecimal qualityFactor;
+
+    /** 直流电阻 */
+    @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）")
@@ -430,42 +573,49 @@ public class TElectronComponent extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("componentName", getComponentName())
-            .append("manufacturer", getManufacturer())
-            .append("componentModel", getComponentModel())
-            .append("replaceDomesticModel", getReplaceDomesticModel())
-            .append("qualityGrade", getQualityGrade())
-            .append("deliveryCycle", getDeliveryCycle())
-            .append("supplyQuantity", getSupplyQuantity())
-            .append("unitPrice", getUnitPrice())
-            .append("zzkkLevel", getZzkkLevel())
-            .append("inPreference", getInPreference())
-            .append("shutdownDate", getShutdownDate())
-            .append("encapsulationMode", getEncapsulationMode())
-            .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();
+        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 + '\'' +
+                '}';
     }
 }

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

@@ -0,0 +1,681 @@
+package com.cirs.biz.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.cirs.common.annotation.Excel;
+import com.cirs.common.core.domain.BaseEntity;
+
+/**
+ * 打分记录对象 t_markingrecord
+ * 
+ * @author allen
+ * @date 2023-12-18
+ */
+public class TMarkingrecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 厂家名称 */
+    @Excel(name = "厂家名称")
+    private String factoryName;
+
+    /** 生产线运行情况良好 */
+    @Excel(name = "生产线运行情况良好")
+    private String factor1;
+
+    /** 生产过程耗材稳定供应 */
+    @Excel(name = "生产过程耗材稳定供应")
+    private String factor2;
+
+    /** 定期进行生产线维护保养 */
+    @Excel(name = "定期进行生产线维护保养")
+    private String factor3;
+
+    /** 质量体系完善且运行情况良好 */
+    @Excel(name = "质量体系完善且运行情况良好")
+    private String factor4;
+
+    /** 建立了与配套元器件生产相适应的生产管理系统且运行情况良好 */
+    @Excel(name = "建立了与配套元器件生产相适应的生产管理系统且运行情况良好")
+    private String factor5;
+
+    /** 重要岗位人员定期进行专业培训 */
+    @Excel(name = "重要岗位人员定期进行专业培训")
+    private String factor6;
+
+    /** 产品批次管理有具体文件内容规定，是否有管理责任人 */
+    @Excel(name = "产品批次管理有具体文件内容规定，是否有管理责任人")
+    private String factor7;
+
+    /** 未发生过因产品批次问题引起的交付问题 */
+    @Excel(name = "未发生过因产品批次问题引起的交付问题")
+    private String factor8;
+
+    /** 产品全寿命周期可追溯，质量一致性高 */
+    @Excel(name = "产品全寿命周期可追溯，质量一致性高")
+    private String factor9;
+
+    /** 生产工艺已完成定型，且有相关产品生产经历 */
+    @Excel(name = "生产工艺已完成定型，且有相关产品生产经历")
+    private String factor10;
+
+    /** 有明确生产过程控制技术手段 */
+    @Excel(name = "有明确生产过程控制技术手段")
+    private String factor11;
+
+    /** 关键工序有明确的评价准则、严格的监控措施和完整记录 */
+    @Excel(name = "关键工序有明确的评价准则、严格的监控措施和完整记录")
+    private String factor12;
+
+    /** 芯片的合格率水平满足要求 */
+    @Excel(name = "芯片的合格率水平满足要求")
+    private String factor13;
+
+    /** 封装的合格率水平满足要求 */
+    @Excel(name = "封装的合格率水平满足要求")
+    private String factor14;
+
+    /** 未发生过中重大失效问题 */
+    @Excel(name = "未发生过中重大失效问题")
+    private String factor15;
+
+    /** 针对重大失效问题，建立有应急处理机制，且严格执行。 */
+    @Excel(name = "针对重大失效问题，建立有应急处理机制，且严格执行。")
+    private String factor16;
+
+    /** 针对不同的核心零部件，由相应的采购策略 */
+    @Excel(name = "针对不同的核心零部件，由相应的采购策略")
+    private String factor17;
+
+    /** 具有稳定可靠的供货渠道 */
+    @Excel(name = "具有稳定可靠的供货渠道")
+    private String factor18;
+
+    /** 核心零部件检验制度完善 */
+    @Excel(name = "核心零部件检验制度完善")
+    private String factor19;
+
+    /** 无重大质量问题发生 */
+    @Excel(name = "无重大质量问题发生")
+    private String factor20;
+
+    /** 生产产能充足 */
+    @Excel(name = "生产产能充足")
+    private String factor21;
+
+    /** 产能调度分配机制成熟完善，能够满足要求 */
+    @Excel(name = "产能调度分配机制成熟完善，能够满足要求")
+    private String factor22;
+
+    /** 根据产品自身和用户应用需求特点，建立合理的库存策略 */
+    @Excel(name = "根据产品自身和用户应用需求特点，建立合理的库存策略")
+    private String factor23;
+
+    /** 针对有供货风险的零部件有合理的进出库管理策略 */
+    @Excel(name = "针对有供货风险的零部件有合理的进出库管理策略")
+    private String factor24;
+
+    /** 温湿度等存储环境条件满足要求 */
+    @Excel(name = "温湿度等存储环境条件满足要求")
+    private String factor25;
+
+    /** 有稳定的核心零部件、半成品/成品库存量 */
+    @Excel(name = "有稳定的核心零部件、半成品/成品库存量")
+    private String factor26;
+
+    /** 该产品符合技术发展趋势，为企业主攻主流产品 */
+    @Excel(name = "该产品符合技术发展趋势，为企业主攻主流产品")
+    private String factor27;
+
+    /** 产品用户市场需求量大，有长期生产、供货意愿和策略，有相关产品系列化发展策略 */
+    @Excel(name = "产品用户市场需求量大，有长期生产、供货意愿和策略，有相关产品系列化发展策略")
+    private String factor28;
+
+    /** 制定有完善的元器件状态管控制度或措施，且有效执行 */
+    @Excel(name = "制定有完善的元器件状态管控制度或措施，且有效执行")
+    private String factor29;
+
+    /** 器件状态清晰明确，且状态变更过程完全受控 */
+    @Excel(name = "器件状态清晰明确，且状态变更过程完全受控")
+    private String factor30;
+
+    /** 产品供货周期合理，能满足用户采购要求 */
+    @Excel(name = "产品供货周期合理，能满足用户采购要求")
+    private String factor31;
+
+    /** 最小起订量设置合理 */
+    @Excel(name = "最小起订量设置合理")
+    private String factor32;
+
+    /** 制定有相应的供应商准入、选择、评价等制度，并严格执行 */
+    @Excel(name = "制定有相应的供应商准入、选择、评价等制度，并严格执行")
+    private String factor33;
+
+    /** 有长期稳定合作的核心关键的外协单位 */
+    @Excel(name = "有长期稳定合作的核心关键的外协单位")
+    private String factor34;
+
+    /** 能够及时为用户提供应用全过程的技术售后服务 */
+    @Excel(name = "能够及时为用户提供应用全过程的技术售后服务")
+    private String factor35;
+
+    /** 了解用户对于国产元器件的应用需求及其发展趋势，了解用户的配套供货需求 */
+    @Excel(name = "了解用户对于国产元器件的应用需求及其发展趋势，了解用户的配套供货需求")
+    private String factor36;
+
+    /** 制定了健全的稳定核心人员的措施，并有效执行 */
+    @Excel(name = "制定了健全的稳定核心人员的措施，并有效执行")
+    private String factor37;
+
+    /** 成立有专门的军品管理部门和科研生产技术团队，核心团队稳定 */
+    @Excel(name = "成立有专门的军品管理部门和科研生产技术团队，核心团队稳定")
+    private String factor38;
+
+    /** 核心人员均具备相应的专业知识和技术能力 */
+    @Excel(name = "核心人员均具备相应的专业知识和技术能力")
+    private String factor39;
+
+    /** 建立了良好的成本管控措施 */
+    @Excel(name = "建立了良好的成本管控措施")
+    private String factor40;
+
+    /** 能够承担产品生产、配套相关成本，能够持续盈利 */
+    @Excel(name = "能够承担产品生产、配套相关成本，能够持续盈利")
+    private String factor41;
+
+    /** 经济性好，企业能够持续获利 */
+    @Excel(name = "经济性好，企业能够持续获利")
+    private String factor42;
+
+    /** 和供应链各节点单位之间建立了良好的信息沟通机制，能有效沟通信息，协调解决问题 */
+    @Excel(name = "和供应链各节点单位之间建立了良好的信息沟通机制，能有效沟通信息，协调解决问题")
+    private String factor43;
+
+    /** 产品推广应用情况良好，市场认可度高，客户满意度高 */
+    @Excel(name = "产品推广应用情况良好，市场认可度高，客户满意度高")
+    private String factor44;
+
+    /** 最终等级 */
+    @Excel(name = "最终等级")
+    private String finalGrade;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFactoryName(String factoryName) 
+    {
+        this.factoryName = factoryName;
+    }
+
+    public String getFactoryName() 
+    {
+        return factoryName;
+    }
+    public void setFactor1(String factor1) 
+    {
+        this.factor1 = factor1;
+    }
+
+    public String getFactor1() 
+    {
+        return factor1;
+    }
+    public void setFactor2(String factor2) 
+    {
+        this.factor2 = factor2;
+    }
+
+    public String getFactor2() 
+    {
+        return factor2;
+    }
+    public void setFactor3(String factor3) 
+    {
+        this.factor3 = factor3;
+    }
+
+    public String getFactor3() 
+    {
+        return factor3;
+    }
+    public void setFactor4(String factor4) 
+    {
+        this.factor4 = factor4;
+    }
+
+    public String getFactor4() 
+    {
+        return factor4;
+    }
+    public void setFactor5(String factor5) 
+    {
+        this.factor5 = factor5;
+    }
+
+    public String getFactor5() 
+    {
+        return factor5;
+    }
+    public void setFactor6(String factor6) 
+    {
+        this.factor6 = factor6;
+    }
+
+    public String getFactor6() 
+    {
+        return factor6;
+    }
+    public void setFactor7(String factor7) 
+    {
+        this.factor7 = factor7;
+    }
+
+    public String getFactor7() 
+    {
+        return factor7;
+    }
+    public void setFactor8(String factor8) 
+    {
+        this.factor8 = factor8;
+    }
+
+    public String getFactor8() 
+    {
+        return factor8;
+    }
+    public void setFactor9(String factor9) 
+    {
+        this.factor9 = factor9;
+    }
+
+    public String getFactor9() 
+    {
+        return factor9;
+    }
+    public void setFactor10(String factor10) 
+    {
+        this.factor10 = factor10;
+    }
+
+    public String getFactor10() 
+    {
+        return factor10;
+    }
+    public void setFactor11(String factor11) 
+    {
+        this.factor11 = factor11;
+    }
+
+    public String getFactor11() 
+    {
+        return factor11;
+    }
+    public void setFactor12(String factor12) 
+    {
+        this.factor12 = factor12;
+    }
+
+    public String getFactor12() 
+    {
+        return factor12;
+    }
+    public void setFactor13(String factor13) 
+    {
+        this.factor13 = factor13;
+    }
+
+    public String getFactor13() 
+    {
+        return factor13;
+    }
+    public void setFactor14(String factor14) 
+    {
+        this.factor14 = factor14;
+    }
+
+    public String getFactor14() 
+    {
+        return factor14;
+    }
+    public void setFactor15(String factor15) 
+    {
+        this.factor15 = factor15;
+    }
+
+    public String getFactor15() 
+    {
+        return factor15;
+    }
+    public void setFactor16(String factor16) 
+    {
+        this.factor16 = factor16;
+    }
+
+    public String getFactor16() 
+    {
+        return factor16;
+    }
+    public void setFactor17(String factor17) 
+    {
+        this.factor17 = factor17;
+    }
+
+    public String getFactor17() 
+    {
+        return factor17;
+    }
+    public void setFactor18(String factor18) 
+    {
+        this.factor18 = factor18;
+    }
+
+    public String getFactor18() 
+    {
+        return factor18;
+    }
+    public void setFactor19(String factor19) 
+    {
+        this.factor19 = factor19;
+    }
+
+    public String getFactor19() 
+    {
+        return factor19;
+    }
+    public void setFactor20(String factor20) 
+    {
+        this.factor20 = factor20;
+    }
+
+    public String getFactor20() 
+    {
+        return factor20;
+    }
+    public void setFactor21(String factor21) 
+    {
+        this.factor21 = factor21;
+    }
+
+    public String getFactor21() 
+    {
+        return factor21;
+    }
+    public void setFactor22(String factor22) 
+    {
+        this.factor22 = factor22;
+    }
+
+    public String getFactor22() 
+    {
+        return factor22;
+    }
+    public void setFactor23(String factor23) 
+    {
+        this.factor23 = factor23;
+    }
+
+    public String getFactor23() 
+    {
+        return factor23;
+    }
+    public void setFactor24(String factor24) 
+    {
+        this.factor24 = factor24;
+    }
+
+    public String getFactor24() 
+    {
+        return factor24;
+    }
+    public void setFactor25(String factor25) 
+    {
+        this.factor25 = factor25;
+    }
+
+    public String getFactor25() 
+    {
+        return factor25;
+    }
+    public void setFactor26(String factor26) 
+    {
+        this.factor26 = factor26;
+    }
+
+    public String getFactor26() 
+    {
+        return factor26;
+    }
+    public void setFactor27(String factor27) 
+    {
+        this.factor27 = factor27;
+    }
+
+    public String getFactor27() 
+    {
+        return factor27;
+    }
+    public void setFactor28(String factor28) 
+    {
+        this.factor28 = factor28;
+    }
+
+    public String getFactor28() 
+    {
+        return factor28;
+    }
+    public void setFactor29(String factor29) 
+    {
+        this.factor29 = factor29;
+    }
+
+    public String getFactor29() 
+    {
+        return factor29;
+    }
+    public void setFactor30(String factor30) 
+    {
+        this.factor30 = factor30;
+    }
+
+    public String getFactor30() 
+    {
+        return factor30;
+    }
+    public void setFactor31(String factor31) 
+    {
+        this.factor31 = factor31;
+    }
+
+    public String getFactor31() 
+    {
+        return factor31;
+    }
+    public void setFactor32(String factor32) 
+    {
+        this.factor32 = factor32;
+    }
+
+    public String getFactor32() 
+    {
+        return factor32;
+    }
+    public void setFactor33(String factor33) 
+    {
+        this.factor33 = factor33;
+    }
+
+    public String getFactor33() 
+    {
+        return factor33;
+    }
+    public void setFactor34(String factor34) 
+    {
+        this.factor34 = factor34;
+    }
+
+    public String getFactor34() 
+    {
+        return factor34;
+    }
+    public void setFactor35(String factor35) 
+    {
+        this.factor35 = factor35;
+    }
+
+    public String getFactor35() 
+    {
+        return factor35;
+    }
+    public void setFactor36(String factor36) 
+    {
+        this.factor36 = factor36;
+    }
+
+    public String getFactor36() 
+    {
+        return factor36;
+    }
+    public void setFactor37(String factor37) 
+    {
+        this.factor37 = factor37;
+    }
+
+    public String getFactor37() 
+    {
+        return factor37;
+    }
+    public void setFactor38(String factor38) 
+    {
+        this.factor38 = factor38;
+    }
+
+    public String getFactor38() 
+    {
+        return factor38;
+    }
+    public void setFactor39(String factor39) 
+    {
+        this.factor39 = factor39;
+    }
+
+    public String getFactor39() 
+    {
+        return factor39;
+    }
+    public void setFactor40(String factor40) 
+    {
+        this.factor40 = factor40;
+    }
+
+    public String getFactor40() 
+    {
+        return factor40;
+    }
+    public void setFactor41(String factor41) 
+    {
+        this.factor41 = factor41;
+    }
+
+    public String getFactor41() 
+    {
+        return factor41;
+    }
+    public void setFactor42(String factor42) 
+    {
+        this.factor42 = factor42;
+    }
+
+    public String getFactor42() 
+    {
+        return factor42;
+    }
+    public void setFactor43(String factor43) 
+    {
+        this.factor43 = factor43;
+    }
+
+    public String getFactor43() 
+    {
+        return factor43;
+    }
+    public void setFactor44(String factor44) 
+    {
+        this.factor44 = factor44;
+    }
+
+    public String getFactor44() 
+    {
+        return factor44;
+    }
+    public void setFinalGrade(String finalGrade) 
+    {
+        this.finalGrade = finalGrade;
+    }
+
+    public String getFinalGrade() 
+    {
+        return finalGrade;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryName", getFactoryName())
+            .append("factor1", getFactor1())
+            .append("factor2", getFactor2())
+            .append("factor3", getFactor3())
+            .append("factor4", getFactor4())
+            .append("factor5", getFactor5())
+            .append("factor6", getFactor6())
+            .append("factor7", getFactor7())
+            .append("factor8", getFactor8())
+            .append("factor9", getFactor9())
+            .append("factor10", getFactor10())
+            .append("factor11", getFactor11())
+            .append("factor12", getFactor12())
+            .append("factor13", getFactor13())
+            .append("factor14", getFactor14())
+            .append("factor15", getFactor15())
+            .append("factor16", getFactor16())
+            .append("factor17", getFactor17())
+            .append("factor18", getFactor18())
+            .append("factor19", getFactor19())
+            .append("factor20", getFactor20())
+            .append("factor21", getFactor21())
+            .append("factor22", getFactor22())
+            .append("factor23", getFactor23())
+            .append("factor24", getFactor24())
+            .append("factor25", getFactor25())
+            .append("factor26", getFactor26())
+            .append("factor27", getFactor27())
+            .append("factor28", getFactor28())
+            .append("factor29", getFactor29())
+            .append("factor30", getFactor30())
+            .append("factor31", getFactor31())
+            .append("factor32", getFactor32())
+            .append("factor33", getFactor33())
+            .append("factor34", getFactor34())
+            .append("factor35", getFactor35())
+            .append("factor36", getFactor36())
+            .append("factor37", getFactor37())
+            .append("factor38", getFactor38())
+            .append("factor39", getFactor39())
+            .append("factor40", getFactor40())
+            .append("factor41", getFactor41())
+            .append("factor42", getFactor42())
+            .append("factor43", getFactor43())
+            .append("factor44", getFactor44())
+            .append("finalGrade", getFinalGrade())
+            .toString();
+    }
+}

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

@@ -210,6 +210,26 @@ public class TVerificationScoretaskDetail extends BaseEntity
     @Excel(name = "算法计算的最终等级")
     private String calculatedGrade;
 
+    private Integer trained;
+
+    public Integer getTrained() {
+        return trained;
+    }
+
+    public void setTrained(Integer trained) {
+        this.trained = trained;
+    }
+
+    public Integer getTested() {
+        return tested;
+    }
+
+    public void setTested(Integer tested) {
+        this.tested = tested;
+    }
+
+    private Integer tested;
+
     public void setId(Long id) 
     {
         this.id = id;

cirs-biz/src/main/java/com/cirs/biz/mapper/TMarkingrecordMapper.java

@@ -0,0 +1,61 @@
+package com.cirs.biz.mapper;
+
+import java.util.List;
+import com.cirs.biz.domain.TMarkingrecord;
+
+/**
+ * 打分记录Mapper接口
+ * 
+ * @author allen
+ * @date 2023-12-18
+ */
+public interface TMarkingrecordMapper 
+{
+    /**
+     * 查询打分记录
+     * 
+     * @param id 打分记录主键
+     * @return 打分记录
+     */
+    public TMarkingrecord selectTMarkingrecordById(Long id);
+
+    /**
+     * 查询打分记录列表
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 打分记录集合
+     */
+    public List<TMarkingrecord> selectTMarkingrecordList(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 新增打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    public int insertTMarkingrecord(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 修改打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    public int updateTMarkingrecord(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 删除打分记录
+     * 
+     * @param id 打分记录主键
+     * @return 结果
+     */
+    public int deleteTMarkingrecordById(Long id);
+
+    /**
+     * 批量删除打分记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTMarkingrecordByIds(Long[] ids);
+}

cirs-biz/src/main/java/com/cirs/biz/mapper/TVerificationScoretaskDetailMapper.java

@@ -63,4 +63,6 @@ public interface TVerificationScoretaskDetailMapper
     public List<TVerificationScoretaskDetail> getByscoretaskid(Long taskid);
 
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(@Param("taskids") List<Long> taskids);
+
+    public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(@Param("taskids") List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/mapper/TVerificationTaskDetailMapper.java

@@ -69,4 +69,6 @@ public interface TVerificationTaskDetailMapper
     public Long getComponentId(@Param("attr")String attr, @Param("attr1")String attr1, @Param("attr2")String attr2);
 
     public List<VerificationData> getComponentids(Long taskid);
+
+    public List<TVerificationTaskDetail> selectTrainDetailByTaskIds(@Param("taskids") List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/service/ITMarkingrecordService.java

@@ -0,0 +1,61 @@
+package com.cirs.biz.service;
+
+import java.util.List;
+import com.cirs.biz.domain.TMarkingrecord;
+
+/**
+ * 打分记录Service接口
+ * 
+ * @author allen
+ * @date 2023-12-18
+ */
+public interface ITMarkingrecordService 
+{
+    /**
+     * 查询打分记录
+     * 
+     * @param id 打分记录主键
+     * @return 打分记录
+     */
+    public TMarkingrecord selectTMarkingrecordById(Long id);
+
+    /**
+     * 查询打分记录列表
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 打分记录集合
+     */
+    public List<TMarkingrecord> selectTMarkingrecordList(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 新增打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    public int insertTMarkingrecord(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 修改打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    public int updateTMarkingrecord(TMarkingrecord tMarkingrecord);
+
+    /**
+     * 批量删除打分记录
+     * 
+     * @param ids 需要删除的打分记录主键集合
+     * @return 结果
+     */
+    public int deleteTMarkingrecordByIds(Long[] ids);
+
+    /**
+     * 删除打分记录信息
+     * 
+     * @param id 打分记录主键
+     * @return 结果
+     */
+    public int deleteTMarkingrecordById(Long id);
+}

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationScoretaskDetailService.java

@@ -64,4 +64,6 @@ public interface ITVerificationScoretaskDetailService
     public List<TVerificationScoretaskDetail> getByscoretaskid(Long taskid);
 
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(List<Long> taskids);
+
+    public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationTaskDetailService.java

@@ -71,5 +71,7 @@ public interface ITVerificationTaskDetailService
 
     public Long setComponentId(String result);
 
-    List<VerificationData> getComponentids(Long taskid);
+    public List<VerificationData> getComponentids(Long taskid);
+
+    public List<TVerificationTaskDetail> selectTrainDetailByTaskIds(List<Long> taskids);
 }

cirs-biz/src/main/java/com/cirs/biz/service/impl/SysTrainServiceImpl.java

@@ -152,7 +152,7 @@ public class SysTrainServiceImpl implements ISysTrainService
     }
 
     @Override
-    public Long getComponentId(String result) {//元器件名称-型号规格-质量等级
+    public Long getComponentId(String result) {//型号规格-质量等级-元器件名称
         String[] attrs = result.split("-");//切割不同属性
         return sysTrainMapper.getComponentId(attrs[0],attrs[1],attrs[2]);
     }

cirs-biz/src/main/java/com/cirs/biz/service/impl/TElectronComponentServiceImpl.java

@@ -160,6 +160,6 @@ public class TElectronComponentServiceImpl implements ITElectronComponentService
     @Override
     public String getDetailById(Long id) {
         ElectronComponent detail = tElectronComponentMapper.getDetailById(id);
-        return detail.getComponent_name()+"-"+detail.getComponent_model()+"-"+detail.getQuality_grade();
+        return detail.getComponent_model()+"-"+detail.getQuality_grade()+"-"+detail.getComponent_name();
     }
 }

cirs-biz/src/main/java/com/cirs/biz/service/impl/TMarkingrecordServiceImpl.java

@@ -0,0 +1,93 @@
+package com.cirs.biz.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.cirs.biz.mapper.TMarkingrecordMapper;
+import com.cirs.biz.domain.TMarkingrecord;
+import com.cirs.biz.service.ITMarkingrecordService;
+
+/**
+ * 打分记录Service业务层处理
+ * 
+ * @author allen
+ * @date 2023-12-18
+ */
+@Service
+public class TMarkingrecordServiceImpl implements ITMarkingrecordService 
+{
+    @Autowired
+    private TMarkingrecordMapper tMarkingrecordMapper;
+
+    /**
+     * 查询打分记录
+     * 
+     * @param id 打分记录主键
+     * @return 打分记录
+     */
+    @Override
+    public TMarkingrecord selectTMarkingrecordById(Long id)
+    {
+        return tMarkingrecordMapper.selectTMarkingrecordById(id);
+    }
+
+    /**
+     * 查询打分记录列表
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 打分记录
+     */
+    @Override
+    public List<TMarkingrecord> selectTMarkingrecordList(TMarkingrecord tMarkingrecord)
+    {
+        return tMarkingrecordMapper.selectTMarkingrecordList(tMarkingrecord);
+    }
+
+    /**
+     * 新增打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    @Override
+    public int insertTMarkingrecord(TMarkingrecord tMarkingrecord)
+    {
+        return tMarkingrecordMapper.insertTMarkingrecord(tMarkingrecord);
+    }
+
+    /**
+     * 修改打分记录
+     * 
+     * @param tMarkingrecord 打分记录
+     * @return 结果
+     */
+    @Override
+    public int updateTMarkingrecord(TMarkingrecord tMarkingrecord)
+    {
+        return tMarkingrecordMapper.updateTMarkingrecord(tMarkingrecord);
+    }
+
+    /**
+     * 批量删除打分记录
+     * 
+     * @param ids 需要删除的打分记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTMarkingrecordByIds(Long[] ids)
+    {
+        return tMarkingrecordMapper.deleteTMarkingrecordByIds(ids);
+    }
+
+    /**
+     * 删除打分记录信息
+     * 
+     * @param id 打分记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTMarkingrecordById(Long id)
+    {
+        return tMarkingrecordMapper.deleteTMarkingrecordById(id);
+    }
+}

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationScoretaskDetailServiceImpl.java

@@ -178,4 +178,9 @@ public class TVerificationScoretaskDetailServiceImpl implements ITVerificationSc
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(List<Long> taskids) {
         return tVerificationScoretaskDetailMapper.selectTVerificationScoreaskDetailByTaskIds(taskids);
     }
+
+    @Override
+    public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids) {
+        return tVerificationScoretaskDetailMapper.selectTrainDetailByTaskIds(taskids);
+    }
 }

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -220,4 +220,9 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     public List<VerificationData> getComponentids(Long taskid) {
         return tVerificationTaskDetailMapper.getComponentids(taskid);
     }
+
+    @Override
+    public List<TVerificationTaskDetail> selectTrainDetailByTaskIds(List<Long> taskids) {
+        return tVerificationTaskDetailMapper.selectTrainDetailByTaskIds(taskids);
+    }
 }

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

@@ -87,9 +87,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="getComponentId" resultType="java.lang.Long">
-        select id from t_electron_component where t_electron_component.component_model=#{attr}
-        <if test="attr1 != null  and attr1 != ''"> AND t_electron_component.quality_grade=#{attr1}</if>
-        <if test="attr2 != null  and attr2 != ''"> AND t_electron_component.component_name=#{attr2}</if>
+        select id from t_electron_component
+              <where>
+                  <if test="attr != null  and attr != ''"> AND t_electron_component.component_model=#{attr}</if>
+                  <if test="attr1 != null  and attr1 != ''"> AND t_electron_component.quality_grade=#{attr1}</if>
+                  <if test="attr2 != null  and attr2 != ''"> AND t_electron_component.component_name=#{attr2}</if>
+              </where>
+
         LIMIT 1
     </select>
 

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

@@ -3,7 +3,7 @@
 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="componentName"    column="component_name"    />
@@ -17,7 +17,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zzkkLevel"    column="zzkk_level"    />
         <result property="inPreference"    column="in_preference"    />
         <result property="shutdownDate"    column="shutdown_date"    />
+        <result property="resistanceValue"    column="resistance_value"    />
+        <result property="resistancePrecision"    column="resistance_precision"    />
+        <result property="resistanceTemperature"    column="resistance_temperature"    />
+        <result property="resistancePower"    column="resistance_power"    />
         <result property="encapsulationMode"    column="encapsulation_mode"    />
+        <result property="capacitanceValue"    column="capacitance_value"    />
+        <result property="capacitanceLoss"    column="capacitance_loss"    />
+        <result property="temperatureCoefficient"    column="temperature_coefficient"    />
+        <result property="ratedVoltage"    column="rated_voltage"    />
+        <result property="inductance"    column="inductance"    />
+        <result property="qualityFactor"    column="quality_factor"    />
+        <result property="dcResistance"    column="dc_resistance"    />
+        <result property="ratedCurrent"    column="rated_current"    />
         <result property="paramIfm"    column="param_ifm"    />
         <result property="paramVrrm"    column="param_vrrm"    />
         <result property="paramIfsm"    column="param_ifsm"    />
@@ -43,7 +55,8 @@ 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, encapsulation_mode, 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_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
     </sql>
 
     <select id="selectTElectronComponentList" parameterType="TElectronComponent" resultMap="TElectronComponentResult">
@@ -61,7 +74,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zzkkLevel != null  and zzkkLevel != ''"> and zzkk_level = #{zzkkLevel}</if>
             <if test="inPreference != null  and inPreference != ''"> and in_preference = #{inPreference}</if>
             <if test="shutdownDate != null "> and shutdown_date = #{shutdownDate}</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>
+            <if test="resistancePower != null "> and resistance_power = #{resistancePower}</if>
             <if test="encapsulationMode != null  and encapsulationMode != ''"> and encapsulation_mode = #{encapsulationMode}</if>
+            <if test="capacitanceValue != null "> and capacitance_value = #{capacitanceValue}</if>
+            <if test="capacitanceLoss != null "> and capacitance_loss = #{capacitanceLoss}</if>
+            <if test="temperatureCoefficient != null  and temperatureCoefficient != ''"> and temperature_coefficient = #{temperatureCoefficient}</if>
+            <if test="ratedVoltage != null "> and rated_voltage = #{ratedVoltage}</if>
+            <if test="inductance != null "> and inductance = #{inductance}</if>
+            <if test="qualityFactor != null "> and quality_factor = #{qualityFactor}</if>
+            <if test="dcResistance != null "> and dc_resistance = #{dcResistance}</if>
+            <if test="ratedCurrent != null "> and rated_current = #{ratedCurrent}</if>
             <if test="paramIfm != null "> and param_ifm = #{paramIfm}</if>
             <if test="paramVrrm != null "> and param_vrrm = #{paramVrrm}</if>
             <if test="paramIfsm != null "> and param_ifsm = #{paramIfsm}</if>
@@ -90,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTElectronComponentVo"/>
     </select>
     <select id="getDetailById" resultType="ElectronComponent">
-        select component_name,component_model,quality_grade from t_electron_component where id = #{id}
+        select component_model,quality_grade,component_name from t_electron_component where id = #{id}
     </select>
 
     <insert id="insertTElectronComponent" parameterType="TElectronComponent" useGeneratedKeys="true" keyProperty="id">
@@ -107,7 +132,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zzkkLevel != null">zzkk_level,</if>
             <if test="inPreference != null">in_preference,</if>
             <if test="shutdownDate != null">shutdown_date,</if>
+            <if test="resistanceValue != null">resistance_value,</if>
+            <if test="resistancePrecision != null">resistance_precision,</if>
+            <if test="resistanceTemperature != null">resistance_temperature,</if>
+            <if test="resistancePower != null">resistance_power,</if>
             <if test="encapsulationMode != null">encapsulation_mode,</if>
+            <if test="capacitanceValue != null">capacitance_value,</if>
+            <if test="capacitanceLoss != null">capacitance_loss,</if>
+            <if test="temperatureCoefficient != null">temperature_coefficient,</if>
+            <if test="ratedVoltage != null">rated_voltage,</if>
+            <if test="inductance != null">inductance,</if>
+            <if test="qualityFactor != null">quality_factor,</if>
+            <if test="dcResistance != null">dc_resistance,</if>
+            <if test="ratedCurrent != null">rated_current,</if>
             <if test="paramIfm != null">param_ifm,</if>
             <if test="paramVrrm != null">param_vrrm,</if>
             <if test="paramIfsm != null">param_ifsm,</if>
@@ -143,7 +180,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zzkkLevel != null">#{zzkkLevel},</if>
             <if test="inPreference != null">#{inPreference},</if>
             <if test="shutdownDate != null">#{shutdownDate},</if>
+            <if test="resistanceValue != null">#{resistanceValue},</if>
+            <if test="resistancePrecision != null">#{resistancePrecision},</if>
+            <if test="resistanceTemperature != null">#{resistanceTemperature},</if>
+            <if test="resistancePower != null">#{resistancePower},</if>
             <if test="encapsulationMode != null">#{encapsulationMode},</if>
+            <if test="capacitanceValue != null">#{capacitanceValue},</if>
+            <if test="capacitanceLoss != null">#{capacitanceLoss},</if>
+            <if test="temperatureCoefficient != null">#{temperatureCoefficient},</if>
+            <if test="ratedVoltage != null">#{ratedVoltage},</if>
+            <if test="inductance != null">#{inductance},</if>
+            <if test="qualityFactor != null">#{qualityFactor},</if>
+            <if test="dcResistance != null">#{dcResistance},</if>
+            <if test="ratedCurrent != null">#{ratedCurrent},</if>
             <if test="paramIfm != null">#{paramIfm},</if>
             <if test="paramVrrm != null">#{paramVrrm},</if>
             <if test="paramIfsm != null">#{paramIfsm},</if>
@@ -183,7 +232,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zzkkLevel != null">zzkk_level = #{zzkkLevel},</if>
             <if test="inPreference != null">in_preference = #{inPreference},</if>
             <if test="shutdownDate != null">shutdown_date = #{shutdownDate},</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>
+            <if test="resistancePower != null">resistance_power = #{resistancePower},</if>
             <if test="encapsulationMode != null">encapsulation_mode = #{encapsulationMode},</if>
+            <if test="capacitanceValue != null">capacitance_value = #{capacitanceValue},</if>
+            <if test="capacitanceLoss != null">capacitance_loss = #{capacitanceLoss},</if>
+            <if test="temperatureCoefficient != null">temperature_coefficient = #{temperatureCoefficient},</if>
+            <if test="ratedVoltage != null">rated_voltage = #{ratedVoltage},</if>
+            <if test="inductance != null">inductance = #{inductance},</if>
+            <if test="qualityFactor != null">quality_factor = #{qualityFactor},</if>
+            <if test="dcResistance != null">dc_resistance = #{dcResistance},</if>
+            <if test="ratedCurrent != null">rated_current = #{ratedCurrent},</if>
             <if test="paramIfm != null">param_ifm = #{paramIfm},</if>
             <if test="paramVrrm != null">param_vrrm = #{paramVrrm},</if>
             <if test="paramIfsm != null">param_ifsm = #{paramIfsm},</if>

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

@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cirs.biz.mapper.TMarkingrecordMapper">
+    
+    <resultMap type="TMarkingrecord" id="TMarkingrecordResult">
+        <result property="id"    column="id"    />
+        <result property="factoryName"    column="factory_name"    />
+        <result property="factor1"    column="factor1"    />
+        <result property="factor2"    column="factor2"    />
+        <result property="factor3"    column="factor3"    />
+        <result property="factor4"    column="factor4"    />
+        <result property="factor5"    column="factor5"    />
+        <result property="factor6"    column="factor6"    />
+        <result property="factor7"    column="factor7"    />
+        <result property="factor8"    column="factor8"    />
+        <result property="factor9"    column="factor9"    />
+        <result property="factor10"    column="factor10"    />
+        <result property="factor11"    column="factor11"    />
+        <result property="factor12"    column="factor12"    />
+        <result property="factor13"    column="factor13"    />
+        <result property="factor14"    column="factor14"    />
+        <result property="factor15"    column="factor15"    />
+        <result property="factor16"    column="factor16"    />
+        <result property="factor17"    column="factor17"    />
+        <result property="factor18"    column="factor18"    />
+        <result property="factor19"    column="factor19"    />
+        <result property="factor20"    column="factor20"    />
+        <result property="factor21"    column="factor21"    />
+        <result property="factor22"    column="factor22"    />
+        <result property="factor23"    column="factor23"    />
+        <result property="factor24"    column="factor24"    />
+        <result property="factor25"    column="factor25"    />
+        <result property="factor26"    column="factor26"    />
+        <result property="factor27"    column="factor27"    />
+        <result property="factor28"    column="factor28"    />
+        <result property="factor29"    column="factor29"    />
+        <result property="factor30"    column="factor30"    />
+        <result property="factor31"    column="factor31"    />
+        <result property="factor32"    column="factor32"    />
+        <result property="factor33"    column="factor33"    />
+        <result property="factor34"    column="factor34"    />
+        <result property="factor35"    column="factor35"    />
+        <result property="factor36"    column="factor36"    />
+        <result property="factor37"    column="factor37"    />
+        <result property="factor38"    column="factor38"    />
+        <result property="factor39"    column="factor39"    />
+        <result property="factor40"    column="factor40"    />
+        <result property="factor41"    column="factor41"    />
+        <result property="factor42"    column="factor42"    />
+        <result property="factor43"    column="factor43"    />
+        <result property="factor44"    column="factor44"    />
+        <result property="finalGrade"    column="final_grade"    />
+    </resultMap>
+
+    <sql id="selectTMarkingrecordVo">
+        select id, factory_name, factor1, factor2, factor3, factor4, factor5, factor6, factor7, factor8, factor9, factor10, factor11, factor12, factor13, factor14, factor15, factor16, factor17, factor18, factor19, factor20, factor21, factor22, factor23, factor24, factor25, factor26, factor27, factor28, factor29, factor30, factor31, factor32, factor33, factor34, factor35, factor36, factor37, factor38, factor39, factor40, factor41, factor42, factor43, factor44, final_grade from t_markingrecord
+    </sql>
+
+    <select id="selectTMarkingrecordList" parameterType="TMarkingrecord" resultMap="TMarkingrecordResult">
+        <include refid="selectTMarkingrecordVo"/>
+        <where>  
+            <if test="factoryName != null  and factoryName != ''"> and factory_name like concat('%', #{factoryName}, '%')</if>
+            <if test="factor1 != null  and factor1 != ''"> and factor1 = #{factor1}</if>
+            <if test="factor2 != null  and factor2 != ''"> and factor2 = #{factor2}</if>
+            <if test="factor3 != null  and factor3 != ''"> and factor3 = #{factor3}</if>
+            <if test="factor4 != null  and factor4 != ''"> and factor4 = #{factor4}</if>
+            <if test="factor5 != null  and factor5 != ''"> and factor5 = #{factor5}</if>
+            <if test="factor6 != null  and factor6 != ''"> and factor6 = #{factor6}</if>
+            <if test="factor7 != null  and factor7 != ''"> and factor7 = #{factor7}</if>
+            <if test="factor8 != null  and factor8 != ''"> and factor8 = #{factor8}</if>
+            <if test="factor9 != null  and factor9 != ''"> and factor9 = #{factor9}</if>
+            <if test="factor10 != null  and factor10 != ''"> and factor10 = #{factor10}</if>
+            <if test="factor11 != null  and factor11 != ''"> and factor11 = #{factor11}</if>
+            <if test="factor12 != null  and factor12 != ''"> and factor12 = #{factor12}</if>
+            <if test="factor13 != null  and factor13 != ''"> and factor13 = #{factor13}</if>
+            <if test="factor14 != null  and factor14 != ''"> and factor14 = #{factor14}</if>
+            <if test="factor15 != null  and factor15 != ''"> and factor15 = #{factor15}</if>
+            <if test="factor16 != null  and factor16 != ''"> and factor16 = #{factor16}</if>
+            <if test="factor17 != null  and factor17 != ''"> and factor17 = #{factor17}</if>
+            <if test="factor18 != null  and factor18 != ''"> and factor18 = #{factor18}</if>
+            <if test="factor19 != null  and factor19 != ''"> and factor19 = #{factor19}</if>
+            <if test="factor20 != null  and factor20 != ''"> and factor20 = #{factor20}</if>
+            <if test="factor21 != null  and factor21 != ''"> and factor21 = #{factor21}</if>
+            <if test="factor22 != null  and factor22 != ''"> and factor22 = #{factor22}</if>
+            <if test="factor23 != null  and factor23 != ''"> and factor23 = #{factor23}</if>
+            <if test="factor24 != null  and factor24 != ''"> and factor24 = #{factor24}</if>
+            <if test="factor25 != null  and factor25 != ''"> and factor25 = #{factor25}</if>
+            <if test="factor26 != null  and factor26 != ''"> and factor26 = #{factor26}</if>
+            <if test="factor27 != null  and factor27 != ''"> and factor27 = #{factor27}</if>
+            <if test="factor28 != null  and factor28 != ''"> and factor28 = #{factor28}</if>
+            <if test="factor29 != null  and factor29 != ''"> and factor29 = #{factor29}</if>
+            <if test="factor30 != null  and factor30 != ''"> and factor30 = #{factor30}</if>
+            <if test="factor31 != null  and factor31 != ''"> and factor31 = #{factor31}</if>
+            <if test="factor32 != null  and factor32 != ''"> and factor32 = #{factor32}</if>
+            <if test="factor33 != null  and factor33 != ''"> and factor33 = #{factor33}</if>
+            <if test="factor34 != null  and factor34 != ''"> and factor34 = #{factor34}</if>
+            <if test="factor35 != null  and factor35 != ''"> and factor35 = #{factor35}</if>
+            <if test="factor36 != null  and factor36 != ''"> and factor36 = #{factor36}</if>
+            <if test="factor37 != null  and factor37 != ''"> and factor37 = #{factor37}</if>
+            <if test="factor38 != null  and factor38 != ''"> and factor38 = #{factor38}</if>
+            <if test="factor39 != null  and factor39 != ''"> and factor39 = #{factor39}</if>
+            <if test="factor40 != null  and factor40 != ''"> and factor40 = #{factor40}</if>
+            <if test="factor41 != null  and factor41 != ''"> and factor41 = #{factor41}</if>
+            <if test="factor42 != null  and factor42 != ''"> and factor42 = #{factor42}</if>
+            <if test="factor43 != null  and factor43 != ''"> and factor43 = #{factor43}</if>
+            <if test="factor44 != null  and factor44 != ''"> and factor44 = #{factor44}</if>
+            <if test="finalGrade != null  and finalGrade != ''"> and final_grade = #{finalGrade}</if>
+        </where>
+    </select>
+    
+    <select id="selectTMarkingrecordById" parameterType="Long" resultMap="TMarkingrecordResult">
+        <include refid="selectTMarkingrecordVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTMarkingrecord" parameterType="TMarkingrecord" useGeneratedKeys="true" keyProperty="id">
+        insert into t_markingrecord
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="factoryName != null">factory_name,</if>
+            <if test="factor1 != null">factor1,</if>
+            <if test="factor2 != null">factor2,</if>
+            <if test="factor3 != null">factor3,</if>
+            <if test="factor4 != null">factor4,</if>
+            <if test="factor5 != null">factor5,</if>
+            <if test="factor6 != null">factor6,</if>
+            <if test="factor7 != null">factor7,</if>
+            <if test="factor8 != null">factor8,</if>
+            <if test="factor9 != null">factor9,</if>
+            <if test="factor10 != null">factor10,</if>
+            <if test="factor11 != null">factor11,</if>
+            <if test="factor12 != null">factor12,</if>
+            <if test="factor13 != null">factor13,</if>
+            <if test="factor14 != null">factor14,</if>
+            <if test="factor15 != null">factor15,</if>
+            <if test="factor16 != null">factor16,</if>
+            <if test="factor17 != null">factor17,</if>
+            <if test="factor18 != null">factor18,</if>
+            <if test="factor19 != null">factor19,</if>
+            <if test="factor20 != null">factor20,</if>
+            <if test="factor21 != null">factor21,</if>
+            <if test="factor22 != null">factor22,</if>
+            <if test="factor23 != null">factor23,</if>
+            <if test="factor24 != null">factor24,</if>
+            <if test="factor25 != null">factor25,</if>
+            <if test="factor26 != null">factor26,</if>
+            <if test="factor27 != null">factor27,</if>
+            <if test="factor28 != null">factor28,</if>
+            <if test="factor29 != null">factor29,</if>
+            <if test="factor30 != null">factor30,</if>
+            <if test="factor31 != null">factor31,</if>
+            <if test="factor32 != null">factor32,</if>
+            <if test="factor33 != null">factor33,</if>
+            <if test="factor34 != null">factor34,</if>
+            <if test="factor35 != null">factor35,</if>
+            <if test="factor36 != null">factor36,</if>
+            <if test="factor37 != null">factor37,</if>
+            <if test="factor38 != null">factor38,</if>
+            <if test="factor39 != null">factor39,</if>
+            <if test="factor40 != null">factor40,</if>
+            <if test="factor41 != null">factor41,</if>
+            <if test="factor42 != null">factor42,</if>
+            <if test="factor43 != null">factor43,</if>
+            <if test="factor44 != null">factor44,</if>
+            <if test="finalGrade != null">final_grade,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="factoryName != null">#{factoryName},</if>
+            <if test="factor1 != null">#{factor1},</if>
+            <if test="factor2 != null">#{factor2},</if>
+            <if test="factor3 != null">#{factor3},</if>
+            <if test="factor4 != null">#{factor4},</if>
+            <if test="factor5 != null">#{factor5},</if>
+            <if test="factor6 != null">#{factor6},</if>
+            <if test="factor7 != null">#{factor7},</if>
+            <if test="factor8 != null">#{factor8},</if>
+            <if test="factor9 != null">#{factor9},</if>
+            <if test="factor10 != null">#{factor10},</if>
+            <if test="factor11 != null">#{factor11},</if>
+            <if test="factor12 != null">#{factor12},</if>
+            <if test="factor13 != null">#{factor13},</if>
+            <if test="factor14 != null">#{factor14},</if>
+            <if test="factor15 != null">#{factor15},</if>
+            <if test="factor16 != null">#{factor16},</if>
+            <if test="factor17 != null">#{factor17},</if>
+            <if test="factor18 != null">#{factor18},</if>
+            <if test="factor19 != null">#{factor19},</if>
+            <if test="factor20 != null">#{factor20},</if>
+            <if test="factor21 != null">#{factor21},</if>
+            <if test="factor22 != null">#{factor22},</if>
+            <if test="factor23 != null">#{factor23},</if>
+            <if test="factor24 != null">#{factor24},</if>
+            <if test="factor25 != null">#{factor25},</if>
+            <if test="factor26 != null">#{factor26},</if>
+            <if test="factor27 != null">#{factor27},</if>
+            <if test="factor28 != null">#{factor28},</if>
+            <if test="factor29 != null">#{factor29},</if>
+            <if test="factor30 != null">#{factor30},</if>
+            <if test="factor31 != null">#{factor31},</if>
+            <if test="factor32 != null">#{factor32},</if>
+            <if test="factor33 != null">#{factor33},</if>
+            <if test="factor34 != null">#{factor34},</if>
+            <if test="factor35 != null">#{factor35},</if>
+            <if test="factor36 != null">#{factor36},</if>
+            <if test="factor37 != null">#{factor37},</if>
+            <if test="factor38 != null">#{factor38},</if>
+            <if test="factor39 != null">#{factor39},</if>
+            <if test="factor40 != null">#{factor40},</if>
+            <if test="factor41 != null">#{factor41},</if>
+            <if test="factor42 != null">#{factor42},</if>
+            <if test="factor43 != null">#{factor43},</if>
+            <if test="factor44 != null">#{factor44},</if>
+            <if test="finalGrade != null">#{finalGrade},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTMarkingrecord" parameterType="TMarkingrecord">
+        update t_markingrecord
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="factoryName != null">factory_name = #{factoryName},</if>
+            <if test="factor1 != null">factor1 = #{factor1},</if>
+            <if test="factor2 != null">factor2 = #{factor2},</if>
+            <if test="factor3 != null">factor3 = #{factor3},</if>
+            <if test="factor4 != null">factor4 = #{factor4},</if>
+            <if test="factor5 != null">factor5 = #{factor5},</if>
+            <if test="factor6 != null">factor6 = #{factor6},</if>
+            <if test="factor7 != null">factor7 = #{factor7},</if>
+            <if test="factor8 != null">factor8 = #{factor8},</if>
+            <if test="factor9 != null">factor9 = #{factor9},</if>
+            <if test="factor10 != null">factor10 = #{factor10},</if>
+            <if test="factor11 != null">factor11 = #{factor11},</if>
+            <if test="factor12 != null">factor12 = #{factor12},</if>
+            <if test="factor13 != null">factor13 = #{factor13},</if>
+            <if test="factor14 != null">factor14 = #{factor14},</if>
+            <if test="factor15 != null">factor15 = #{factor15},</if>
+            <if test="factor16 != null">factor16 = #{factor16},</if>
+            <if test="factor17 != null">factor17 = #{factor17},</if>
+            <if test="factor18 != null">factor18 = #{factor18},</if>
+            <if test="factor19 != null">factor19 = #{factor19},</if>
+            <if test="factor20 != null">factor20 = #{factor20},</if>
+            <if test="factor21 != null">factor21 = #{factor21},</if>
+            <if test="factor22 != null">factor22 = #{factor22},</if>
+            <if test="factor23 != null">factor23 = #{factor23},</if>
+            <if test="factor24 != null">factor24 = #{factor24},</if>
+            <if test="factor25 != null">factor25 = #{factor25},</if>
+            <if test="factor26 != null">factor26 = #{factor26},</if>
+            <if test="factor27 != null">factor27 = #{factor27},</if>
+            <if test="factor28 != null">factor28 = #{factor28},</if>
+            <if test="factor29 != null">factor29 = #{factor29},</if>
+            <if test="factor30 != null">factor30 = #{factor30},</if>
+            <if test="factor31 != null">factor31 = #{factor31},</if>
+            <if test="factor32 != null">factor32 = #{factor32},</if>
+            <if test="factor33 != null">factor33 = #{factor33},</if>
+            <if test="factor34 != null">factor34 = #{factor34},</if>
+            <if test="factor35 != null">factor35 = #{factor35},</if>
+            <if test="factor36 != null">factor36 = #{factor36},</if>
+            <if test="factor37 != null">factor37 = #{factor37},</if>
+            <if test="factor38 != null">factor38 = #{factor38},</if>
+            <if test="factor39 != null">factor39 = #{factor39},</if>
+            <if test="factor40 != null">factor40 = #{factor40},</if>
+            <if test="factor41 != null">factor41 = #{factor41},</if>
+            <if test="factor42 != null">factor42 = #{factor42},</if>
+            <if test="factor43 != null">factor43 = #{factor43},</if>
+            <if test="factor44 != null">factor44 = #{factor44},</if>
+            <if test="finalGrade != null">final_grade = #{finalGrade},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTMarkingrecordById" parameterType="Long">
+        delete from t_markingrecord where id = #{id}
+    </delete>
+
+    <delete id="deleteTMarkingrecordByIds" parameterType="String">
+        delete from t_markingrecord where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -126,7 +126,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTVerificationScoreaskDetailByTaskIds" resultMap="TVerificationScoretaskDetailResult">
         <include refid="selectTVerificationScoretaskDetailVo"/>
-        where task_id in
+        where tested=1 AND task_id in
+        <foreach item="item" collection="taskids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="selectTrainDetailByTaskIds" resultMap="TVerificationScoretaskDetailResult">
+        <include refid="selectTVerificationScoretaskDetailVo"/>
+        where trained=1 AND task_id in
         <foreach item="item" collection="taskids" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -287,6 +294,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="factor44 != null">factor44 = #{factor44},</if>
             <if test="finalGrade != null">final_grade = #{finalGrade},</if>
             <if test="calculatedGrade != null">calculated_grade = #{calculatedGrade},</if>
+            <if test="trained != null">trained = #{trained},</if>
+            <if test="tested != null">tested = #{tested}</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTVerificationTaskDetailByTaskIds"
             resultType="com.cirs.biz.domain.TVerificationTaskDetail" resultMap="TVerificationTaskDetailResult">
         select task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3,calculate4,calculate5, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
-            where task_id in
+            where tested = 1 AND task_id in
         <foreach item="item" collection="taskids" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -115,9 +115,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LIMIT 1
     </select>
     <select id="getComponentids" resultMap="VerificationData">
-        select id,use_scene, search_condition, result1_id, result2_id, result3_id, result4_id, result5_id,calculate1_id,calculate2_id,calculate3_id,calculate4_id,calculate5_id,trained,tested from t_verification_task_detail
+        select id,use_scene, search_condition, result1_id, result2_id, result3_id, result4_id, result5_id from t_verification_task_detail
             where task_id = #{taskid}
     </select>
+    <select id="selectTrainDetailByTaskIds" resultType="com.cirs.biz.domain.TVerificationTaskDetail" resultMap="TVerificationTaskDetailResult">
+        select task_id, use_scene,search_condition, result1, result2, result3, result4, result5, calculate1, calculate2, calculate3,calculate4,calculate5, create_by, create_time, update_by, update_time, remark from t_verification_task_detail
+        where trained = 1 AND task_id in
+        <foreach item="item" collection="taskids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 
     <insert id="insertTVerificationTaskDetail" parameterType="TVerificationTaskDetail" useGeneratedKeys="true" keyProperty="id">
         insert into t_verification_task_detail

cirs-ui/src/api/biz/detail.js

@@ -50,13 +50,7 @@ export function verification(taskid) {
     params: { taskid: taskid }
   })
 }
-export function getTraindataset(query){
-  return request({
-    url:'/biz/train/list',
-    method:'get',
-    params: query
-  })
-}
+
 
 // 更新验证任务详情
 export function updateDetails(dataset) {
@@ -76,3 +70,12 @@ export function getUpdatedDetails(taskids,pageNum,pageSize){
     data: taskids,
   })
 }
+
+export function getTraindataset(taskids,pageNum,pageSize){
+  return request({
+    url:`/biz/detail/getTraindataset?pageNum=${pageNum}&pageSize=${pageSize}`,
+    method:'post',
+    data: taskids,
+  })
+}
+

cirs-ui/src/api/biz/markingrecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询打分记录列表
+export function listMarkingrecord(query) {
+  return request({
+    url: '/biz/markingrecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询打分记录详细
+export function getMarkingrecord(id) {
+  return request({
+    url: '/biz/markingrecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增打分记录
+export function addMarkingrecord(data) {
+  return request({
+    url: '/biz/markingrecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改打分记录
+export function updateMarkingrecord(data) {
+  return request({
+    url: '/biz/markingrecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除打分记录
+export function delMarkingrecord(id) {
+  return request({
+    url: '/biz/markingrecord/' + id,
+    method: 'delete'
+  })
+}

cirs-ui/src/api/biz/scoretask.js

@@ -50,14 +50,14 @@ export function verification(taskid) {
     params: { taskid: taskid }
   })
 }
-export function getTraindataset(scorequery){
+
+export function getTraindataset(taskids,pageNum,pageSize){
   return request({
-    url:'/biz/score/list',
-    method:'get',
-    params: scorequery
+    url:`/biz/scoretaskdetail/getTraindataset?pageNum=${pageNum}&pageSize=${pageSize}`,
+    method:'post',
+    data: taskids,
   })
 }
-
 // 更新验证任务详情
 export function updateDetails(dataset) {
   return request({

cirs-ui/src/api/biz/train.js

@@ -43,7 +43,7 @@ export function delTrain(id) {
   })
 }
 
-//由 元器件名称-型号规格-质量等级 得到元器件的id
+//由 型号规格-质量等级-元器件名称 得到元器件的id
 export function getComponentIds() {
   return request({
     url: '/biz/train/componentIds',

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

@@ -449,9 +449,48 @@
             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="resistanceValue">
+          <el-input v-model="form.resistanceValue" placeholder="请输入阻值" />
+        </el-form-item>
+        <el-form-item label="精度" prop="resistancePrecision">
+          <el-input v-model="form.resistancePrecision" placeholder="请输入精度" />
+        </el-form-item>
+        <el-form-item label="电阻温度特性" prop="resistanceTemperature">
+          <el-input v-model="form.resistanceTemperature" placeholder="请输入电阻温度特性" />
+        </el-form-item>
+        <el-form-item label="功耗" prop="resistancePower">
+          <el-input v-model="form.resistancePower" placeholder="请输入功耗" />
+        </el-form-item>
         <el-form-item label="封装形式" prop="encapsulationMode">
           <el-input v-model="form.encapsulationMode" placeholder="请输入封装形式" />
         </el-form-item>
+        <el-form-item label="电容量Cp" prop="capacitanceValue">
+          <el-input v-model="form.capacitanceValue" placeholder="请输入电容量Cp" />
+        </el-form-item>
+        <el-form-item label="损耗DF" prop="capacitanceLoss">
+          <el-input v-model="form.capacitanceLoss" placeholder="请输入损耗DF" />
+        </el-form-item>
+        <el-form-item label="温度系数" prop="temperatureCoefficient">
+          <el-input v-model="form.temperatureCoefficient" placeholder="请输入温度系数" />
+        </el-form-item>
+        <el-form-item label="额定电压WVDC" prop="ratedVoltage">
+          <el-input v-model="form.ratedVoltage" placeholder="请输入额定电压WVDC" />
+        </el-form-item>
+        <el-form-item label="电感量" prop="inductance">
+          <el-input v-model="form.inductance" placeholder="请输入电感量" />
+        </el-form-item>
+        <el-form-item label="品质因数Qmin" prop="qualityFactor">
+          <el-input v-model="form.qualityFactor" placeholder="请输入品质因数Qmin" />
+        </el-form-item>
+        <el-form-item label="直流电阻" prop="dcResistance">
+          <el-input v-model="form.dcResistance" placeholder="请输入直流电阻" />
+        </el-form-item>
+        <el-form-item label="额定电流" prop="ratedCurrent">
+          <el-input v-model="form.ratedCurrent" placeholder="请输入额定电流" />
+        </el-form-item>
         <el-form-item label="最大正向电流IFM（mA）" prop="paramIfm">
           <el-input v-model="form.paramIfm" placeholder="请输入最大正向电流IFM" />
         </el-form-item>
@@ -662,7 +701,19 @@ export default {
         zzkkLevel: null,
         inPreference: null,
         shutdownDate: 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,
@@ -786,3 +837,13 @@ export default {
   }
 };
 </script>
+<style>
+
+.el-checkbox__inner {
+  border-color: #8492a6 !important;
+}
+.app-container {
+  min-height: 100vh;
+  background: radial-gradient(circle at 10% 20%, #3A71A8 0%, rgb(239, 249, 249) 90%);
+}
+</style>

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

@@ -1,7 +1,57 @@
 <template>
   <div class="app-container">
-<!--    输入-->
-    <el-dialog title="输入打分要素" :visible.sync="open" width="580px" append-to-body>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['biz:markingrecord:add']"
+        >新增打分记录</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biz:markingrecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biz:markingrecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['biz:markingrecord:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="mini" @click="getmarking_result">打分</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <!--    新增-->
+    <el-dialog title="新增" :visible.sync="open" width="580px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="550px" label-position="top">
         <el-form-item label="厂家名称" prop="factoryName">
           <el-input v-model="form.factoryName" placeholder="请输入厂家名称" />
@@ -406,19 +456,14 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="getmarking_result">打 分</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
-    <div style="padding-bottom: 8px">
-
-    <span>
-      <el-button type="info" @click="open=true" >输入打分评级要素</el-button>
 
-    </span>
-    </div>
-    <el-table v-loading="loading" :data="List">
+    <el-table v-loading="loading" :data="List" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="最终等级" align="center" prop="finalGrade" />
       <el-table-column label="厂家名称" align="center" prop="factoryName"  />
       <el-table-column label="生产线运行情况良好" align="center" prop="factor1" width="140"/>
@@ -465,25 +510,42 @@
       <el-table-column label="经济性好，企业能够持续获利" align="center" prop="factor42" width="250"/>
       <el-table-column label="和供应链各节点单位之间建立了良好的信息沟通机制，能有效沟通信息，协调解决问题" align="center" prop="factor43" width="514"/>
       <el-table-column label="产品推广应用情况良好，市场认可度高，客户满意度高" align="center" prop="factor44" width="340"/>
-
+      <el-table-column label="操作" align="center" width="140" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['biz:markingrecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['biz:markingrecord:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
-    <el-dialog
-      title="推荐"
-      :visible.sync="dialogVisible"
-      width="20%"
-      style="top:225px"
+<!--    <el-dialog-->
+<!--      title="推荐"-->
+<!--      :visible.sync="dialogVisible"-->
+<!--      width="20%"-->
+<!--      style="top:225px"-->
 
-    >
-      <div  align="center">
-        <el-progress
-          type="circle"
-          :percentage="Progress"
-          width="80"
-          :status="progressStatus"
-        ></el-progress>
-      </div>
-    </el-dialog>
+<!--    >-->
+<!--      <div  align="center">-->
+<!--        <el-progress-->
+<!--          type="circle"-->
+<!--          :percentage="Progress"-->
+<!--          width="80"-->
+<!--          :status="progressStatus"-->
+<!--        ></el-progress>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
 
 
 
@@ -494,6 +556,7 @@
 <script>
 
 import { marking } from "@/api/biz/score";
+import { listMarkingrecord, getMarkingrecord, delMarkingrecord, addMarkingrecord, updateMarkingrecord } from "@/api/biz/markingrecord";
 export default {
   name: "recommend",
   data() {
@@ -537,20 +600,40 @@ export default {
 
     };
   },
+  created() {
+    this.getList();
+  },
   computed: {
     progressStatus() {
       return this.Progress === 100 ? 'success' : '';
     },
   },
   methods: {
+    /** 查询打分记录列表 */
+    getList() {
+      this.loading = true;
+      listMarkingrecord(this.queryParams).then(response => {
+        this.List = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
     getmarking_result(){
-      this.open = false
-      //调用打分算法
-      this.List = []
+      if(this.ids.length===0){
+        this.$modal.msg("请先选中需要打分的记录")
+        return ;
+      }
+      if(this.ids.length>1){
+        this.$modal.msg("不能一次选中多个！")
+        return ;
+      }
       let result;
+      getMarkingrecord(this.ids[0]).then(response=>{
+        this.form = response.data
+        console.log(this.form)
         marking(this.form).then(res=>{
           result = res
-          if(res.code===200) {
+          if(res.code===200&&JSON.parse(res.data).code===200) {
             this.form = JSON.parse(res.data).data
             this.form.finalGrade = 'A'
             // console.log(this.form)
@@ -562,34 +645,99 @@ export default {
 
 
           } else {
-            this.$modal.msgError(res.msg)
+            this.$modal.msgError("调用打分算法失败")
           }
 
 
         })
+      })
 
-      // 模拟进度变化，每0.0.5秒更新一次，共更新100次
-      this.dialogVisible = true
-
-      const intervalId = setInterval(() => {
-
-        this.Progress++;
-        // 如果进度达到100%，清除定时器
-        if (this.Progress >= 100) {
-          this.Progress = 0
-          clearInterval(intervalId);
-          this.dialogVisible = false
-
-          if(result.code===200){
-            this.getList()
-            this.$modal.msgSuccess("调用打分算法成功")
-          }
 
-          else {
-            this.$modal.msgError(result.msg);
+      // 模拟进度变化，每0.0.5秒更新一次，共更新100次
+      // this.dialogVisible = true
+      //
+      // const intervalId = setInterval(() => {
+      //
+      //   this.Progress++;
+      //   // 如果进度达到100%，清除定时器
+      //   if (this.Progress >= 100) {
+      //     this.Progress = 0
+      //     clearInterval(intervalId);
+      //     this.dialogVisible = false
+      //
+      //     if(result.code===200){
+      //       this.getList()
+      //       this.$modal.msgSuccess("调用打分算法成功")
+      //     }
+      //
+      //     else {
+      //       this.$modal.msgError(result.msg);
+      //     }
+      //   }
+      // }, 50);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加打分记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMarkingrecord(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改打分记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMarkingrecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMarkingrecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      }, 50);
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除打分记录编号为"' + ids + '"的数据项？').then(function() {
+        return delMarkingrecord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('biz/markingrecord/export', {
+        ...this.queryParams
+      }, `markingrecord_${new Date().getTime()}.xlsx`)
     },
 
 

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

@@ -25,9 +25,9 @@
           {{ scope.row.applications }}
         </template>
       </el-table-column>
-      <el-table-column label="相关推荐" align="center" :show-overflow-tooltip="true">
-        <span>1,2,3...</span>
-      </el-table-column>
+<!--      <el-table-column label="相关推荐" align="center" :show-overflow-tooltip="true">-->
+<!--        <span>1,2,3...</span>-->
+<!--      </el-table-column>-->
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -80,99 +80,135 @@
       <el-form  style="border:1px solid #C0C0C0;padding: 5px;margin: auto" ref="form" :model="form" :rules="rules" label-width="200px">
         <h2><b>元器件基本信息</b></h2>
         <el-form-item label="元器件名称" prop="componentName">
-          <el-input v-model="form.componentName" readonly='true' />
+          <el-input v-model="form.componentName" readonly />
         </el-form-item>
         <el-form-item label="生产厂家" prop="manufacturer">
-          <el-input v-model="form.manufacturer" readonly='true' />
+          <el-input v-model="form.manufacturer" readonly />
         </el-form-item>
         <el-form-item label="型号规格" prop="componentModel">
-          <el-input v-model="form.componentModel" readonly='true' />
+          <el-input v-model="form.componentModel" readonly />
         </el-form-item>
         <el-form-item label="国产替代型号" prop="replaceDomesticModel">
-          <el-input v-model="form.replaceDomesticModel" readonly='true' />
+          <el-input v-model="form.replaceDomesticModel" readonly />
         </el-form-item>
         <el-form-item label="质量等级" prop="qualityGrade">
-          <el-input v-model="form.qualityGrade" readonly='true' />
+          <el-input v-model="form.qualityGrade" readonly />
         </el-form-item>
         <el-form-item label="供货周期" prop="deliveryCycle">
-          <el-input v-model="form.deliveryCycle" readonly='true' />
+          <el-input v-model="form.deliveryCycle" readonly />
         </el-form-item>
-        <el-form-item label="供货量(个/年）" prop="supplyQuantity">
-          <el-input v-model="form.supplyQuantity" readonly='true' />
+        <el-form-item label="供货量（个/年）" prop="supplyQuantity">
+          <el-input v-model="form.supplyQuantity" readonly />
         </el-form-item>
         <el-form-item label="价格" prop="unitPrice">
-          <el-input v-model="form.unitPrice" readonly='true' />
+          <el-input v-model="form.unitPrice" readonly />
         </el-form-item>
         <el-form-item label="ZZKK等级" prop="zzkkLevel">
-          <el-input v-model="form.zzkkLevel" readonly='true' />
+          <el-input v-model="form.zzkkLevel" readonly />
         </el-form-item>
         <el-form-item label="是否在优选目录内" prop="inPreference">
-          <el-input v-model="form.inPreference" readonly='true' />
+          <el-input v-model="form.inPreference" readonly />
         </el-form-item>
         <el-form-item label="停产断档日期" prop="shutdownDate">
           <el-date-picker clearable
                           v-model="form.shutdownDate"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          readonly='true'>
+                          readonly>
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="阻值" prop="resistanceValue">
+          <el-input v-model="form.resistanceValue" readonly />
+        </el-form-item>
+        <el-form-item label="精度" prop="resistancePrecision">
+          <el-input v-model="form.resistancePrecision" readonly />
+        </el-form-item>
+        <el-form-item label="电阻温度特性" prop="resistanceTemperature">
+          <el-input v-model="form.resistanceTemperature" readonly />
+        </el-form-item>
+        <el-form-item label="功耗" prop="resistancePower">
+          <el-input v-model="form.resistancePower" readonly />
+        </el-form-item>
         <el-form-item label="封装形式" prop="encapsulationMode">
-          <el-input v-model="form.encapsulationMode" readonly='true' />
+          <el-input v-model="form.encapsulationMode" readonly />
+        </el-form-item>
+        <el-form-item label="电容量Cp" prop="capacitanceValue">
+          <el-input v-model="form.capacitanceValue" readonly />
+        </el-form-item>
+        <el-form-item label="损耗DF" prop="capacitanceLoss">
+          <el-input v-model="form.capacitanceLoss" readonly />
+        </el-form-item>
+        <el-form-item label="温度系数" prop="temperatureCoefficient">
+          <el-input v-model="form.temperatureCoefficient" readonly />
+        </el-form-item>
+        <el-form-item label="额定电压WVDC" prop="ratedVoltage">
+          <el-input v-model="form.ratedVoltage" readonly />
+        </el-form-item>
+        <el-form-item label="电感量" prop="inductance">
+          <el-input v-model="form.inductance" readonly />
+        </el-form-item>
+        <el-form-item label="品质因数Qmin" prop="qualityFactor">
+          <el-input v-model="form.qualityFactor" readonly />
+        </el-form-item>
+        <el-form-item label="直流电阻" prop="dcResistance">
+          <el-input v-model="form.dcResistance" readonly />
+        </el-form-item>
+        <el-form-item label="额定电流" prop="ratedCurrent">
+          <el-input v-model="form.ratedCurrent" readonly />
         </el-form-item>
         <el-form-item label="最大正向电流IFM" prop="paramIfm" v-if="form.paramIfm!==null && form.paramIfm!==''">
-          <el-input v-model="form.paramIfm" readonly='true' />
+          <el-input v-model="form.paramIfm" readonly />
         </el-form-item>
         <el-form-item label="最大反向工作电压VRRM" prop="paramVrrm" v-if="form.paramVrrm!==null && form.paramVrrm!==''">
-          <el-input v-model="form.paramVrrm" readonly='true' />
+          <el-input v-model="form.paramVrrm" readonly />
         </el-form-item>
         <el-form-item label="最大浪涌电流IFSM" prop="paramIfsm" v-if="form.paramIfsm!==null && form.paramIfsm!==''">
-          <el-input v-model="form.paramIfsm" readonly='true' />
+          <el-input v-model="form.paramIfsm" readonly />
         </el-form-item>
         <el-form-item label="稳压状态下的动态电阻ZZ" prop="paramZz" v-if="form.paramZz!==null && form.paramZz!==''">
-          <el-input v-model="form.paramZz" readonly='true' />
+          <el-input v-model="form.paramZz" readonly />
         </el-form-item>
         <el-form-item label="最大额定功率PCM" prop="paramPcm" v-if="form.paramPcm!==null && form.paramPcm!==''">
-          <el-input v-model="form.paramPcm" readonly='true' />
+          <el-input v-model="form.paramPcm" readonly />
         </el-form-item>
         <el-form-item label="最大集电极电流ICM" prop="paramIcm" v-if="form.paramIcm!==null && form.paramIcm!==''">
-          <el-input v-model="form.paramIcm" readonly='true' />
+          <el-input v-model="form.paramIcm" readonly />
         </el-form-item>
         <el-form-item label="最大集电极-基极电压VCBO" prop="paramVcbo" v-if="form.paramVcbo!==null && form.paramVcbo!==''">
-          <el-input v-model="form.paramVcbo" readonly='true' />
+          <el-input v-model="form.paramVcbo" readonly />
         </el-form-item>
         <el-form-item label="集电极-发射极电压VCEO" prop="paramVceo" v-if="form.paramVceo!==null && form.paramVceo!==''">
-          <el-input v-model="form.paramVceo" readonly='true' />
+          <el-input v-model="form.paramVceo" readonly />
         </el-form-item>
         <el-form-item label="发射极-基极电压VEBO" prop="paramVebo" v-if="form.paramVebo!==null && form.paramVebo!==''">
-          <el-input v-model="form.paramVebo" readonly='true' />
+          <el-input v-model="form.paramVebo" readonly />
         </el-form-item>
         <el-form-item label="漏源电压VDSS" prop="paramVdss" v-if="form.paramVdss!==null && form.paramVdss!==''">
-          <el-input v-model="form.paramVdss" readonly='true' />
+          <el-input v-model="form.paramVdss" readonly />
         </el-form-item>
         <el-form-item label="漏极直流电流ID" prop="paramId" v-if="form.paramId!==null && form.paramId!==''">
-          <el-input v-model="form.paramId" readonly='true' />
+          <el-input v-model="form.paramId" readonly />
         </el-form-item>
         <el-form-item label="漏-源通态电阻RDS(on)" prop="paramRdsOn" v-if="form.paramRdsOn!==null && form.paramRdsOn!==''">
-          <el-input v-model="form.paramRdsOn" readonly='true' />
+          <el-input v-model="form.paramRdsOn" readonly />
         </el-form-item>
         <el-form-item label="抗静电能力" prop="antistaticCapacity">
-          <el-input v-model="form.antistaticCapacity" readonly='true' />
+          <el-input v-model="form.antistaticCapacity" readonly />
         </el-form-item>
         <el-form-item label="抗辐照能力" prop="radiationResistance">
-          <el-input v-model="form.radiationResistance" readonly='true' />
+          <el-input v-model="form.radiationResistance" readonly />
         </el-form-item>
         <el-form-item label="材料" prop="materials">
-          <el-input v-model="form.materials" type="textarea" readonly='true'/>
+          <el-input v-model="form.materials" type="textarea" readonly/>
         </el-form-item>
         <el-form-item label="工艺" prop="craft">
-          <el-input v-model="form.craft" type="textarea" readonly='true' />
+          <el-input v-model="form.craft" type="textarea" readonly />
         </el-form-item>
         <el-form-item label="重量" prop="weight">
-          <el-input v-model="form.weight" readonly='true' />
+          <el-input v-model="form.weight" readonly />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" readonly='true' />
+          <el-input v-model="form.remark" type="textarea" readonly />
         </el-form-item>
       </el-form>
 
@@ -184,22 +220,22 @@
 
     </el-dialog>
 
-    <el-dialog
-      title="推荐"
-      :visible.sync="dialogVisible"
-      width="20%"
-      style="top:225px"
-
-    >
-      <div  align="center">
-        <el-progress
-          type="circle"
-          :percentage="Progress"
-          width="80"
-          :status="progressStatus"
-        ></el-progress>
-      </div>
-    </el-dialog>
+<!--    <el-dialog-->
+<!--      title="推荐"-->
+<!--      :visible.sync="dialogVisible"-->
+<!--      width="20%"-->
+<!--      style="top:225px"-->
+
+<!--    >-->
+<!--      <div  align="center">-->
+<!--        <el-progress-->
+<!--          type="circle"-->
+<!--          :percentage="Progress"-->
+<!--          width="80"-->
+<!--          :status="progressStatus"-->
+<!--        ></el-progress>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
@@ -233,7 +269,7 @@ export default {
       // 是否显示弹出层
       open: false,
       searchCondition:'',
-      // 查询参数  元器件规格 元器件名称 国产替代型号 元器件应用 相关推荐 操作
+      // 查询参数  元器件规格 元器件名称 国产替代型号 元器件应用 操作
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -327,22 +363,20 @@ export default {
     recommend() {
       this.recommmend_args.useScene = this.use_scene
       this.recommmend_args.searchCondition = this.searchCondition
-      let result;
+
       recommend(this.recommmend_args).then(res=>{
-        result = res;
-        if(res.code===200) {
+        // console.log(res.code)
+        if(res.code===200&&JSON.parse(res.data).code===200) {
           this.recommmend_args = JSON.parse(res.data).data
-          console.log(this.recommmend_args)
+          // console.log(this.recommmend_args)
           // this.queryParams.result1Id = 53
           this.queryParams.result1Id = this.recommmend_args.result1Id
           this.queryParams.result2Id = this.recommmend_args.result2Id
           this.queryParams.result3Id = this.recommmend_args.result3Id
           this.queryParams.result4Id = this.recommmend_args.result4Id
           this.queryParams.result5Id = this.recommmend_args.result5Id
-
-          // this.$modal.msgSuccess("调用推荐算法成功")
-
-
+          this.getList()
+          this.$modal.msgSuccess("调用推荐算法成功")
 
 
         } else {
@@ -351,28 +385,28 @@ export default {
 
       })
 
-      // 模拟进度变化，每0.0.5秒更新一次，共更新100次
-      this.dialogVisible = true
-
-      const intervalId = setInterval(() => {
-
-        this.Progress++;
-        // 如果进度达到100%，清除定时器
-        if (this.Progress >= 100) {
-          this.Progress = 0
-          clearInterval(intervalId);
-          this.dialogVisible = false
-
-          if(result.code===200){
-            this.getList()
-            this.$modal.msgSuccess("调用推荐算法成功")
-          }
-
-          else {
-            this.$modal.msgError(result.msg);
-          }
-        }
-      }, 50);
+      // // 模拟进度变化，每0.0.5秒更新一次，共更新100次
+      // this.dialogVisible = true
+      //
+      // const intervalId = setInterval(() => {
+      //
+      //   this.Progress++;
+      //   // 如果进度达到100%，清除定时器
+      //   if (this.Progress >= 100) {
+      //     this.Progress = 0
+      //     clearInterval(intervalId);
+      //     this.dialogVisible = false
+      //
+      //     if(result.code===200){
+      //       this.getList()
+      //       this.$modal.msgSuccess("调用推荐算法成功")
+      //     }
+      //
+      //     else {
+      //       this.$modal.msgError(result.msg);
+      //     }
+      //   }
+      // }, 50);
 
     },
     /** 查询元器件列表 */

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

@@ -747,10 +747,10 @@ export default {
           clearInterval(intervalId);
           this.dialogVisible = false
 
-          if(result.code===200)
+          if(result.code===200&&JSON.parse(result.data).code===200)
             this.$modal.msgSuccess(result.msg);
           else {
-            this.$modal.msgError(result.msg);
+            this.$modal.msgError("训练失败");
           }
         }
       }, 100);

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

@@ -262,8 +262,8 @@
       <pagination
         v-show="ttotal>0"
         :total="ttotal"
-        :page.sync="scorequery.pageNum"
-        :limit.sync="scorequery.pageSize"
+        :page.sync="tpageNum"
+        :limit.sync="tpageSize"
         @pagination="gettraindata"
       />
     </el-dialog>
@@ -358,7 +358,8 @@ import { getToken } from "@/utils/auth";
 import {Loading, Message} from "element-ui";
 import service from "../../../utils/request";
 import errorCode from "../../../utils/errorCode";
-import {updateTask} from "../../../api/biz/task";
+
+
 
 export default {
   name: "Scoretask",
@@ -432,10 +433,10 @@ export default {
       taskidToIndexMap: new Map(),
       verificationtabledata:[],
       progressStatus:'',
-      scorequery :{
-        pageNum: 1,
-        pageSize: 10,
-      },
+
+      tpageNum: 1,
+      tpageSize: 10,
+
 
     };
   },
@@ -445,13 +446,18 @@ export default {
   methods: {
     gettraindata(){
 
-      getTraindataset(this.scorequery).then(res=>{
+      if(this.ids.length===0){
+        this.$modal.msg("请先选择查看的任务！")
+        return
+      }
+
+      getTraindataset(this.ids, this.tpageNum, this.tpageSize ).then(res=>{
         this.traindatavisible = true
         // console.log(res)
 
         this.tloading = false
         this.ttotal = res.total;
-        this.traindataset = res.rows
+        this.traindataset = res.list
 
 
       })
@@ -499,8 +505,8 @@ export default {
           this.ProgressMap[index] = 0;
           verification(taskid).then(res => {
             console.log(res);
-            code = res.code;
-            if (res.code === 200) {
+            code = JSON.parse(res.data).code;
+            if (res.code === 200&&code===200) {
               this.verificationdataset = JSON.parse(res.data).dataSet;
               //更新任务详情表
               updateDetails(this.verificationdataset).then(res1=>{

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

@@ -306,8 +306,8 @@
       <pagination
         v-show="ttotal>0"
         :total="ttotal"
-        :page.sync="query.pageNum"
-        :limit.sync="query.pageSize"
+        :page.sync="tpageNum"
+        :limit.sync="tpageSize"
         @pagination="gettraindata"
       />
     </el-dialog>
@@ -370,8 +370,9 @@ import { getToken } from "@/utils/auth";
 import {Loading, Message} from "element-ui";
 import service from "../../../utils/request";
 import errorCode from "../../../utils/errorCode";
-import dayjs from "dayjs";
-import {updateDetail} from "../../../api/biz/detail";
+
+// import {updateDetail} from "../../../api/biz/detail";
+
 export default {
   name: "Task",
   data() {
@@ -442,10 +443,10 @@ export default {
       taskidToIndexMap: new Map(),
       verificationtabledata:[],
       progressStatus:'',
-      query :{
-        pageNum: 1,
-        pageSize: 10,
-      },
+
+      tpageNum: 1,
+      tpageSize: 10,
+
       vpageNum:1,
       vpageSize:10,
     };
@@ -463,13 +464,18 @@ export default {
 
 
     gettraindata(){
-      getTraindataset(this.query).then(res=>{
+
+      if(this.ids.length===0){
+        this.$modal.msg("请先选择查看的任务！")
+        return
+      }
+      getTraindataset(this.ids, this.tpageNum, this.tpageSize ).then(res=>{
         this.traindatavisible = true
         // console.log(res)
 
           this.tloading = false
           this.ttotal = res.total;
-          this.traindataset = res.rows
+          this.traindataset = res.list
 
 
       })
@@ -518,14 +524,19 @@ export default {
           let code = 0;
           this.ProgressMap[index] = 0;
           verification(taskid).then(res => {
+
+
+            console.log(res.data)
+            console.log(JSON.parse(res.data))
             let result = JSON.parse(res.data).data
-            code = res.code;
-            if (res.code === 200) {
-              this.verificationdataset = result.dataSet;
+            code = JSON.parse(res.data).code;
+            if (res.code === 200&&code===200) {
 
+              this.verificationdataset = result.dataSet;
+              console.log(this.verificationdataset)
               //更新任务详情表
               updateDetails(this.verificationdataset).then(res1=>{
-                console.log(res1.msg)
+                console.log('updateDetails:'+res1.msg)
               })
 
               // console.log(this.verificationdataset)

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

@@ -320,10 +320,10 @@ export default {
             clearInterval(intervalId);
             this.dialogVisible = false
 
-            if(result.code===200)
+            if(result.code===200&&JSON.parse(result.data).code===200)
               this.$modal.msgSuccess(result.msg);
             else {
-              this.$modal.msgError(result.msg);
+              this.$modal.msgError("训练失败");
             }
           }
         }, 100);

cirs-ui/src/views/index.vue

@@ -358,7 +358,7 @@ export default {
   position: relative;
 }
 .home {
-  background: radial-gradient(circle at 10% 20%, #3A71A8 0%,  rgb(239, 249, 249)90%);
+  background: radial-gradient(circle at 10% 20%, #07417a 0%, #3A71A8 90%);
   //border-radius: 20px;
 
   blockquote {