修改相关优化项目；

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

@@ -168,6 +168,32 @@ public class EntrustController extends ServiceController {
         return success(entrustService.page(getPage(), entrust));
     }
 
+    @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_change_approve")
+    public RestResult<Page<Entrust>> getPageChangeApprove(Entrust entrust) {
+        entrust.setApproveStatus(EntrustApproveStatusEnum.APPROVE);
+        return success(entrustService.page(getPage(), entrust));
+    }
+
+
+    @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_change_approve_his")
+    public RestResult<Page<Entrust>> getPageChangeApproveHis(Entrust entrust) {
+        return success(entrustService.pageChangeApproveHis(getPage(), entrust));
+    }
+
 
     @ApiOperation("委托样品待制备分页列表")
     @ApiImplicitParams({
@@ -333,9 +359,22 @@ public class EntrustController extends ServiceController {
     }
 
     @ApiOperation("提交修改审批申请")
-    @PostMapping("/submit_update_apply")
-    public RestResult<Boolean> submitUpdateApply(@RequestParam("id") Long id, String reason) {
-        return success(entrustService.submitUpdateApply(id, reason, getAccount()));
+    @PostMapping("/submit_change_apply")
+    public RestResult<Boolean> submitChangeApply(@RequestParam("id") Long id, @RequestParam("approveId") Long approveId,
+                                                 @RequestParam("reason") String reason) {
+        return success(entrustService.submitChangeApply(id, approveId, reason, getAccount()));
+    }
+
+    @ApiOperation("审批修改申请")
+    @PostMapping("/approve_submit_apply")
+    public RestResult<Boolean> approveSubmitApply(@RequestParam("id") Long id) {
+        return success(entrustService.approveSubmitApply(id, getAccount()));
+    }
+
+    @ApiOperation("驳回修改申请")
+    @PostMapping("/reject_submit_apply")
+    public RestResult<Boolean> rejectSubmitApply(@RequestParam("id") Long id, @RequestParam("reason") String reason) {
+        return success(entrustService.rejectSubmitApply(id, reason, getAccount()));
     }
 
     @ApiOperation("复制委托信息")

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

@@ -81,7 +81,7 @@ public class EntrustSampleBackupController extends ServiceController {
     public RestResult<Page<EntrustSampleBackupVO>> getPageManage(EntrustSampleBackupVO entrustSampleBackup) {
         entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.MANAGE_ING);
         entrustSampleBackup.setType("YP");
-        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+        return success(entrustSampleBackupService.pageManage(getPage(), entrustSampleBackup));
     }
 
     @ApiOperation("样品管理历史分页列表")

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

@@ -100,6 +100,58 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.page(getPage(), entrustSample));
     }
 
+    @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_report_check")
+    public RestResult<Page<EntrustSample>> getPageReportCheck(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_CHECK);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
+    @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_report_issue")
+    public RestResult<Page<EntrustSample>> getPageReportIssue(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_ISSUE);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
+    @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_report_allow")
+    public RestResult<Page<EntrustSample>> getPageReportAllow(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_ALLOW);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
+    @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_report_send")
+    public RestResult<Page<EntrustSample>> getPageReportSend(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_SEND);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({

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

@@ -20,4 +20,6 @@ import java.util.List;
 public interface EntrustSampleBackupMapper extends BatchMapper<EntrustSampleBackup> {
 
     List<EntrustSampleBackupVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleBackupVO entrustSampleBackup);
+
+    List<EntrustSampleBackupVO> selectManageList(Page<EntrustSampleBackupVO> page, @Param("vo") EntrustSampleBackupVO entrustSampleBackup);
 }

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

@@ -25,4 +25,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
     Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
 
     boolean submitToHandle(Long[] ids, Account account);
+
+    Page<EntrustSampleBackupVO> pageManage(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
 }

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

@@ -83,5 +83,11 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     boolean backFromReceive(Long[] ids, Account account, String reason);
 
-    boolean submitUpdateApply(Long id, String reason, Account account);
+    boolean submitChangeApply(Long id, Long approveId, String reason, Account account);
+
+    Page<Entrust> pageChangeApproveHis(Page<Entrust> page, Entrust entrust);
+
+    boolean approveSubmitApply(Long id, Account account);
+
+    boolean rejectSubmitApply(Long id,String reason, Account account);
 }

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

@@ -64,4 +64,9 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
 
         return super.update(backup,Condition.create().in("id",ids));
     }
+
+    @Override
+    public Page<EntrustSampleBackupVO> pageManage(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup) {
+        return page.setRecords(baseMapper.selectManageList(page,entrustSampleBackup));
+    }
 }

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

@@ -100,7 +100,6 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     @Override
     public Page<EntrustSample> page(Page<EntrustSample> page, EntrustSample entrustSample) {
         Wrapper wrapper = new EntityWrapper<>(entrustSample);
-
         return this.page(page, wrapper);
     }
 

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

