霍煤宏骏优化

src/main/java/com/patzn/cloud/service/lims/hmhj/original/SingleSheetLittleOperation.java

@@ -35,6 +35,8 @@ public class SingleSheetLittleOperation implements Operation {
     public void doMakeOriginal() {
         OriginalUtil.doReplace(xssfWorkbook,entrust);
         XSSFSheet sheetOne = xssfWorkbook.getSheetAt(0);
+        String sheetName = sheetOne.getSheetName();
+        System.out.println(sheetName);
         sheetOne.setForceFormulaRecalculation(true);
         Integer beginRow =  template.getSampleBeginRow();
         int sampleMergerNum = template.getSampleMergerNum();
@@ -49,7 +51,8 @@ public class SingleSheetLittleOperation implements Operation {
                 if (StringUtils.isBlank(config.getDataAttribute())){
                     continue;
                 }
-                cell.setCellValue(StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(config.getDataAttribute(),vo));
+                String value=  StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(config.getDataAttribute(),vo);
+                cell.setCellValue(value);
             }
             beginRow+=sampleMergerNum;
         }

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -79,8 +79,8 @@
       )
 
             SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.id
-            LEFT JOIN item_rel_original_record  l ON i.id = l.item_id
-            LEFT JOIN original_record  r ON l.record_id = r.id
+            LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 )  l ON i.id = l.item_id
+            LEFT JOIN ( SELECT id,object_key FROM original_record  WHERE deleted = 0 )  r ON l.record_id = r.id
             <where>
                 <if test="null!=vo.sampleCode">
                     AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
@@ -196,7 +196,9 @@
 
 
     <select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
+        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode",s.name AS "sampleName",
+
+        s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,s.product_code,s.name_code
         FROM
         entrust_sample_item i
         JOIN entrust_sample s ON i.entrust_sample_id = s.ID