问题优化；

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

@@ -185,7 +185,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_entrust_reg")
     public RestResult<Page<ContractSample>> getPageEntrustReg(ContractSample contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
-        return success(contractSampleService.page(getPage(), contractSample));
+        return success(contractSampleService.pageOutReg(getPage(), contractSample));
     }
 
 
@@ -603,4 +603,10 @@ public class ContractSampleController extends ServiceController {
         return success(contractSampleService.batchImport(file,getAccount()));
     }
 
+    @ApiOperation(value = "批量导入合同信息", notes = "批量导入合同信息")
+    @PostMapping("/batch_import")
+    public RestResult<Boolean> importData(MultipartFile file) {
+        return success(contractSampleService.batchImport(file, getAccount()));
+    }
+
 }

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

@@ -19,6 +19,7 @@ import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
+import com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleItemService;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
@@ -26,6 +27,10 @@ import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;

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

@@ -213,7 +213,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         Entrust entrust = getEntrustByItemId(ids[0]);
         if (null != entrust && isAllocatedByEntrustId(entrust.getId())) {
             // 添加流程数据录入节点
-            entrust.setFlowStatus(EntrustFlowEnum.TEST.getName());
+            // entrust.setFlowStatus(EntrustFlowEnum.TEST.getName());
             if (StringUtils.isNotBlank(entrust.getStatusPath()) && entrust.getStatusPath().contains(entrust.getFlowStatus())) {
                 entrustService.submitToNextNode(entrust, account);
             } else {

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

@@ -557,6 +557,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         EntrustSample sample = dto.convert(EntrustSample.class);
         //标样
         sample.setType(1);
+        Integer orderBy = sample.getOrderBy();
+
+        sample.setOrderBy(orderBy = null == orderBy ? 0 : orderBy.intValue() - 1);
         if (save(sample)) {
             List<EntrustSampleItem> itemList = dto.getItemList();
             if (CollectionUtils.isNotEmpty(itemList)) {
@@ -800,20 +803,19 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         if (null == entrustSample.getEntrustId()) {
             return page;
         }
-        if (CollectionUtils.isEmpty(entrustSample.getItemStatusList())) {
-            return page;
-        }
-        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status", entrustSample.getItemStatusList()));
-        if (CollectionUtils.isEmpty(itemList)) {
-            return page;
-        }
+       // if (CollectionUtils.isEmpty(entrustSample.getItemStatusList())) {
+       //     return page;
+       // }
+       // List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status", entrustSample.getItemStatusList()));
+       // if (CollectionUtils.isEmpty(itemList)) {
+       //     return page;
+       // }
 
-        List<Long> sampleIdsList = itemList.stream().map(i -> {
-            return i.getEntrustSampleId();
-        }).collect(Collectors.toList());
+       // List<Long> sampleIdsList = itemList.stream().map(i -> {
+       //     return i.getEntrustSampleId();
+       // }).collect(Collectors.toList());
 
-
-        entrustSample.setIds(sampleIdsList);
+       // entrustSample.setIds(sampleIdsList);
 
         return page.setRecords(baseMapper.selectVOList(page, entrustSample));
     }

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

@@ -68,6 +68,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     @Autowired
     private IEntrustReportService entrustReportService;
 
+    @Autowired
+    private IEntrustSampleBackupService entrustSampleBackupService;
 
     @Autowired
     private IEntrustSamplePrepareService entrustSamplePrepareService;
@@ -1165,6 +1167,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             if (sampleIds.size() > 0) {
                 entrustSampleItemService.update(entrustSampleItem, Condition.create().in("entrust_sample_id", sampleIds));
             }
+            // 删除委托下样品备样
+            entrustSampleBackupService.remove(Condition.create().eq("entrust_id",e.getId()));
         }
         lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "有委托从样品接收退回，请及时查看退回原因并处理", "新的样品接收退回任务！", account, null);
         return true;

src/test/java/resources/db_sql/hmhj/v148/20210720新增字段.sql

+ALTER TABLE "public"."contract_sample"
+ALTER TABLE "public"."contract_sample"
+  ADD COLUMN "factory_area" varchar(64) COLLATE "pg_catalog"."default",
+  ADD COLUMN "storekeeper" varchar(64) COLLATE "pg_catalog"."default",
+  ADD COLUMN "storekeeper_id" int8;
+
+COMMENT ON COLUMN "public"."contract_sample"."factory_area" IS '厂区';
+COMMENT ON COLUMN "public"."contract_sample"."storekeeper" IS '保管员';
+COMMENT ON COLUMN "public"."contract_sample"."storekeeper_id" IS '保管员ID';