土工平台修改

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

@@ -62,6 +62,8 @@ public class ContractSampleController extends ServiceController {
         statusList.add(ContractSampleStatusEnum.PRO_TEC_CHECK);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
+        statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
 
 
         contractSample.setStatusList(statusList);
@@ -100,6 +102,8 @@ public class ContractSampleController extends ServiceController {
         statusList.add(ContractSampleStatusEnum.PRO_TEC_CHECK);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
+        statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setStatusList(statusList);
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
@@ -195,6 +199,8 @@ public class ContractSampleController extends ServiceController {
         List<ContractSampleStatusEnum> statusList = new ArrayList<>();
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        statusList.add(ContractSampleStatusEnum.OUT_INPUT);
+        statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setStatusList(statusList);
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
@@ -215,6 +221,25 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("验收任务登记待验收分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_check_accept_reg_wait")
+    public RestResult<Page<ContractSampleVO>> getPageCheckAcceptRegWait(ContractSampleVO contractSample) {
+        contractSample.setStatusList(Lists.newArrayList(
+                ContractSampleStatusEnum.CHECK_ACCEPT_REG,
+                ContractSampleStatusEnum.OUT_DRIFT,
+                ContractSampleStatusEnum.ENTRUST_REG
+        ));
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+
+
     @ApiOperation("验收任务登记登记历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -226,6 +251,8 @@ public class ContractSampleController extends ServiceController {
     public RestResult<Page<ContractSampleVO>> getPageCheckAcceptRegHis(ContractSampleVO contractSample) {
         List<ContractSampleStatusEnum> statusList = new ArrayList<>();
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
+        statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setStatusList(statusList);
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }

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

@@ -73,7 +73,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_out_his")
     public RestResult<Page<EntrustVO>> getPageOutHis(EntrustVO entrust) {
         entrust.setStatusList(Lists.newArrayList(
-                EntrustStatusEnum.OUT_INPUT
+                EntrustStatusEnum.OUT_INPUT,
+                EntrustStatusEnum.QUALITY_CHECK
         ));
         return success(entrustService.pageVO(getPage(), entrust));
     }

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
+import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IStandardAnnexService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import java.util.List;
+
+/**
+ * 标准附件表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-04-08
+ */
+@Api(tags = "标准附件表")
+@RestController
+@RequestMapping("/v1/standard_annex")
+public class StandardAnnexController extends ServiceController {
+
+    @Autowired
+    private IStandardAnnexService standardAnnexService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<StandardAnnex>> getPage(StandardAnnex standardAnnex) {
+        return success(standardAnnexService.page(getPage(), standardAnnex));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<StandardAnnex> get(@PathVariable("id") Long id) {
+        return success(standardAnnexService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, StandardAnnex standardAnnex) {
+        standardAnnex.setId(id);
+        return success(standardAnnexService.updateById(standardAnnex));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(StandardAnnex standardAnnex) {
+        return success(standardAnnexService.save(standardAnnex));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(standardAnnexService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload/{contractSampleId}")
+    public RestResult<Boolean> upload(@PathVariable("contractSampleId") Long contractSampleId, MultipartFile file) {
+        return success(standardAnnexService.upload(file, contractSampleId));
+    }
+
+
+    @ApiOperation(value = "附件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_bath/{contractSampleId}")
+    public RestResult<Boolean> uploadBath(@PathVariable("contractSampleId") Long contractSampleId, MultipartHttpServletRequest httpServletRequest) {
+        return success(standardAnnexService.uploadBath(httpServletRequest, contractSampleId,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "下载附件", notes = "下载指定附件")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        standardAnnexService.downloadFile(id, response);
+    }
+
+    @ApiOperation(value = "预览图片", notes = "预览图片")
+    @Login(action = Action.Skip)
+    @GetMapping("/view")
+    public void view(String objectKey) {
+        standardAnnexService.view(response, objectKey);
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/StandardAnnexMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
+
+/**
+ * <p>
+ * 标准附件表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-04-08
+ */
+public interface StandardAnnexMapper extends BatchMapper<StandardAnnex> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IStandardAnnexService.java

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 标准附件表 服务类
+ *
+ * @author wwd
+ * @since 2021-04-08
+ */
+public interface IStandardAnnexService extends IBaseService<StandardAnnex> {
+
+    Page<StandardAnnex> page(Page<StandardAnnex> page, StandardAnnex standardAnnex);
+
+    boolean removeByIds(List<Long> ids);
+
+
+    boolean upload(MultipartFile file, Long contractSampleId);
+
+    void downloadFile(Long id, HttpServletResponse response);
+
+    void view(HttpServletResponse response, String objectKey);
+
+    boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long contractSampleId, Account account);
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.oss.starter.OssClient;
+import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.hmhj.entity.StandardAnnex;
+import com.patzn.cloud.service.lims.hmhj.mapper.StandardAnnexMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IStandardAnnexService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.lims.hmhj.service.IStandardService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 标准附件表 服务实现类
+ *
+ * @author wwd
+ * @since 2021-04-08
+ */
+@Service
+public class StandardAnnexServiceImpl extends BaseServiceImpl<StandardAnnexMapper, StandardAnnex> implements IStandardAnnexService {
+
+    @Autowired
+    private IStandardService standardService;
+
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Override
+    public Page<StandardAnnex> page(Page<StandardAnnex> page, StandardAnnex standardAnnex) {
+        Wrapper wrapper = new EntityWrapper<>(standardAnnex);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public boolean upload(MultipartFile file, Long contractSampleId) {
+        RestAssert.fail(null == contractSampleId,"请选择样品");
+        String fileName = file.getOriginalFilename();
+        RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
+        if (null==standardService.getById(contractSampleId)){
+            RestAssert.fail("样品不存在");
+        }
+        OssFileResult result = ossClient.upload(file);
+        if (null == result) {
+            return false;
+        }
+        StandardAnnex sampleAnnex = new StandardAnnex();
+
+        sampleAnnex.setType(result.getType());
+        sampleAnnex.setFileName(result.getName());
+        sampleAnnex.setObjectKey(result.getObjectKey());
+        sampleAnnex.setStandardId(contractSampleId);
+        return save(sampleAnnex);
+    }
+
+    @Override
+    public void downloadFile(Long id, HttpServletResponse response) {
+        StandardAnnex attachment = super.getById(id);
+        if (null == attachment) {
+            RestAssert.fail("抱歉！该照片不存在");
+        }
+        ossClient.download(attachment.getObjectKey(), attachment.getFileName() + "." + attachment.getType(), response);
+    }
+
+    @Override
+    public void view(HttpServletResponse response, String objectKey) {
+        ossClient.download(objectKey, response);
+    }
+
+    @Override
+    public boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long contractSampleId, Account account) {
+        // 先拿到文件名称的迭代器
+        Iterator<String> fileNamesIt = httpServletRequest.getFileNames();
+        List<String> failedNameList = new ArrayList<>();
+        while (fileNamesIt.hasNext()) {
+            String fileName = fileNamesIt.next();
+            // 获取文件
+            MultipartFile multipartFile = httpServletRequest.getFile(fileName);
+            upload(multipartFile,contractSampleId);
+            failedNameList.add(fileName);
+        }
+
+        return true;
+    }
+}

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

@@ -7,6 +7,15 @@
                <if test="null!=vo.status">
                    AND s.status = #{vo.status}
                </if>
+
+                <if test="null!=vo.code">
+                    AND s.code LIKE CONCAT('%',#{vo.code},'%')
+                </if>
+
+                <if test="null!=vo.materialName">
+                    AND s.material_name LIKE CONCAT('%',#{vo.materialName},'%')
+                </if>
+
                 <if test="null!=vo.statusList">
                     AND s.status IN
                     <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
@@ -22,6 +31,10 @@
         </if>
     </sql>
 
+    <sql id="orderBy">
+        ORDER BY s.ctime DESC
+    </sql>
+
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
         SELECT  s.* FROM contract_sample s WHERE s.deleted = 0
         <include refid="sqlWhere"/>

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

@@ -26,7 +26,12 @@
                 #{id}
             </foreach>
         </if>
-
+        <if test="null!=vo.client">
+            AND client  LIKE CONCAT('%',#{vo.client},'%')
+        </if>
+        <if test="null!=vo.testSide">
+            AND test_side  LIKE CONCAT('%',#{vo.testSide},'%')
+        </if>
         <if test="null!=vo.statusList">
             AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.StandardAnnexMapper">
+
+</mapper>

src/test/java/resources/db_base_sql/v1.0.1/新增菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1324269818219528193, 1304006677087891457, 1304244453771292673, '留存位置查询', 0, 'sample_keep', '/soil/sample/keep', 'pt-config', NULL, 1, 65, '2020-11-05 16:38:23.065', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1324269818219528193, 1304006677087891457, 1304244453771292673, '留存位置查询', 0, 'sample_keep', '/soil/sample/keep', 'pt-config', NULL, 1, 65, '2020-11-05 16:38:23.065', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1323896863182544897, 1304006677087891457, 1304244453771292673, '副样管理', 0, 'copy', '/soil/sample/copy', 'pt-config', NULL, 1, 55, '2020-11-04 15:56:23.654', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.0.5/新增盒号管理.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1334793765047459841, 1304006677087891457, 1304244453771292673, '盒号管理', 0, 'sample_box', '/soil/sample/box', 'pt-config', NULL, 1, 1, '2020-12-04 17:36:47.513', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1334793765047459841, 1304006677087891457, 1304244453771292673, '盒号管理', 0, 'sample_box', '/soil/sample/box', 'pt-config', NULL, 1, 1, '2020-12-04 17:36:47.513', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.0.6/新增菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1338658190481367041, 1304006677087891457, 1304245208477577218, '试验项目报告模板', 0, 'item_report', '/soil/report/item_report', 'pt-config', NULL, 1, 1, '2020-12-15 09:32:38.339', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1338658190481367041, 1304006677087891457, 1304245208477577218, '试验项目报告模板', 0, 'item_report', '/soil/report/item_report', 'pt-config', NULL, 1, 1, '2020-12-15 09:32:38.339', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1330763273583169537, 1304006677087891457, 1304246874937470978, '原始记录模板管理', 0, 'template', '/soil/aptitude/record_template', 'pt-config', NULL, 1, 1, '2020-11-23 14:41:03.465', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.0.8/新增菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343361673277194241, 1304006677087891457, 1343358970677411841, '出库管理', 0, 'outstock', '/soil/alone_sample/outstock', 'pt-config', NULL, 1, 195, '2020-12-28 09:02:36.019', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343361673277194241, 1304006677087891457, 1343358970677411841, '出库管理', 0, 'outstock', '/soil/alone_sample/outstock', 'pt-config', NULL, 1, 195, '2020-12-28 09:02:36.019', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343361393781358593, 1304006677087891457, 1343358970677411841, '库房位置管理', 0, 'storehouse_place', '/soil/alone_sample/storehouse_place', 'pt-config', NULL, 1, 196, '2020-12-28 09:01:29.382', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343360814950629377, 1304006677087891457, 1343358970677411841, '库房样品管理', 0, 'storehouse_sample', '/soil/alone_sample/storehouse_sample', 'pt-config', NULL, 1, 197, '2020-12-28 08:59:11.382', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343360397663518721, 1304006677087891457, 1343358970677411841, '入库管理', 0, 'alone_sample_instock', '/soil/alone_sample/instock', 'pt-config', NULL, 1, 199, '2020-12-28 08:57:31.889', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343359611810332674, 1304006677087891457, 1343358970677411841, '收样管理', 0, 'soil_alone_receive', '/soil/alone_sample/receive_sample', 'pt-config', '独立收样管理', 1, 200, '2020-12-28 08:54:24.535', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1343358970677411841, 1304006677087891457, 1304240390677704705, '样品管理', 0, 'soil_sample', '/', 'pt-config', '土工试验独立样品管理', 1, 700, '2020-12-28 08:51:51.669', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1342711206436126721, 1304006677087891457, 1304245208477577218, '汇总表报告模板', 0, 'summary_sheet', '/soil/report/summary_sheet', 'pt-config', NULL, 1, 1, '2020-12-26 13:57:52.64', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.0.9/新建菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1344190601411657730, 1304006677087891457, 1310765372454940673, '样品进度查询', 0, 'sample_progress', '/soil/statistics/sample_progress', 'pt-config', NULL, 1, 90, '2020-12-30 15:56:27.887', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1344190601411657730, 1304006677087891457, 1310765372454940673, '样品进度查询', 0, 'sample_progress', '/soil/statistics/sample_progress', 'pt-config', NULL, 1, 90, '2020-12-30 15:56:27.887', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.1/修改菜单名称.sql

-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1304244453771292673, "name" = '样品分波', "type" = 0, "code" = 'sample_receive', "uri" = '/soil/sample/receive', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 100, "ctime" = '2020-09-11 10:35:59.522', "ename" = NULL WHERE "id" = 1304247286566465538;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1304244453771292673, "name" = '样品分波', "type" = 0, "code" = 'sample_receive', "uri" = '/soil/sample/receive', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 100, "ctime" = '2020-09-11 10:35:59.522', "ename" = NULL WHERE "id" = 1304247286566465538;
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1345910204256989185, 1304006677087891457, 1310765372454940673, '试验项目进度', 0, 'experiment_progress', '/soil/statistics/experiment_progress', 'pt-config', NULL, 1, 469, '2021-01-04 09:49:33.158', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.2/新增菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1346339387936321538, 1304006677087891457, 1304244453771292673, '独立留存', 0, 'alone_keep', '/soil/sample/alone_keep', 'pt-config', NULL, 1, 99, '2021-01-05 14:14:58.517', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1346339387936321538, 1304006677087891457, 1304244453771292673, '独立留存', 0, 'alone_keep', '/soil/sample/alone_keep', 'pt-config', NULL, 1, 99, '2021-01-05 14:14:58.517', NULL);
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样管理', "type" = 0, "code" = 'sample_backups', "uri" = '/soil/sample/backups', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 70, "ctime" = '2020-09-11 10:43:28.608', "ename" = NULL WHERE "id" = 1304249170190643201;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '余样管理', "type" = 0, "code" = 'sample_surplus', "uri" = '/soil/sample/surplus', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 60, "ctime" = '2020-09-11 10:44:25.619', "ename" = NULL WHERE "id" = 1304249409312108545;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '余样处理审批', "type" = 0, "code" = 'surplus_dispose', "uri" = '/soil/sample/surplus_dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 45, "ctime" = '2020-10-20 10:21:23.155', "ename" = NULL WHERE "id" = 1318376737596182530;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品处理', "type" = 0, "code" = 'sample_dispose', "uri" = '/soil/sample/dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 50, "ctime" = '2020-09-11 10:46:42.391', "ename" = NULL WHERE "id" = 1304249982975455234;
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.3/新增模块.sql

-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1330798482672304129, 1304006677087891457, '审批待办', 'myTask', NULL, NULL, 8, 1, 0);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1330798482672304129, 1304006677087891457, '审批待办', 'myTask', NULL, NULL, 8, 1, 0);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344160245014831105, 1304006677087891457, '土工试验-消息通知', 'messagePanel', NULL, NULL, 8, 1, 100);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344160483163217921, 1304006677087891457, '土工试验-审批待办', 'myTask', NULL, NULL, 8, 1, 95);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344160913192624129, 1304006677087891457, '土工试验-待办任务日历', 'taskCalendar', NULL, NULL, 8, 1, 90);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344161180113936385, 1304006677087891457, '土工试验-待完成委托', 'UnfinishedContract', NULL, NULL, 8, 1, 85);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344161459966287874, 1304006677087891457, '土工试验-项目进度', 'SampleProgress', NULL, NULL, 8, 1, 80);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344161636483571713, 1304006677087891457, '土工试验-个人试验项目查询', 'UnfinishedItem', NULL, NULL, 8, 1, 75);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344161795602882562, 1304006677087891457, '土工试验-年度委托量统计', 'YearContractNum', NULL, NULL, 8, 1, 70);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344161976591294465, 1304006677087891457, '土工试验-检测类型委托统计', 'DetectTypeNum', NULL, NULL, 8, 1, 65);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344162118958555137, 1304006677087891457, '土工试验-委托完成额占比', 'ContractEndNum', NULL, NULL, 8, 1, 60);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1344162304875274241, 1304006677087891457, '土工试验-年度检测量统计', 'YearTestItem', NULL, NULL, 8, 1, 55);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.4/新增菜单.sql

-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1347739715927781377, 1304006677087891457, 1347738492851957761, '项目报告报告签发', 0, 'exp_report_issue', '/soil/soil_exp_report/issue', 'pt-config', '项目报告签发', 1, 90, '2021-01-09 10:59:22.731', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1347739715927781377, 1304006677087891457, 1347738492851957761, '项目报告报告签发', 0, 'exp_report_issue', '/soil/soil_exp_report/issue', 'pt-config', '项目报告签发', 1, 90, '2021-01-09 10:59:22.731', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1347739449727889410, 1304006677087891457, 1347738492851957761, '项目报告报告审核', 0, 'exp_report_check', '/soil/soil_exp_report/check', 'pt-config', '土工项目报告审核', 1, 95, '2021-01-09 10:58:19.26', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1347739181476982786, 1304006677087891457, 1347738492851957761, '项目报告编制', 0, 'exp_report_make', '/soil/soil_exp_report/make', 'pt-config', NULL, 1, 100, '2021-01-09 10:57:15.304', NULL);
-INSERT INTO "public"."sys_resource"("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1347738492851957761, 1304006677087891457, 1304240390677704705, '项目报告管理', 0, 'soil_exp_report', '/', 'pt-config', '土工试验项目报告管理', 1, 495, '2021-01-09 10:54:31.123', NULL);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.6/新增系统模块.sql

-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1349189699080531970, 1304006677087891457, '土工试验-委托进度', 'ItemFlow', NULL, NULL, 8, 1, 0);
-INSERT INTO "public"."sys_module"("id", "system_id", "name", "alias", "img", "remark", "type", "status", "sort") VALUES (1349189699080531970, 1304006677087891457, '土工试验-委托进度', 'ItemFlow', NULL, NULL, 8, 1, 0);
+++ /dev/null

src/test/java/resources/db_base_sql/v1.1.7/菜单修改.sql

-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品管理', "type" = 0, "code" = 'sample_keep', "uri" = '/soil/sample/keep', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 55, "ctime" = '2020-12-02 18:08:09.19', "ename" = NULL WHERE "id" = 1334076881641627650;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品管理', "type" = 0, "code" = 'sample_keep', "uri" = '/soil/sample/keep', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 55, "ctime" = '2020-12-02 18:08:09.19', "ename" = NULL WHERE "id" = 1334076881641627650;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样管理', "type" = 0, "code" = 'sample_backups', "uri" = '/soil/sample/backups', "icon" = 'pt-config', "remark" = NULL, "status" = 0, "sort" = 70, "ctime" = '2020-09-11 10:43:28.608', "ename" = NULL WHERE "id" = 1304249170190643201;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品处理', "type" = 0, "code" = 'sample_dispose', "uri" = '/soil/sample/dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 0, "sort" = 50, "ctime" = '2020-09-11 10:46:42.391', "ename" = NULL WHERE "id" = 1304249982975455234;
-
-
+++ /dev/null

src/test/java/resources/db_base_sql/v1/0/2/修改菜单名称.sql

-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1304244453771292673, "name" = '备样样品处理', "type" = 0, "code" = 'sample_dispose', "uri" = '/soil/sample/dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 50, "ctime" = '2020-09-11 10:46:42.391', "ename" = NULL WHERE "id" = 1304249982975455234;
-UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1304244453771292673, "name" = '备样样品处理', "type" = 0, "code" = 'sample_dispose', "uri" = '/soil/sample/dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 50, "ctime" = '2020-09-11 10:46:42.391', "ename" = NULL WHERE "id" = 1304249982975455234;
+++ /dev/null

src/test/java/resources/db_sql/v1.0.1/新增sql.sql

+CREATE TABLE "public"."standard_annex" (
+CREATE TABLE "public"."standard_annex" (
+  "id" int8 NOT NULL DEFAULT NULL,
+  "standard_id" int8 NOT NULL DEFAULT NULL,
+  "file_name" varchar(150) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "uid" int8 DEFAULT NULL,
+  "ctime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "type" varchar(20) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "lid" int8 DEFAULT NULL,
+  "ltime" timestamp(0) DEFAULT NULL::timestamp without time zone,
+  "deleted" int2 DEFAULT 0,
+  "remark" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "company_id" int8 DEFAULT NULL
+)
+;
+COMMENT ON COLUMN "public"."standard_annex"."id" IS '主键';
+COMMENT ON COLUMN "public"."standard_annex"."standard_id" IS '标准ID';
+COMMENT ON COLUMN "public"."standard_annex"."file_name" IS '文件名称';
+COMMENT ON COLUMN "public"."standard_annex"."object_key" IS '对象key';
+COMMENT ON COLUMN "public"."standard_annex"."uid" IS '创建者ID';
+COMMENT ON COLUMN "public"."standard_annex"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."standard_annex"."type" IS '文件类型';
+COMMENT ON COLUMN "public"."standard_annex"."lid" IS '最后修改人ID';
+COMMENT ON COLUMN "public"."standard_annex"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."standard_annex"."deleted" IS '是否删除0否1是';
+COMMENT ON COLUMN "public"."standard_annex"."remark" IS '备注';
+COMMENT ON COLUMN "public"."standard_annex"."company_id" IS '企业ID';
+COMMENT ON TABLE "public"."standard_annex" IS '标准附件表';
+
+-- ----------------------------
+-- Primary Key structure for table standard_annex
+-- ----------------------------
+ALTER TABLE "public"."standard_annex" ADD CONSTRAINT "standard_annex_pkey" PRIMARY KEY ("id");
+
+
+ALTER TABLE "public"."contract_ok_organizer"
+  ADD COLUMN "contract_sample_id" int8;
+
+COMMENT ON COLUMN "public"."contract_ok_organizer"."contract_sample_id" IS '合同ID';
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.2/新增字段.sql

-ALTER TABLE "public"."soil_prepare"
-ALTER TABLE "public"."soil_prepare"
-  ADD COLUMN "keep_location" varchar(255);
-
-COMMENT ON COLUMN "public"."soil_prepare"."keep_location" IS '留样位置';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.3/新增样品备注.sql

-ALTER TABLE "public"."soil_sample"
-ALTER TABLE "public"."soil_sample"
-  ADD COLUMN "remark" varchar(255);
-
-COMMENT ON COLUMN "public"."soil_sample"."remark" IS '备注';
-
-
-DROP INDEX "public"."fk_location_code";
-
-DROP INDEX "public"."fk_location_name";
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.5/新增项目名称字段.sql

-ALTER TABLE "public"."soil_entrust"
-ALTER TABLE "public"."soil_entrust"
-  ADD COLUMN "project_name" varchar(150);
-
-COMMENT ON COLUMN "public"."soil_entrust"."project_name" IS '项目名称';
-
-
-CREATE TABLE "public"."soil_box" (
-  "id" int8 NOT NULL DEFAULT NULL,
-  "name" varchar(120) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "box_code" varchar(120) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "quality" numeric(10,2) DEFAULT NULL::numeric,
-  "unit" varchar(50) COLLATE "pg_catalog"."default" DEFAULT 'g'::character varying,
-  "company_id" int8 DEFAULT NULL,
-  "uid" int8 DEFAULT NULL,
-  "ctime" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "lid" int8 DEFAULT NULL,
-  "ltime" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "deleted" int2 DEFAULT 0
-)
-;
-COMMENT ON COLUMN "public"."soil_box"."id" IS '主键ID';
-COMMENT ON COLUMN "public"."soil_box"."name" IS '盒子名称';
-COMMENT ON COLUMN "public"."soil_box"."box_code" IS '盒号';
-COMMENT ON COLUMN "public"."soil_box"."quality" IS '质量';
-COMMENT ON COLUMN "public"."soil_box"."unit" IS '单位';
-COMMENT ON COLUMN "public"."soil_box"."company_id" IS '企业ID';
-COMMENT ON COLUMN "public"."soil_box"."uid" IS '创建人ID';
-COMMENT ON COLUMN "public"."soil_box"."ctime" IS '创建时间';
-COMMENT ON COLUMN "public"."soil_box"."lid" IS '最后修改人ID';
-COMMENT ON COLUMN "public"."soil_box"."ltime" IS '最后修改时间';
-COMMENT ON COLUMN "public"."soil_box"."deleted" IS '是否删除（0否1是）';
-
--- ----------------------------
--- Primary Key structure for table soil_box
--- ----------------------------
-ALTER TABLE "public"."soil_box" ADD CONSTRAINT "soil_box_pkey" PRIMARY KEY ("id");
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.6/新增字段.sql

-ALTER TABLE "public"."soil_original_record"
-ALTER TABLE "public"."soil_original_record"
-  ADD COLUMN "object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL;
-
-COMMENT ON COLUMN "public"."soil_original_record"."object_key" IS '原始记录key';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.8/新增字段.sql

-ALTER TABLE "public"."soil_exp_report_template" 
-ALTER TABLE "public"."soil_exp_report_template" 
-  ADD COLUMN "more_sheet" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_exp_report_template"."more_sheet" IS '多Sheet模板（0否1是）';
-
-
-
-ALTER TABLE "public"."soil_exp_report_template_config"
-  ADD COLUMN "merge_row_num" int2 DEFAULT NULL;
-
-COMMENT ON COLUMN "public"."soil_exp_report_template_config"."merge_row_num" IS '合并行数';
-
-
-ALTER TABLE "public"."soil_exp_report"
-  ADD COLUMN "group_id" int8,
-  ADD COLUMN "group_name" varchar(150);
-
-COMMENT ON COLUMN "public"."soil_exp_report"."group_id" IS '检测科室ID';
-
-COMMENT ON COLUMN "public"."soil_exp_report"."group_name" IS '检测科室';
-
-
-
-ALTER TABLE "public"."soil_exp_report_template"
-  ADD COLUMN "template_type" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_exp_report_template"."template_type" IS '模板类型（0试验项目 1汇总表模板）';
-
-
-ALTER TABLE "public"."soil_exp_report_template_config"
-  ADD COLUMN "sheet_num" int2;
-
-COMMENT ON COLUMN "public"."soil_exp_report_template_config"."sheet_num" IS 'sheet索引';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.0.9/新增字段.sql

-ALTER TABLE "public"."soil_sample" 
-ALTER TABLE "public"."soil_sample" 
-  ADD COLUMN "keep_limit_time" timestamp(6);
-
-COMMENT ON COLUMN "public"."soil_sample"."keep_limit_time" IS '留存有效期';
-
-
-ALTER TABLE "public"."soil_report"
-  ADD COLUMN "report_type" varchar(255);
-
-COMMENT ON COLUMN "public"."soil_report"."report_type" IS '报告类型';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.1.0/新增字段.sql

-ALTER TABLE "public"."soil_exp_report" 
-ALTER TABLE "public"."soil_exp_report" 
-  ADD COLUMN "status" int2 DEFAULT 0,
-  ADD COLUMN "progress" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_exp_report"."status" IS '状态';
-
-COMMENT ON COLUMN "public"."soil_exp_report"."progress" IS '进度';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.1.2/新增字段.sql

-ALTER TABLE "public"."soil_sample_operation" 
-ALTER TABLE "public"."soil_sample_operation" 
-  ADD COLUMN "warehouse" varchar(100);
-
-COMMENT ON COLUMN "public"."soil_sample_operation"."warehouse" IS '库房号';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.1.3/修改字段.sql

-ALTER TABLE "public"."soil_alone_sample" 
-ALTER TABLE "public"."soil_alone_sample" 
-  ALTER COLUMN "cases_num" TYPE varchar(16) USING "cases_num"::varchar(100);
-
-
-
-  ALTER TABLE "public"."soil_entrust"
-  ADD COLUMN "project_leader" varchar(100),
-  ADD COLUMN "project_leader_id" int8;
-
-COMMENT ON COLUMN "public"."soil_entrust"."project_leader" IS '项目负责人';
-
-COMMENT ON COLUMN "public"."soil_entrust"."project_leader_id" IS '项目负责人ID';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.1.5/新增字段.sql

-ALTER TABLE "public"."soil_report" 
-ALTER TABLE "public"."soil_report" 
-  ADD COLUMN "status" int2 DEFAULT 0,
-  ADD COLUMN "progress" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_report"."status" IS '状态';
-
-COMMENT ON COLUMN "public"."soil_report"."progress" IS '进度';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1.1.7/新增sql.sql

-ALTER TABLE "public"."soil_exp_report_template" 
-ALTER TABLE "public"."soil_exp_report_template" 
-  ADD COLUMN "deleted" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_exp_report_template"."deleted" IS '是否删除0否1是';
-
-
-
-
-ALTER TABLE "public"."soil_original_template" 
-  ADD COLUMN "deleted" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_original_template"."deleted" IS '是否删除0否1是';
-
-
-
-ALTER TABLE "public"."soil_original_template"
-  ADD COLUMN "template_type" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."soil_original_template"."template_type" IS '模板类型（0原始记录 1开土制备记录）';
-
-
-
-
-CREATE TABLE "public"."soil_open_soil_record" (
-  "id" int8 NOT NULL DEFAULT NULL,
-  "company_id" int8 DEFAULT NULL,
-  "deleted" int2 DEFAULT 0,
-  "uid" int8 DEFAULT NULL,
-  "ctime" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "lid" int8 DEFAULT NULL,
-  "ltime" timestamp(6) DEFAULT NULL::timestamp without time zone,
-  "entrust_id" int8 DEFAULT NULL,
-  "version" int2 DEFAULT NULL,
-  "uri" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "remark" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "bucket_name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "version_id" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "pdf_object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "uname" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
-  "status" int2 DEFAULT 0,
-  "progress" int2 DEFAULT 0
-)
-;
-COMMENT ON COLUMN "public"."soil_open_soil_record"."id" IS '主键';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."company_id" IS '企业ID';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."deleted" IS '是否删除0否1是';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."uid" IS '创建人ID';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."ctime" IS '创建时间';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."lid" IS '最后修改人ID';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."ltime" IS '最后修改时间';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."entrust_id" IS '样品id';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."version" IS '版本';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."uri" IS '证书地址';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."remark" IS '备注';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."bucket_name" IS '桶名称';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."object_key" IS '对象key';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."version_id" IS '版本';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."pdf_object_key" IS 'pdf对象key';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."uname" IS '修改人';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."status" IS '状态';
-COMMENT ON COLUMN "public"."soil_open_soil_record"."progress" IS '进度';
-
--- ----------------------------
--- Primary Key structure for table soil_open_soil_record
--- ----------------------------
-ALTER TABLE "public"."soil_open_soil_record" ADD CONSTRAINT "soil_open_soil_record_pkey" PRIMARY KEY ("id");
-
-
-ALTER TABLE "public"."soil_sample_operation"
-  ADD COLUMN "senior_type" varchar(120);
-
-COMMENT ON COLUMN "public"."soil_sample_operation"."senior_type" IS '高级样品分类';
+++ /dev/null
\ No newline at end of file

src/test/java/resources/db_sql/v1/0/4/新增字段.sql

-ALTER TABLE "public"."soil_experiment"
-ALTER TABLE "public"."soil_experiment"
-  ADD COLUMN "order_by" int2;
-
-COMMENT ON COLUMN "public"."soil_experiment"."order_by" IS '排序';
+++ /dev/null
\ No newline at end of file