From a71bb2d7c3ae1f2c080a238d5216d18dc4155999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 1 Sep 2021 10:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/mail/common/MailBillCommon.java | 20 +++++++++ .../controller/PayMailBillController.java | 6 +-- .../PayMailBillProjectController.java | 6 +-- .../entity/PayMailBill.java | 6 +-- .../entity/PayMailBillProject.java | 2 +- .../mapper/PayMailBillMapper.java | 10 ++--- .../mapper/PayMailBillProjectMapper.java | 4 +- .../mail/mapper/xml/PayMailBillMapper.xml | 41 +++++++++++++++++++ .../mapper/xml/PayMailBillProjectMapper.xml | 0 .../service/IPayMailBillProjectService.java | 4 +- .../service/IPayMailBillService.java | 6 +-- .../impl/PayMailBillProjectServiceImpl.java | 8 ++-- .../service/impl/PayMailBillServiceImpl.java | 39 ++++++++++++++++++ .../{mailBill => mail}/vo/MailBillVO.java | 4 +- .../vue/PayMailBillList.vue | 0 .../vue/PayMailBillProjectList.vue | 0 .../vue/modules/PayMailBillForm.vue | 0 .../vue/modules/PayMailBillModal.vue | 0 .../PayMailBillModal__Style#Drawer.vue | 0 .../vue/modules/PayMailBillProjectForm.vue | 0 .../vue/modules/PayMailBillProjectModal.vue | 0 .../PayMailBillProjectModal__Style#Drawer.vue | 0 .../mailBill/mapper/xml/PayMailBillMapper.xml | 15 ------- .../service/impl/PayMailBillServiceImpl.java | 29 ------------- ...PayPayMemberProjectSubitemServiceImpl.java | 10 ++--- .../PayPaymentRecordController.java | 6 +-- .../entity/PayPaymentRecord.java | 2 +- .../mapper/PayPaymentRecordMapper.java | 4 +- .../mapper/xml/PayPaymentRecordMapper.xml | 2 +- .../service/IPayPaymentRecordService.java | 4 +- .../impl/PayPaymentRecordServiceImpl.java | 8 ++-- .../vue/PayPaymentRecordList.vue | 0 .../vue/modules/PayPaymentRecordForm.vue | 0 .../vue/modules/PayPaymentRecordModal.vue | 0 .../PayPaymentRecordModal__Style#Drawer.vue | 0 .../jero/project/common/PayProjectCommon.java | 17 ++++++++ .../PayCommonProjectController.java | 21 ++++++---- .../controller/PayWorkingGroupController.java | 33 +++++++++++++-- .../jero/project/entity/PayWorkingGroup.java | 6 +-- .../project/mapper/PayWorkingGroupMapper.java | 3 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 1 - .../impl/PayWorkingGroupServiceImpl.java | 2 +- ...yCompanyManagementTemporaryController.java | 6 +-- ...ContactsManagementTemporaryController.java | 6 +-- .../entity/PayCompanyManagementTemporary.java | 2 +- .../PayContactsManagementTemporary.java | 2 +- .../PayCompanyManagementTemporaryMapper.java | 4 +- .../PayContactsManagementTemporaryMapper.java | 4 +- .../PayCompanyManagementTemporaryMapper.xml | 2 +- .../PayContactsManagementTemporaryMapper.xml | 2 +- ...IPayCompanyManagementTemporaryService.java | 4 +- ...PayContactsManagementTemporaryService.java | 4 +- ...CompanyManagementTemporaryServiceImpl.java | 10 ++--- ...ontactsManagementTemporaryServiceImpl.java | 11 ++--- .../vue/PayCompanyManagementTemporaryList.vue | 0 .../PayContactsManagementTemporaryList.vue | 0 .../PayCompanyManagementTemporaryForm.vue | 0 .../PayCompanyManagementTemporaryModal.vue | 0 ...ManagementTemporaryModal__Style#Drawer.vue | 0 .../PayContactsManagementTemporaryForm.vue | 0 .../PayContactsManagementTemporaryModal.vue | 0 ...ManagementTemporaryModal__Style#Drawer.vue | 0 62 files changed, 238 insertions(+), 138 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/common/MailBillCommon.java rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/controller/PayMailBillController.java (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/controller/PayMailBillProjectController.java (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/entity/PayMailBill.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/entity/PayMailBillProject.java (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/mapper/PayMailBillMapper.java (62%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/mapper/PayMailBillProjectMapper.java (74%) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/mapper/xml/PayMailBillProjectMapper.xml (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/service/IPayMailBillProjectService.java (74%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/service/IPayMailBillService.java (81%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/service/impl/PayMailBillProjectServiceImpl.java (64%) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vo/MailBillVO.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/PayMailBillList.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/PayMailBillProjectList.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillForm.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillModal.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillModal__Style#Drawer.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillProjectForm.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillProjectModal.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{mailBill => mail}/vue/modules/PayMailBillProjectModal__Style#Drawer.vue (100%) delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/controller/PayPaymentRecordController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/entity/PayPaymentRecord.java (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/mapper/PayPaymentRecordMapper.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/mapper/xml/PayPaymentRecordMapper.xml (67%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/service/IPayPaymentRecordService.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/service/impl/PayPaymentRecordServiceImpl.java (62%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/vue/PayPaymentRecordList.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/vue/modules/PayPaymentRecordForm.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/vue/modules/PayPaymentRecordModal.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{paymentRecord => payment}/vue/modules/PayPaymentRecordModal__Style#Drawer.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/controller/PayCompanyManagementTemporaryController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/controller/PayContactsManagementTemporaryController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/entity/PayCompanyManagementTemporary.java (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/entity/PayContactsManagementTemporary.java (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/mapper/PayCompanyManagementTemporaryMapper.java (71%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/mapper/PayContactsManagementTemporaryMapper.java (71%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/mapper/xml/PayCompanyManagementTemporaryMapper.xml (63%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/mapper/xml/PayContactsManagementTemporaryMapper.xml (63%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/service/IPayCompanyManagementTemporaryService.java (83%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/service/IPayContactsManagementTemporaryService.java (83%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/service/impl/PayCompanyManagementTemporaryServiceImpl.java (86%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/service/impl/PayContactsManagementTemporaryServiceImpl.java (83%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/PayCompanyManagementTemporaryList.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/PayContactsManagementTemporaryList.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayCompanyManagementTemporaryForm.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayCompanyManagementTemporaryModal.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayContactsManagementTemporaryForm.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayContactsManagementTemporaryModal.vue (100%) rename jero-boot-incoming-payment/src/main/java/com/jero/{companyTemporary => temporary}/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue (100%) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/common/MailBillCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/common/MailBillCommon.java new file mode 100644 index 00000000..d7b4b7e5 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/common/MailBillCommon.java @@ -0,0 +1,20 @@ +package com.jero.mail.common; + +public class MailBillCommon { + /** + * 普通项目 + */ + public final static String PROJECT_TYPE1 = "1"; + /** + * + */ + public final static String PROJECT_TYPE2 = "2"; + /** + * + */ + public final static String PROJECT_TYPE3 = "3"; + /** + * + */ + public final static String PROJECT_TYPE4 = "4"; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index b5a30dc9..99e9a6cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -1,4 +1,4 @@ -package com.jero.mailBill.controller; +package com.jero.mail.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -11,8 +11,8 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.mailBill.entity.PayMailBill; -import com.jero.mailBill.service.IPayMailBillService; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.service.IPayMailBillService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillProjectController.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillProjectController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillProjectController.java index 6c1b0581..4db493d1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillProjectController.java @@ -1,4 +1,4 @@ -package com.jero.mailBill.controller; +package com.jero.mail.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -11,9 +11,9 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.mailBill.entity.PayMailBillProject; +import com.jero.mail.entity.PayMailBillProject; -import com.jero.mailBill.service.IPayMailBillProjectService; +import com.jero.mail.service.IPayMailBillProjectService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBill.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 111a8026..6b376c98 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -1,4 +1,4 @@ -package com.jero.mailBill.entity; +package com.jero.mail.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; @@ -66,13 +66,13 @@ public class PayMailBill implements Serializable { /**快递单号*/ @Excel(name = "快递单号", width = 15) @ApiModelProperty(value = "快递单号") - private java.lang.String postno; + private java.lang.String postNo; /**邮寄时间*/ @Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "邮寄时间") - private java.util.Date senddate; + private java.util.Date sendDate; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBillProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBillProject.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java index 73b682a7..a26d0f5e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBillProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java @@ -1,4 +1,4 @@ -package com.jero.mailBill.entity; +package com.jero.mail.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index 1da3cec5..a6eeb72a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -1,9 +1,10 @@ -package com.jero.mailBill.mapper; +package com.jero.mail.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.mailBill.entity.PayMailBill; -import com.jero.mailBill.vo.MailBillVO; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.vo.MailBillVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,10 +20,9 @@ public interface PayMailBillMapper extends BaseMapper { * @Author lqt * @Date 2021/8/31 * @Param projectId 项目id - * @Param projectType 项目类型 * @Return * @Exception */ - List selectMailBillVO(String projectId, String projectType); + List selectCommonProjectMailBillVO(@Param("projectId") String projectId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java similarity index 74% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillProjectMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java index 00f2fdb3..44f9ed02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java @@ -1,7 +1,7 @@ -package com.jero.mailBill.mapper; +package com.jero.mail.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.mailBill.entity.PayMailBillProject; +import com.jero.mail.entity.PayMailBillProject; /** * @Description: pay_mail_bill_project diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml new file mode 100644 index 00000000..c279d38a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillProjectMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillProjectService.java similarity index 74% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillProjectService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillProjectService.java index 9eb81de6..f7cf4a92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillProjectService.java @@ -1,8 +1,8 @@ -package com.jero.mailBill.service; +package com.jero.mail.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.mailBill.entity.PayMailBillProject; +import com.jero.mail.entity.PayMailBillProject; /** * @Description: pay_mail_bill_project diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java similarity index 81% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 8bd2f1ca..7e22f308 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -1,8 +1,8 @@ -package com.jero.mailBill.service; +package com.jero.mail.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.mailBill.entity.PayMailBill; -import com.jero.mailBill.vo.MailBillVO; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.vo.MailBillVO; import java.util.List; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillProjectServiceImpl.java similarity index 64% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillProjectServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillProjectServiceImpl.java index f4ea1bf3..49fda4e8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillProjectServiceImpl.java @@ -1,9 +1,9 @@ -package com.jero.mailBill.service.impl; +package com.jero.mail.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.mailBill.entity.PayMailBillProject; -import com.jero.mailBill.mapper.PayMailBillProjectMapper; -import com.jero.mailBill.service.IPayMailBillProjectService; +import com.jero.mail.entity.PayMailBillProject; +import com.jero.mail.mapper.PayMailBillProjectMapper; +import com.jero.mail.service.IPayMailBillProjectService; import org.springframework.stereotype.Service; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java new file mode 100644 index 00000000..dcfb559b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -0,0 +1,39 @@ +package com.jero.mail.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.mail.common.MailBillCommon; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.mapper.PayMailBillMapper; +import com.jero.mail.service.IPayMailBillService; +import com.jero.mail.vo.MailBillVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: pay_mail_bill + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Service +public class PayMailBillServiceImpl extends ServiceImpl implements IPayMailBillService { + + @Resource + private PayMailBillMapper payMailBillMapper; + + @Override + public List selectMailBillVO(String projectId, String projectType) { + List list = new ArrayList<>(); + switch (projectType){ + case MailBillCommon.PROJECT_TYPE1: list = payMailBillMapper.selectCommonProjectMailBillVO(projectId);break; + case MailBillCommon.PROJECT_TYPE2:break; + case MailBillCommon.PROJECT_TYPE3:break; + case MailBillCommon.PROJECT_TYPE4:break; + default:break; + } + return list; + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vo/MailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vo/MailBillVO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java index 30b50f69..532f8696 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vo/MailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillVO.java @@ -1,6 +1,6 @@ -package com.jero.mailBill.vo; +package com.jero.mail.vo; -import com.jero.mailBill.entity.PayMailBill; +import com.jero.mail.entity.PayMailBill; import java.io.Serializable; import java.util.List; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillList.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillList.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillProjectList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillProjectList.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/PayMailBillProjectList.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillForm.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillForm.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal__Style#Drawer.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillModal__Style#Drawer.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectForm.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectForm.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal__Style#Drawer.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vue/modules/PayMailBillProjectModal__Style#Drawer.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml deleted file mode 100644 index 18d05d42..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java deleted file mode 100644 index ca007a83..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.mailBill.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.mailBill.entity.PayMailBill; -import com.jero.mailBill.mapper.PayMailBillMapper; -import com.jero.mailBill.service.IPayMailBillService; -import com.jero.mailBill.vo.MailBillVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Description: pay_mail_bill - * @Author: jeecg-boot - * @Date: 2021-08-31 - * @Version: V1.0 - */ -@Service -public class PayMailBillServiceImpl extends ServiceImpl implements IPayMailBillService { - - @Resource - private PayMailBillMapper payMailBillMapper; - - @Override - public List selectMailBillVO(String projectId, String projectType) { - return payMailBillMapper.selectMailBillVO(projectId,projectType); - } -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 0783c1b1..9cbf7c98 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -1,16 +1,14 @@ package com.jero.member.service.impl; -import java.util.Date; import com.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; -import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; -import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; -import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.member.entity.PayMemberProject; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/controller/PayPaymentRecordController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 54d11f54..8b4e047c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -1,4 +1,4 @@ -package com.jero.paymentRecord.controller; +package com.jero.payment.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -10,8 +10,8 @@ import com.jero.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.paymentRecord.entity.PayPaymentRecord; -import com.jero.paymentRecord.service.IPayPaymentRecordService; +import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.service.IPayPaymentRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/entity/PayPaymentRecord.java rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index efc5f0fe..1773d40d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -1,4 +1,4 @@ -package com.jero.paymentRecord.entity; +package com.jero.payment.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/PayPaymentRecordMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index 4445a188..c09f611e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -1,7 +1,7 @@ -package com.jero.paymentRecord.mapper; +package com.jero.payment.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.paymentRecord.entity.PayPaymentRecord; +import com.jero.payment.entity.PayPaymentRecord; /** * @Description: pay_payment_record diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml similarity index 67% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index bb89e98a..c38a1df7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/IPayPaymentRecordService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index b267dd61..a5501ef0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -1,7 +1,7 @@ -package com.jero.paymentRecord.service; +package com.jero.payment.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.paymentRecord.entity.PayPaymentRecord; +import com.jero.payment.entity.PayPaymentRecord; /** * @Description: pay_payment_record diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 8c38b927..53307959 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1,9 +1,9 @@ -package com.jero.paymentRecord.service.impl; +package com.jero.payment.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.paymentRecord.entity.PayPaymentRecord; -import com.jero.paymentRecord.mapper.PayPaymentRecordMapper; -import com.jero.paymentRecord.service.IPayPaymentRecordService; +import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.mapper.PayPaymentRecordMapper; +import com.jero.payment.service.IPayPaymentRecordService; import org.springframework.stereotype.Service; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/PayPaymentRecordList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/PayPaymentRecordList.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/PayPaymentRecordList.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordForm.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordForm.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal__Style#Drawer.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/payment/vue/modules/PayPaymentRecordModal__Style#Drawer.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index e5cf88e6..b802f7ba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -47,4 +47,21 @@ public class PayProjectCommon { */ public final static Integer MAIL2 = 2; + /** + * 普通项目 + */ + public final static String PROJECT_TYPE1 = "1"; + /** + * + */ + public final static String PROJECT_TYPE2 = "2"; + /** + * + */ + public final static String PROJECT_TYPE3 = "3"; + /** + * + */ + public final static String PROJECT_TYPE4 = "4"; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 3d81a411..08ec568d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -12,20 +12,22 @@ import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; +import com.jero.mail.service.IPayMailBillService; +import com.jero.mail.vo.MailBillVO; import com.jero.project.common.PayProjectCommon; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; -import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; -import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.paymentRecord.entity.PayPaymentRecord; -import com.jero.paymentRecord.service.IPayPaymentRecordService; +import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.service.IPayPaymentRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -56,6 +58,8 @@ public class PayCommonProjectController extends JeroController payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord); json.put("payPaymentRecord",payPaymentRecordList); - // todo 开票邮寄记录 - // json.put("payPaymentRecord",payPaymentRecordList); + // 开票邮寄记录 + List listMailBillVO = payMailBillService.selectMailBillVO(payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1); + json.put("mailBill",listMailBillVO); return Result.OK(json); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index f809b6e2..1f8df91c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -3,6 +3,7 @@ package com.jero.project.controller; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,6 +13,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; +import com.jero.project.entity.PayWorkingGroupSubitem; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.project.service.IPayWorkingGroupSubitemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -43,6 +46,8 @@ public class PayWorkingGroupController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = payWorkingGroupService.page(page, queryWrapper); - if(!CollectionUtils.isEmpty(pageList.getRecords())){ - List list = pageList.getRecords(); + if(!Objects.isNull(pageList)){ + List listPayWorkingGroup = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayWorkingGroup)){ + listPayWorkingGroup.forEach(p->{ + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayWorkingGroupSubitem::getWorkingGroupId,p.getId()); + List listPayWorkingGroupSubitem = payWorkingGroupSubitemService.list(query); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubitem)){ + // 已付全款 + List listAllPayment = listPayWorkingGroupSubitem.stream() + .filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList()); + p.setAllPayment(listAllPayment.size()); + // 部分付款 + List listPartPayment = listPayWorkingGroupSubitem.stream() + .filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList()); + p.setPartPayment(listPartPayment.size()); + // 未付款 + List listNotPayment = listPayWorkingGroupSubitem.stream() + .filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 ) + .collect(Collectors.toList()); + p.setNotPayment(listNotPayment.size()); + } + }); + } } return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index c09c3e3c..48219390 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -116,13 +116,13 @@ public class PayWorkingGroup implements Serializable { /** * 已付全款 */ - private String allPayment; + private Integer allPayment; /** * 部分付款 */ - private String partPayment; + private Integer partPayment; /** * 未付款 */ - private String notPayment; + private Integer notPayment; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 2ddbf284..5aa09cca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -1,7 +1,10 @@ package com.jero.project.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: pay_working_group diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 43808909..eb501170 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 9b378ab7..6f05ce11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + /** * @Description: pay_working_group * @Author: jeecg-boot @@ -15,5 +16,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class PayWorkingGroupServiceImpl extends ServiceImpl implements IPayWorkingGroupService { - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayCompanyManagementTemporaryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayCompanyManagementTemporaryController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayCompanyManagementTemporaryController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayCompanyManagementTemporaryController.java index a46c314a..3cc5d7da 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayCompanyManagementTemporaryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayCompanyManagementTemporaryController.java @@ -1,4 +1,4 @@ -package com.jero.companyTemporary.controller; +package com.jero.temporary.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; -import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayContactsManagementTemporaryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayContactsManagementTemporaryController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java index 4ee83aaa..200b4657 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayContactsManagementTemporaryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java @@ -1,4 +1,4 @@ -package com.jero.companyTemporary.controller; +package com.jero.temporary.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; -import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayCompanyManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayCompanyManagementTemporary.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java index bb0b378c..043e037b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayCompanyManagementTemporary.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayCompanyManagementTemporary.java @@ -1,4 +1,4 @@ -package com.jero.companyTemporary.entity; +package com.jero.temporary.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java index 6dfe6a97..a3f345aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/entity/PayContactsManagementTemporary.java @@ -1,4 +1,4 @@ -package com.jero.companyTemporary.entity; +package com.jero.temporary.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayCompanyManagementTemporaryMapper.java similarity index 71% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayCompanyManagementTemporaryMapper.java index 44149cbc..c19620c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayCompanyManagementTemporaryMapper.java @@ -1,8 +1,8 @@ -package com.jero.companyTemporary.mapper; +package com.jero.temporary.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayCompanyManagementTemporary; /** * @Description: pay_company_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayContactsManagementTemporaryMapper.java similarity index 71% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayContactsManagementTemporaryMapper.java index 631760e3..4728594a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/PayContactsManagementTemporaryMapper.java @@ -1,8 +1,8 @@ -package com.jero.companyTemporary.mapper; +package com.jero.temporary.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; /** * @Description: pay_contacts_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml similarity index 63% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml index f5dc8cc9..1895adc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayContactsManagementTemporaryMapper.xml similarity index 63% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayContactsManagementTemporaryMapper.xml index e1b31c83..88d63fae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/mapper/xml/PayContactsManagementTemporaryMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayCompanyManagementTemporaryService.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java similarity index 83% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayCompanyManagementTemporaryService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java index 7c9e4cbb..ffd7ac3c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayCompanyManagementTemporaryService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java @@ -1,8 +1,8 @@ -package com.jero.companyTemporary.service; +package com.jero.temporary.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayCompanyManagementTemporary; /** * @Description: pay_company_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayContactsManagementTemporaryService.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java similarity index 83% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayContactsManagementTemporaryService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java index 22c353aa..8c3aa0b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayContactsManagementTemporaryService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java @@ -1,8 +1,8 @@ -package com.jero.companyTemporary.service; +package com.jero.temporary.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; /** * @Description: pay_contacts_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java similarity index 86% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java index 230e8eda..6ec19616 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -1,21 +1,19 @@ -package com.jero.companyTemporary.service.impl; +package com.jero.temporary.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.service.IPayCompanyManagementService; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; -import com.jero.companyTemporary.mapper.PayCompanyManagementTemporaryMapper; -import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Objects; -import java.util.UUID; /** * @Description: pay_company_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java similarity index 83% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java index fae35476..375a70b4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java @@ -1,22 +1,19 @@ -package com.jero.companyTemporary.service.impl; +package com.jero.temporary.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; -import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; -import com.jero.companyTemporary.entity.PayContactsManagementTemporary; -import com.jero.companyTemporary.mapper.PayContactsManagementTemporaryMapper; -import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.mapper.PayContactsManagementTemporaryMapper; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Objects; -import java.util.UUID; /** * @Description: pay_contacts_management_temporary diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayCompanyManagementTemporaryList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayCompanyManagementTemporaryList.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayCompanyManagementTemporaryList.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayCompanyManagementTemporaryList.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayContactsManagementTemporaryList.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayContactsManagementTemporaryList.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayContactsManagementTemporaryList.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/PayContactsManagementTemporaryList.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryForm.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryForm.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryForm.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryForm.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryForm.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal.vue diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue similarity index 100% rename from jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue rename to jero-boot-incoming-payment/src/main/java/com/jero/temporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue