添加样品code多级别字段；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java

@@ -397,7 +397,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             if (isToStatusPath(t)) {
                 entrustService.rejectToPrevNode(t, reason, account);
             } else {
-                rejectByReportStatus(t, reportMap.get(t.getId()), reportStatusEnum, account);
+                rejectByReportStatus(t, reportMap.get(t.getId()), reportStatusEnum,reason, account);
             }
         });
     }
@@ -409,7 +409,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
      * @param reportStatus
      * @param account
      */
-    private void rejectByReportStatus(Entrust entrust, EntrustReport entrustReport, EntrustReportStatusEnum reportStatus, Account account) {
+    private void rejectByReportStatus(Entrust entrust, EntrustReport entrustReport, EntrustReportStatusEnum reportStatus,String reason, Account account) {
         EntrustSample entrustSample = new EntrustSample();
         EntrustSampleStatusEnum sampleStatusEnum = null;
 
@@ -430,7 +430,8 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             entrustSample.setProgress(sampleStatusEnum);
             entrustSampleService.update(entrustSample, Condition.create().eq("entrust_id", entrust.getId()));
             if (null != entrustReport) {
-                entrustRecordService.record(new Long[]{entrust.getId()}, entrustReport.getStatus().getDisplay(), sampleStatusEnum.getDisplay(), 2, account, "退回至" + sampleStatusEnum.getDisplay());
+                reason = String.format("因【%s】,退回至%s",reason,sampleStatusEnum.getDisplay());
+                entrustRecordService.record(new Long[]{entrust.getId()}, entrustReport.getStatus().getDisplay(), sampleStatusEnum.getDisplay(), 2, account, reason);
             }
         }
     }

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

@@ -91,8 +91,8 @@
         </if>
         )
 
-        SELECT i.*,s.name AS "sampleName",e.test_side "testSide",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey",
-        s.compliance_test,s.sample_from,sample_shape
+        SELECT i.*,s.name AS "sampleName",e.test_side "testSide",COALESCE(s.third_code,s.code) AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey",
+        s.compliance_test,s.sample_from,sample_shape,s.second_code,s.third_code
         FROM i
         JOIN entrust_sample s ON i.entrust_sample_id = s.id
         LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 ) l ON i.id = l.item_id
@@ -159,7 +159,7 @@
         )
 
         SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide",l.record_id,r.object_key AS "recordObjectKey",
-               s.compliance_test
+               s.compliance_test,s.second_code,s.third_code
         FROM i
         JOIN entrust_sample s ON i.entrust_sample_id = s.id
         JOIN (select t.id,t.code,t.test_side from entrust t where t.deleted = 0 ) e on s.entrust_id = e.id
@@ -191,7 +191,7 @@
 
 
     <select id="selectByItemDeviate" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode",
+        SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,COALESCE(s.third_code,s.code) AS "sampleCode",
 
         i.group_name,i.standard,s.name AS "sampleName",e.client,e.code AS "entrustCode",
 

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

@@ -5,7 +5,7 @@
     <select id="selectSampleReceiveList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
        SELECT
-	    p.id, p.entrust_sample_id,s.code,s.name,s.product_code,s.product_basis_name,s.compose_judge,s.product_standard_id,s.name_code,
+	    p.id, p.entrust_sample_id,COALESCE(s.third_code,s.code) "code",s.name,s.product_code,s.product_basis_name,s.compose_judge,s.product_standard_id,s.name_code,
 	    s.compliance_test,p.group_id,p.group_name,p.make_type,p.make_quantity,p.store_way,p.store_location,p.maker,p.make_time
       FROM
 	  entrust_sample_prepare