成品下单检验新增字段

chenrui

2025-04-10 c296b7d0c412429d29ad24bd34aa9def65045085

成品下单检验新增字段

 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductResult.java

@@ -49,4 +49,10 @@
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty("测试开始时间")
    private String testStartTime;

    @ApiModelProperty("测试结束时间")
    private String testEndTime;
}

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java

@@ -439,6 +439,30 @@
                    }
                    newResult.setEquipName(JSON.toJSONString(ev));
                }
                //测试开始时间
                if (jo.get("testStartTime") != null) {
                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("testStartTime")));
                    List<Map<String, Object>> ev = new ArrayList<>();
                    for (Object o : jsonArray2) {
                        JSONObject testStartTimeValue = JSON.parseObject(JSON.toJSONString(o));
                        Map<String, Object> map = new HashMap<>();
                        map.put("v", JSON.parseObject(JSON.toJSONString(testStartTimeValue.get("v"))).get("v"));
                        ev.add(map);
                    }
                    newResult.setTestStartTime(JSON.toJSONString(ev));
                }
                //测试结束时间
                if (jo.get("testEndTime") != null) {
                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("testEndTime")));
                    List<Map<String, Object>> ev = new ArrayList<>();
                    for (Object o : jsonArray2) {
                        JSONObject testEndTimeValue = JSON.parseObject(JSON.toJSONString(o));
                        Map<String, Object> map = new HashMap<>();
                        map.put("v", JSON.parseObject(JSON.toJSONString(testEndTimeValue.get("v"))).get("v"));
                        ev.add(map);
                    }
                    newResult.setTestEndTime(JSON.toJSONString(ev));
                }
                //结论
                try {
                    JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -88,6 +88,8 @@
        <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
        <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
        <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
        <result property="testStartTime" column="test_start_time" jdbcType="VARBINARY"/>
        <result property="testEndTime" column="test_end_time" jdbcType="VARBINARY"/>
    </resultMap>

    <resultMap id="sampleVo" type="com.ruoyi.inspect.vo.SampleVo">
@@ -161,7 +163,10 @@
               ip.sort,
               ip.cable_tag,
               ip.structure_item_parameter_id,
               ip.check_user_id
               ip.check_user_id,
               ip.radius,
               ipr.test_start_time,
               ipr.test_end_time
    </sql>