hmhj

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

@@ -443,7 +443,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
                 for (EntrustSampleVO vo : sampleVOList) {
                     XSSFRow xssfRow = sheetOne.getRow(beginRow);
-
+                    List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
+                    vo.setIndexList(indexList);
                     for (EntrustReportTemplateConfig config : configList) {
                         if (null == config.getColumnPlace()) {
                             continue;

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

@@ -152,7 +152,7 @@
 
 
     <select id="selectVOListBySampleIds" 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.entrust_sample_id,i.standard,s.code AS "sampleCode"
         FROM
         entrust_sample_item i
         JOIN entrust_sample s ON i.entrust_sample_id = s.ID

src/test/java/resources/db_sql/hmhj/v112/20210618新增字段.sql

+ALTER TABLE "public"."original_template"
+ALTER TABLE "public"."original_template"
+  ADD COLUMN "more_item" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."original_template"."more_item" IS '多项目原始记录';
\ No newline at end of file