@@ -47,4 +47,51 @@
         </where>
         order by b.ctime desc
     </select>
+
+    <select id="selectManageList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO">
+        SELECT
+            b.ID,
+            b.receive_time,
+            b.storage_location,
+            b.storage_method,
+            b.storage_period,
+            b.sample_id,
+            b.handler,
+            b.handle_time,
+            s.NAME AS "sampleName",
+            s.code AS "sampleCode" ,
+            e.client ,
+            e.code AS "entrustCode",
+            (case when e.sample_handle_advise = '检测完毕退还' and s.status &gt;20 then 1 else 0 end) "weights"
+        FROM
+            entrust_sample_backup b
+        JOIN entrust_sample s ON b.sample_id = s.ID
+        JOIN entrust e ON s.entrust_id = e.ID
+        <where>
+            AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
+            <if test="null!=vo.sampleCode">
+                AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
+            </if>
+
+            <if test="null!=vo.status">
+                AND b.status =#{vo.status}
+            </if>
+
+            <if test="null!=vo.notStatus">
+                AND b.status !=#{vo.notStatus}
+            </if>
+
+            <if test="null!=vo.sampleName">
+                AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
+            </if>
+
+            <if test="null!=vo.client">
+                AND e.client LIKE CONCAT('%',#{vo.client},'%')
+            </if>
+            <if test="null!=vo.entrustCode">
+                AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
+            </if>
+        </where>
+        order by (case when e.sample_handle_advise = '检测完毕退还' and s.status &gt;20 then 1 else 0 end) desc, b.ctime desc
+    </select>
 </mapper>

src/test/java/resources/db_sql/hmhj/v145/20210708添加记录表和字段.sql

-CREATE TABLE "public"."entrust_sample_record" (
+CREATE TABLE "public"."entrust_sample_record" (
@@ -42,7 +42,6 @@ ALTER TABLE "public"."entrust"
     ADD COLUMN "live_witness" int2,
     ADD COLUMN "sample_size" varchar(64) COLLATE "pg_catalog"."default",
     ADD COLUMN "priority" varchar(32) COLLATE "pg_catalog"."default",
-    ADD COLUMN "test_fee" numeric(10,2) default 0.00,
     ADD COLUMN "test_time_s" timestamp(6),
     ADD COLUMN "test_time_e" timestamp(6);
 
@@ -50,7 +49,6 @@ COMMENT ON COLUMN "public"."entrust"."expect_send_time" IS '客户期望报告
 COMMENT ON COLUMN "public"."entrust"."live_witness" IS '现场见证【0：否，1：是】';
 COMMENT ON COLUMN "public"."entrust"."sample_size" IS '样品尺寸';
 COMMENT ON COLUMN "public"."entrust"."priority" IS '优先级';
-COMMENT ON COLUMN "public"."entrust"."test_fee" IS '检测费用';
 COMMENT ON COLUMN "public"."entrust"."test_time_s" IS '检测开始日期';
 COMMENT ON COLUMN "public"."entrust"."test_time_e" IS '检测结束日期';
 -- 新增样品字段 --
@@ -64,3 +62,8 @@ ALTER TABLE "public"."entrust_sample_item"
     ADD COLUMN "price" numeric(10,2) default 0.00;
 
 COMMENT ON COLUMN "public"."entrust_sample_item"."price" IS '单价';
+
+ALTER TABLE "public"."material_item"
+    ADD COLUMN "price" numeric(10,2) default 0.00;
+
+COMMENT ON COLUMN "public"."material_item"."price" IS '单价';

src/test/java/resources/db_sql/hmhj/v146/20210709添加字段.sql

+-- 新增委托字段 --
+-- 新增委托字段 --
+ALTER TABLE "public"."entrust"
+    ADD COLUMN "proposer_id" int8,
+    ADD COLUMN "approver_id" int8,
+    ADD COLUMN "proposer" varchar(64) COLLATE "pg_catalog"."default",
+    ADD COLUMN "approver" varchar(64) COLLATE "pg_catalog"."default",
+    -- ADD COLUMN "total_fee" numeric(10,2),
+    ADD COLUMN "approve_time" timestamp(6);
+
+COMMENT ON COLUMN "public"."entrust"."proposer_id" IS '修改申请人ID';
+COMMENT ON COLUMN "public"."entrust"."approver_id" IS '修改审批人ID';
+COMMENT ON COLUMN "public"."entrust"."proposer" IS '修改申请人';
+COMMENT ON COLUMN "public"."entrust"."approver" IS '修改审批人';
+COMMENT ON COLUMN "public"."entrust"."approve_time" IS '审批日期';
+-- COMMENT ON COLUMN "public"."entrust"."total_fee" IS '检测费用';