inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -28,6 +28,7 @@ private String sampleModel; private String assign; private String name; @ValueTableShow(5) @ApiModelProperty("样品数量") inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -332,7 +332,7 @@ if (ObjectUtils.isNotEmpty(sonLaboratory) && (sonLaboratory.equals("近场") || sonLaboratory.equals("远场")) && split[split.length - 1].equals("csv")) { //判断是哪种csv文件,是否有—— if (!file.getOriginalFilename().contains("——")) { if (sonLaboratory.equals("近场")) { fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile); } else { fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile); inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -45,9 +45,6 @@ InsOrderFileMapper insOrderFileMapper; @Resource InsOrderMapper insOrderMapper; @Resource InsSampleMapper insSampleMapper; public void getFuSheWord1(String sonLaboratory, InsOrderFile insOrderFile) { inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -60,7 +60,7 @@ <association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/> </resultMap> <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.SampleOrderDto"> <resultMap id="SampleOrderDto" type="com.yuanchu.mom.dto.SampleOrderDto"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/> <result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/> @@ -85,6 +85,7 @@ <result property="motorNumber" column="motor_number"/> <result property="sampleName" column="sample_name"/> <result property="sampleModel" column="sample_model"/> <result property="name" column="name"/> <collection property="reportDtos" ofType="com.yuanchu.mom.dto.ReportDto" resultMap="reportDto"/> </resultMap> <resultMap id="reportDto" type="com.yuanchu.mom.dto.ReportDto"> @@ -94,7 +95,7 @@ <result property="name" column="name"/> </resultMap> <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto"> <select id="selectInsOrderPage" resultMap="SampleOrderDto"> select * from ( SELECT
