chenrui
2025-04-11 6d06746ec219cd9660fff07763182c1788ebfb20
成品检验任务功能开发
已修改4个文件
14 ■■■■■ 文件已修改
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/resources/mapper/InsSampleMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsulatingDto.java
@@ -9,7 +9,7 @@
public class InsulatingDto {
    // 方法id
    private Integer standardMethodListId;
    private List standardMethodListId;
    // 芯数
    private List<String> num;
@@ -17,4 +17,7 @@
    // 检验项
    private List<InsProduct> insProduct;
    // 方法ids
    private List<Long> standardMethodListIds;
}
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
@@ -181,7 +181,7 @@
    private Integer insBushId;
    @ApiModelProperty("标准方法id")
    private Long standardMethodListId;
    private String standardMethodListId;
    //返回的20度常温的计算值(温度循环)
    @TableField(exist = false ,select = false)
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -306,7 +306,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
                    product.setStandardMethodListId(a.getInsulating().getStandardMethodListIds().toString());
                }
                addInsProductMethod(a.getId(), ip2);
            }
@@ -324,7 +324,7 @@
                    ip2.addAll(insProducts);
                }
                for (InsProduct product : ip2) {
                    product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
                    product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId().toString());
                }
                addInsProductMethod(a.getId(), ip2);
            }
inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -173,7 +173,8 @@
    <select id="findInsSampleAndOrder" resultType="com.ruoyi.inspect.vo.InsOrderPlanVO">
        select * from(
        select * from(
        SELECT a.*,ios.ins_state,ios.verify_tell,verify_user
        SELECT a.*,ios.ins_state,ios.verify_tell,verify_user,
               (select name from  user where user.id = verify_user) AS check_name
        FROM
        (
        SELECT