diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java new file mode 100644 index 00000000..73095fc2 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java @@ -0,0 +1,14 @@ +package com.jero.drafting.common; + +public interface DraftingConstant { + + /**审核状态 1:待审核 2:已通过 3:未通过*/ + Integer CHECK_PENDING = 1; + + /**审核状态 1:待审核 2:已通过 3:未通过*/ + Integer CHECK_PASS = 2; + + /**审核状态 1:待审核 2:已通过 3:未通过*/ + Integer CHECK_REJECTION = 3; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java index ff1c9866..5e8cca90 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java @@ -59,7 +59,7 @@ public class PayDraftingGroupController extends JeroController queryPageList(PayDraftingGroup payDraftingGroup, @@ -71,7 +71,7 @@ public class PayDraftingGroupController extends JeroController add(@RequestBody PayDraftingGroup payDraftingGroup) { @@ -142,7 +142,7 @@ public class PayDraftingGroupController extends JeroController delete(@RequestParam(name="id") String id) { @@ -159,7 +159,7 @@ public class PayDraftingGroupController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { @@ -183,8 +183,8 @@ public class PayDraftingGroupController extends JeroController copy(@RequestBody PayDraftingGroup payDraftingGroup) { if(StringUtils.isBlank(payDraftingGroup.getId())){ @@ -195,7 +195,7 @@ public class PayDraftingGroupController extends JeroController edit(@RequestBody PayDraftingGroup payDraftingGroup) { @@ -271,7 +271,7 @@ public class PayDraftingGroupController extends JeroController updatePayDraftingGroup = new LambdaUpdateWrapper<>(); -// updatePayDraftingGroup.eq(PayDraftingGroup::getId,payDraftingGroup.getId()); payDraftingGroupService.updateById(payDraftingGroup); return Result.OK("编辑成功!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index 5bf2b149..c87664ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -79,7 +79,7 @@ public class PayDraftingGroupSubItemController extends JeroController queryPageList(PayDraftingGroupSubItem payDraftingGroupSubItem, @@ -100,7 +100,7 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); @@ -115,7 +115,7 @@ public class PayDraftingGroupSubItemController extends JeroController add(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { @@ -134,7 +134,7 @@ public class PayDraftingGroupSubItemController extends JeroController delete(@RequestParam(name = "id") String id) { @@ -148,7 +148,7 @@ public class PayDraftingGroupSubItemController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { @@ -163,7 +163,7 @@ public class PayDraftingGroupSubItemController extends JeroController edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { @@ -197,7 +197,7 @@ public class PayDraftingGroupSubItemController extends JeroController importExcel(HttpServletRequest request) { @@ -230,7 +230,7 @@ public class PayDraftingGroupSubItemController extends JeroController - pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} + pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2) AND pcm.company_name LIKE concat('%',concat(#{payDraftingGroupSubItem.chargeCompanyTemporaryName},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index 493ae75d..efe83b30 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -159,7 +159,7 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl"); } LambdaQueryWrapper query = new LambdaQueryWrapper<>();