From f98db1330083c064ce5f4c005e5a26684c1ea774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Fri, 1 Nov 2024 16:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=9C=A8xml=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8=202.=E5=A4=84=E7=90=86=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=AE=A1=E6=A0=B8=E4=BA=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EntrustAlterApplyController.java | 12 ++++++------ .../mapper/EntrustAlterApplyMapper.java | 4 +++- .../service/impl/EntrustAlterApplyServiceImpl.java | 6 ++++-- ...trustmentIdentificationMaterialServiceImpl.java | 4 +++- .../service/impl/EntrustmentServiceImpl.java | 4 +++- .../entrustment/vo/EntrustAlterApplyVO.java | 6 ++++++ .../resources/mapper/EntrustAlterApplyMapper.xml | 14 +++++++------- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java index f2edac9..ae2d431 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java @@ -33,15 +33,15 @@ public class EntrustAlterApplyController { @ApiOperation(value = "查询所有申请修改委托消息分页接口", notes = "查询所有申请修改委托消息分页接口") @PostMapping("/page") - @PreAuthorize("@pms.hasPermission('EntrustAlterApplyQuery')") // 委托申请修改消息查询权限 - public R page(@RequestBody EntrustAlterApplyQuery query) { +// @PreAuthorize("@pms.hasPermission('EntrustAlterApplyQuery')") // 委托申请修改消息查询权限 + public R> page(@RequestBody EntrustAlterApplyQuery query) { IPage page = entrustAlterApplyService.voPage(query); return R.ok(page); } @ApiOperation(value = "保存或提交委托申请修改消息", notes = "保存委托申请修改消息") @PostMapping("/save") - @PreAuthorize("@pms.hasPermission('EntrustAlterApplySubmit')") // 委托申请修改消息保存提交权限 +// @PreAuthorize("@pms.hasPermission('EntrustAlterApplySubmit')") // 委托申请修改消息保存提交权限 public R save(@RequestBody @Valid EntrustAlterApplyDTO dto) { EntrustAlterApplyVO vo = null; try { @@ -55,7 +55,7 @@ public class EntrustAlterApplyController { @ApiOperation(value = "修改委托申请修改消息", notes = "修改委托申请修改消息") @PutMapping("/update") - @PreAuthorize("@pms.hasPermission('EntrustAlterApplyEdit')") // 委托申请修改消息修改权限 +// @PreAuthorize("@pms.hasPermission('EntrustAlterApplyEdit')") // 委托申请修改消息修改权限 public R update(@RequestBody @Valid EntrustAlterApplyDTO dto) { Boolean success = entrustAlterApplyService.update(dto); return R.ok(success).setMsg(success ? "修改成功" : "修改失败"); @@ -63,7 +63,7 @@ public class EntrustAlterApplyController { @ApiOperation(value = "审核提交委托申请修改消息", notes = "审核提交委托申请修改消息") @PutMapping("/approve") - @PreAuthorize("@pms.hasPermission('EntrustAlterApplyApprove')") // 委托申请修改消息审核权限 +// @PreAuthorize("@pms.hasPermission('EntrustAlterApplyApprove')") // 委托申请修改消息审核权限 public R approve(@RequestBody @Valid EntrustAlterApplyApproveDTO approveDTO) { Boolean success = entrustAlterApplyService.approve(approveDTO); return R.ok(success).setMsg(success ? "审核成功" : "审核失败"); @@ -71,7 +71,7 @@ public class EntrustAlterApplyController { @ApiOperation(value = "删除委托申请修改消息", notes = "删除委托申请修改消息， 只能删除为提交状态的消息") @PostMapping("/delete") - @PreAuthorize("@pms.hasPermission('EntrustAlterApplyDelete')") // 委托申请修改消息删除权限 +// @PreAuthorize("@pms.hasPermission('EntrustAlterApplyDelete')") // 委托申请修改消息删除权限 public R delete(@RequestBody List ids) { Boolean success = entrustAlterApplyService.delete(ids); return R.ok(success).setMsg(success ? "审核成功" : "审核失败"); diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java index edea73e..1e4cb76 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java @@ -12,6 +12,7 @@ import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery; import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO; import digital.laboratory.platform.entrustment.vo.EntrustmentVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,6 +23,7 @@ import java.util.List; * @createDate 2024-10-31 17:35:01 * @Entity digital.laboratory.platform.entrustment.entity.EntrustAlterApply */ +@Mapper public interface EntrustAlterApplyMapper extends BaseMapper { /** @@ -30,7 +32,7 @@ public interface EntrustAlterApplyMapper extends BaseMapper { * @param query * @return */ - IPage getEntrustAlterApplyVOPage(IPage page, EntrustAlterApplyQuery query); + IPage getEntrustAlterApplyVOPage(IPage page,@Param("query") EntrustAlterApplyQuery query); EntrustAlterApplyVO getEntrustAlterApplyVOOne(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index 116aa1d..45e696d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -90,7 +90,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpllambdaQuery().eq(EntrustAlterApply::getId, entrustAlterApply.getId())); + EntrustAlterApplyVO entrustAlterApplyVOOne = baseMapper.getEntrustAlterApplyVOOne(Wrappers.query().eq("eaa.id", entrustAlterApply.getId())); fillVOInfo(entrustAlterApplyVOOne); return entrustAlterApplyVOOne; } @@ -154,7 +154,9 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl list = this.list(Wrappers.lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId())); + List list = this.list(Wrappers.lambdaQuery() + .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId()) + .orderByAsc(EntrustmentIdentificationMaterial::getOrderNo)); entrustment.setEntrustRequirement(entrustmentService.buildEntrustReq(list)); entrustmentService.updateById(entrustment); return identificationMaterialList; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index d6f0445..a674ebf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -762,7 +762,9 @@ public class EntrustmentServiceImpl extends ServiceImpl - AND case_name LIKE CONCAT('%', #{query.keywords}, '%') + AND ce.case_name LIKE CONCAT('%', #{query.keywords}, '%') - AND applicant_id = #{query.applicant} + AND eaa.applicant_id = #{query.applicant} - AND apply_date >= #{query.startDate} + AND eaa.apply_date >= #{query.startDate} - AND apply_date <= #{query.endDate} + AND eaa.apply_date <= #{query.endDate} - AND status <= #{query.status} + AND eaa.status = #{query.status} - AND apply_org_id = #{query.clientOrgId} + AND eaa.apply_org_id = #{query.clientOrgId} - ORDER BY apply_date DESC + ORDER BY eaa.apply_date DESC