From f9c3bef612238ffb20f7e4a0bdcb7b14fa64531b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 31 Aug 2021 17:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E7=A5=A8=E9=82=AE?= =?UTF-8?q?=E5=AF=84=EF=BC=8C=E5=8C=85=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CompanyManagementTemporaryServiceImpl.java | 1 + ...ontactsManagementTemporaryServiceImpl.java | 1 + .../controller/PayMailBillController.java | 155 +++++++++++++ .../PayMailBillProjectController.java | 156 +++++++++++++ .../com/jero/mailBill/entity/PayMailBill.java | 80 +++++++ .../mailBill/entity/PayMailBillProject.java | 44 ++++ .../mailBill/mapper/PayMailBillMapper.java | 15 ++ .../mapper/PayMailBillProjectMapper.java | 14 ++ .../mailBill/mapper/xml/PayMailBillMapper.xml | 5 + .../mapper/xml/PayMailBillProjectMapper.xml | 5 + .../service/IPayMailBillProjectService.java | 15 ++ .../mailBill/service/IPayMailBillService.java | 25 +++ .../impl/PayMailBillProjectServiceImpl.java | 18 ++ .../service/impl/PayMailBillServiceImpl.java | 29 +++ .../java/com/jero/mailBill/vo/MailBillVO.java | 13 ++ .../com/jero/mailBill/vue/PayMailBillList.vue | 210 ++++++++++++++++++ .../mailBill/vue/PayMailBillProjectList.vue | 183 +++++++++++++++ .../mailBill/vue/modules/PayMailBillForm.vue | 134 +++++++++++ .../mailBill/vue/modules/PayMailBillModal.vue | 60 +++++ .../PayMailBillModal__Style#Drawer.vue | 84 +++++++ .../vue/modules/PayMailBillProjectForm.vue | 114 ++++++++++ .../vue/modules/PayMailBillProjectModal.vue | 60 +++++ .../PayMailBillProjectModal__Style#Drawer.vue | 84 +++++++ .../PayPaymentRecordController.java | 148 ++++++++++++ .../entity/PayPaymentRecord.java | 68 ++++++ .../mapper/PayPaymentRecordMapper.java | 14 ++ .../mapper/xml/PayPaymentRecordMapper.xml | 5 + .../service/IPayPaymentRecordService.java | 14 ++ .../impl/PayPaymentRecordServiceImpl.java | 18 ++ .../vue/PayPaymentRecordList.vue | 192 ++++++++++++++++ .../vue/modules/PayPaymentRecordForm.vue | 119 ++++++++++ .../vue/modules/PayPaymentRecordModal.vue | 60 +++++ .../PayPaymentRecordModal__Style#Drawer.vue | 84 +++++++ .../common/PayProjectCommon.java | 30 +-- .../PayCommonProjectController.java | 43 +++- .../controller/PayWorkingGroupController.java | 7 +- .../PayWorkingGroupSubitemController.java | 6 +- .../entity/PayCommonProject.java | 6 +- .../entity/PayWorkingGroup.java | 2 +- .../entity/PayWorkingGroupSubitem.java | 6 +- .../mapper/PayCommonProjectMapper.java | 4 +- .../mapper/PayWorkingGroupMapper.java | 4 +- .../mapper/PayWorkingGroupSubitemMapper.java | 4 +- .../mapper/xml/PayCommonProjectMapper.xml | 8 +- .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../xml/PayWorkingGroupSubitemMapper.xml | 2 +- .../service/IPayCommonProjectService.java | 4 +- .../service/IPayWorkingGroupService.java | 4 +- .../IPayWorkingGroupSubitemService.java | 4 +- .../impl/PayCommonProjectServiceImpl.java | 8 +- .../impl/PayWorkingGroupServiceImpl.java | 8 +- .../PayWorkingGroupSubitemServiceImpl.java | 8 +- 52 files changed, 2316 insertions(+), 71 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBill.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBillProject.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillProjectServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vo/MailBillVO.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillList.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillProjectList.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillForm.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal__Style#Drawer.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectForm.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal__Style#Drawer.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/controller/PayPaymentRecordController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/entity/PayPaymentRecord.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/PayPaymentRecordMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/IPayPaymentRecordService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/PayPaymentRecordList.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordForm.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal__Style#Drawer.vue rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/common/PayProjectCommon.java (56%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/controller/PayCommonProjectController.java (87%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/controller/PayWorkingGroupController.java (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/controller/PayWorkingGroupSubitemController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/entity/PayCommonProject.java (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/entity/PayWorkingGroup.java (99%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/entity/PayWorkingGroupSubitem.java (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/PayCommonProjectMapper.java (89%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/PayWorkingGroupMapper.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/PayWorkingGroupSubitemMapper.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/xml/PayCommonProjectMapper.xml (92%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/xml/PayWorkingGroupMapper.xml (68%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/mapper/xml/PayWorkingGroupSubitemMapper.xml (66%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/IPayCommonProjectService.java (86%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/IPayWorkingGroupService.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/IPayWorkingGroupSubitemService.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/impl/PayCommonProjectServiceImpl.java (79%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/impl/PayWorkingGroupServiceImpl.java (62%) rename jero-boot-incoming-payment/src/main/java/com/jero/{commonProject => project}/service/impl/PayWorkingGroupSubitemServiceImpl.java (62%) 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/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java index d8682e31..230e8eda 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/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -50,6 +50,7 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl { + @Autowired + private IPayMailBillService payMailBillService; + + /** + * 分页列表查询 + * + * @param payMailBill + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_mail_bill-分页列表查询") + @ApiOperation(value="pay_mail_bill-分页列表查询", notes="pay_mail_bill-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayMailBill payMailBill, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMailBill, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payMailBillService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payMailBill + * @return + */ + @AutoLog(value = "pay_mail_bill-添加") + @ApiOperation(value="pay_mail_bill-添加", notes="pay_mail_bill-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayMailBill payMailBill) { + payMailBillService.save(payMailBill); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payMailBill + * @return + */ + @AutoLog(value = "pay_mail_bill-编辑") + @ApiOperation(value="pay_mail_bill-编辑", notes="pay_mail_bill-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayMailBill payMailBill) { + payMailBillService.updateById(payMailBill); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_mail_bill-通过id删除") + @ApiOperation(value="pay_mail_bill-通过id删除", notes="pay_mail_bill-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payMailBillService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_mail_bill-批量删除") + @ApiOperation(value="pay_mail_bill-批量删除", notes="pay_mail_bill-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payMailBillService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_mail_bill-通过id查询") + @ApiOperation(value="pay_mail_bill-通过id查询", notes="pay_mail_bill-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayMailBill payMailBill = payMailBillService.getById(id); + if(payMailBill==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMailBill); + } + + /** + * 导出excel + * + * @param request + * @param payMailBill + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMailBill payMailBill) { + return super.exportXls(request, payMailBill, PayMailBill.class, "pay_mail_bill"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayMailBill.class); + } + +} 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/mailBill/controller/PayMailBillProjectController.java new file mode 100644 index 00000000..6c1b0581 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/controller/PayMailBillProjectController.java @@ -0,0 +1,156 @@ +package com.jero.mailBill.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.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.mailBill.service.IPayMailBillProjectService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_mail_bill_project + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Api(tags="pay_mail_bill_project") +@RestController +@RequestMapping("/mailBill/payMailBillProject") +@Slf4j +public class PayMailBillProjectController extends JeroController { + @Autowired + private IPayMailBillProjectService payMailBillProjectService; + + /** + * 分页列表查询 + * + * @param payMailBillProject + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_mail_bill_project-分页列表查询") + @ApiOperation(value="pay_mail_bill_project-分页列表查询", notes="pay_mail_bill_project-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayMailBillProject payMailBillProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMailBillProject, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payMailBillProjectService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payMailBillProject + * @return + */ + @AutoLog(value = "pay_mail_bill_project-添加") + @ApiOperation(value="pay_mail_bill_project-添加", notes="pay_mail_bill_project-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayMailBillProject payMailBillProject) { + payMailBillProjectService.save(payMailBillProject); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payMailBillProject + * @return + */ + @AutoLog(value = "pay_mail_bill_project-编辑") + @ApiOperation(value="pay_mail_bill_project-编辑", notes="pay_mail_bill_project-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayMailBillProject payMailBillProject) { + payMailBillProjectService.updateById(payMailBillProject); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_mail_bill_project-通过id删除") + @ApiOperation(value="pay_mail_bill_project-通过id删除", notes="pay_mail_bill_project-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payMailBillProjectService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_mail_bill_project-批量删除") + @ApiOperation(value="pay_mail_bill_project-批量删除", notes="pay_mail_bill_project-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payMailBillProjectService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_mail_bill_project-通过id查询") + @ApiOperation(value="pay_mail_bill_project-通过id查询", notes="pay_mail_bill_project-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayMailBillProject payMailBillProject = payMailBillProjectService.getById(id); + if(payMailBillProject==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMailBillProject); + } + + /** + * 导出excel + * + * @param request + * @param payMailBillProject + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMailBillProject payMailBillProject) { + return super.exportXls(request, payMailBillProject, PayMailBillProject.class, "pay_mail_bill_project"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayMailBillProject.class); + } + +} 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/mailBill/entity/PayMailBill.java new file mode 100644 index 00000000..111a8026 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBill.java @@ -0,0 +1,80 @@ +package com.jero.mailBill.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_mail_bill + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Data +@TableName("pay_mail_bill") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_mail_bill对象", description="pay_mail_bill") +public class PayMailBill implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**票号*/ + @Excel(name = "票号", width = 15) + @ApiModelProperty(value = "票号") + private java.lang.String billNo; + /**开票金额*/ + @Excel(name = "开票金额", width = 15) + @ApiModelProperty(value = "开票金额") + private java.lang.Integer invoiceAmount; + /**邮寄状态(0:未邮寄，1::已邮寄)*/ + @Excel(name = "邮寄状态(0:未邮寄，1::已邮寄)", width = 15) + @ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)") + private java.lang.Integer postStatus; + /**快递公司(1:EMS,2:顺丰)*/ + @Excel(name = "快递公司(1:EMS,2:顺丰)", width = 15) + @ApiModelProperty(value = "快递公司(1:EMS,2:顺丰)") + private java.lang.Integer sendMethod; + /**快递单号*/ + @Excel(name = "快递单号", width = 15) + @ApiModelProperty(value = "快递单号") + 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; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; +} 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/mailBill/entity/PayMailBillProject.java new file mode 100644 index 00000000..73b682a7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/entity/PayMailBillProject.java @@ -0,0 +1,44 @@ +package com.jero.mailBill.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_mail_bill_project + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Data +@TableName("pay_mail_bill_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_mail_bill_project对象", description="pay_mail_bill_project") +public class PayMailBillProject implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**票据id*/ + @Excel(name = "票据id", width = 15) + @ApiModelProperty(value = "票据id") + private java.lang.String billId; + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**项目类型*/ + @Excel(name = "项目类型", width = 15) + @ApiModelProperty(value = "项目类型") + private java.lang.Integer projectType; +} 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/mailBill/mapper/PayMailBillMapper.java new file mode 100644 index 00000000..25f0b47f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillMapper.java @@ -0,0 +1,15 @@ +package com.jero.mailBill.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.mailBill.entity.PayMailBill; + +/** + * @Description: pay_mail_bill + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface PayMailBillMapper extends BaseMapper { + +} 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/mailBill/mapper/PayMailBillProjectMapper.java new file mode 100644 index 00000000..00f2fdb3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/PayMailBillProjectMapper.java @@ -0,0 +1,14 @@ +package com.jero.mailBill.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.mailBill.entity.PayMailBillProject; + +/** + * @Description: pay_mail_bill_project + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface PayMailBillProjectMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..9665762a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillMapper.xml @@ -0,0 +1,5 @@ + + + + + \ 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/mailBill/mapper/xml/PayMailBillProjectMapper.xml new file mode 100644 index 00000000..38d35073 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/mapper/xml/PayMailBillProjectMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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/mailBill/service/IPayMailBillProjectService.java new file mode 100644 index 00000000..9eb81de6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillProjectService.java @@ -0,0 +1,15 @@ +package com.jero.mailBill.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.mailBill.entity.PayMailBillProject; + +/** + * @Description: pay_mail_bill_project + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface IPayMailBillProjectService extends IService { + +} 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/mailBill/service/IPayMailBillService.java new file mode 100644 index 00000000..2abd9b69 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/IPayMailBillService.java @@ -0,0 +1,25 @@ +package com.jero.mailBill.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.mailBill.entity.PayMailBill; +import com.jero.mailBill.vo.MailBillVO; + +/** + * @Description: pay_mail_bill + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface IPayMailBillService extends IService { + /** + * @Description + * @Author lqt + * @Date 2021/8/31 + * @Param projectId 项目id + * @Param projectType 项目类型 + * @Return + * @Exception + */ + MailBillVO selectMailBillVO(String projectId,String projectType); + +} 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/mailBill/service/impl/PayMailBillProjectServiceImpl.java new file mode 100644 index 00000000..f4ea1bf3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillProjectServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.mailBill.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 org.springframework.stereotype.Service; + +/** + * @Description: pay_mail_bill_project + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Service +public class PayMailBillProjectServiceImpl extends ServiceImpl implements IPayMailBillProjectService { + +} 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 new file mode 100644 index 00000000..ef6d3c02 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/service/impl/PayMailBillServiceImpl.java @@ -0,0 +1,29 @@ +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; + +/** + * @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 MailBillVO selectMailBillVO(String projectId, String projectType) { + + return null; + } +} 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/mailBill/vo/MailBillVO.java new file mode 100644 index 00000000..30b50f69 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vo/MailBillVO.java @@ -0,0 +1,13 @@ +package com.jero.mailBill.vo; + +import com.jero.mailBill.entity.PayMailBill; +import java.io.Serializable; +import java.util.List; + +public class MailBillVO extends PayMailBill implements Serializable{ + /** + * 项目名称 + */ + private List 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/mailBill/vue/PayMailBillList.vue new file mode 100644 index 00000000..2f7c2379 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillList.vue @@ -0,0 +1,210 @@ + + + + \ No newline at end of file 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/mailBill/vue/PayMailBillProjectList.vue new file mode 100644 index 00000000..91535658 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/PayMailBillProjectList.vue @@ -0,0 +1,183 @@ + + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillForm.vue new file mode 100644 index 00000000..c9549965 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillModal.vue new file mode 100644 index 00000000..6f26f767 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillModal__Style#Drawer.vue new file mode 100644 index 00000000..43f6ada0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillProjectForm.vue new file mode 100644 index 00000000..5d9e1401 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillProjectModal.vue new file mode 100644 index 00000000..32a6222b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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/mailBill/vue/modules/PayMailBillProjectModal__Style#Drawer.vue new file mode 100644 index 00000000..3d4cc14c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mailBill/vue/modules/PayMailBillProjectModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file 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/paymentRecord/controller/PayPaymentRecordController.java new file mode 100644 index 00000000..54d11f54 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/controller/PayPaymentRecordController.java @@ -0,0 +1,148 @@ +package com.jero.paymentRecord.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +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 lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_payment_record + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Api(tags="pay_payment_record") +@RestController +@RequestMapping("/paymentRecord/payPaymentRecord") +@Slf4j +public class PayPaymentRecordController extends JeroController { + @Autowired + private IPayPaymentRecordService payPaymentRecordService; + + /** + * 分页列表查询 + * + * @param payPaymentRecord + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="pay_payment_record-分页列表查询", notes="pay_payment_record-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayPaymentRecord payPaymentRecord, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payPaymentRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payPaymentRecordService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payPaymentRecord + * @return + */ + @ApiOperation(value="pay_payment_record-添加", notes="pay_payment_record-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayPaymentRecord payPaymentRecord) { + payPaymentRecordService.save(payPaymentRecord); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payPaymentRecord + * @return + */ + @ApiOperation(value="pay_payment_record-编辑", notes="pay_payment_record-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayPaymentRecord payPaymentRecord) { + payPaymentRecordService.updateById(payPaymentRecord); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="pay_payment_record-通过id删除", notes="pay_payment_record-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payPaymentRecordService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="pay_payment_record-批量删除", notes="pay_payment_record-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payPaymentRecordService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="pay_payment_record-通过id查询", notes="pay_payment_record-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayPaymentRecord payPaymentRecord = payPaymentRecordService.getById(id); + if(payPaymentRecord==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payPaymentRecord); + } + + /** + * 导出excel + * + * @param request + * @param payPaymentRecord + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayPaymentRecord payPaymentRecord) { + return super.exportXls(request, payPaymentRecord, PayPaymentRecord.class, "pay_payment_record"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayPaymentRecord.class); + } + +} 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/paymentRecord/entity/PayPaymentRecord.java new file mode 100644 index 00000000..efc5f0fe --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/entity/PayPaymentRecord.java @@ -0,0 +1,68 @@ +package com.jero.paymentRecord.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_payment_record + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Data +@TableName("pay_payment_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_payment_record对象", description="pay_payment_record") +public class PayPaymentRecord implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**到账金额*/ + @Excel(name = "到账金额", width = 15) + @ApiModelProperty(value = "到账金额") + private java.lang.Integer amountReceived; + /**来款日期*/ + @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 paymentDate; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; +} 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/paymentRecord/mapper/PayPaymentRecordMapper.java new file mode 100644 index 00000000..4445a188 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/PayPaymentRecordMapper.java @@ -0,0 +1,14 @@ +package com.jero.paymentRecord.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.paymentRecord.entity.PayPaymentRecord; + +/** + * @Description: pay_payment_record + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface PayPaymentRecordMapper extends BaseMapper { + +} 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/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml new file mode 100644 index 00000000..bb89e98a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/mapper/xml/PayPaymentRecordMapper.xml @@ -0,0 +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/paymentRecord/service/IPayPaymentRecordService.java new file mode 100644 index 00000000..b267dd61 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/IPayPaymentRecordService.java @@ -0,0 +1,14 @@ +package com.jero.paymentRecord.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.paymentRecord.entity.PayPaymentRecord; + +/** + * @Description: pay_payment_record + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface IPayPaymentRecordService extends IService { + +} 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/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java new file mode 100644 index 00000000..8c38b927 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/service/impl/PayPaymentRecordServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.paymentRecord.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 org.springframework.stereotype.Service; + +/** + * @Description: pay_payment_record + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Service +public class PayPaymentRecordServiceImpl extends ServiceImpl implements IPayPaymentRecordService { + +} 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/paymentRecord/vue/PayPaymentRecordList.vue new file mode 100644 index 00000000..d5270c15 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/PayPaymentRecordList.vue @@ -0,0 +1,192 @@ + + + + \ No newline at end of file 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/paymentRecord/vue/modules/PayPaymentRecordForm.vue new file mode 100644 index 00000000..f1ed3dd6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file 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/paymentRecord/vue/modules/PayPaymentRecordModal.vue new file mode 100644 index 00000000..09547fe0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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/paymentRecord/vue/modules/PayPaymentRecordModal__Style#Drawer.vue new file mode 100644 index 00000000..ce2a4e82 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/paymentRecord/vue/modules/PayPaymentRecordModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java similarity index 56% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index ba21a0bd..e5cf88e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.common; +package com.jero.project.common; public class PayProjectCommon { @@ -11,40 +11,40 @@ public class PayProjectCommon { */ public final static Integer PACKAGING0 = 0; /** - * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） + */ + public final static Integer IN_ACCOUNT0 = 0; + /** + * 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ public final static Integer IN_ACCOUNT1 = 1; /** - * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ public final static Integer IN_ACCOUNT2 = 2; /** - * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ - public final static Integer IN_ACCOUNT3 = 3; + public final static Integer MAKE_INVOICE0 = 0; /** - * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ public final static Integer MAKE_INVOICE1 = 1; /** - * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ public final static Integer MAKE_INVOICE2 = 2; /** - * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + * 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））） */ - public final static Integer MAKE_INVOICE3 = 3; + public final static Integer MAIL0 = 0; /** - * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） + * 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））） */ public final static Integer MAIL1 = 1; /** - * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） + * 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））） */ public final static Integer MAIL2 = 2; - /** - * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） - */ - public final static Integer MAIL3 = 3; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java similarity index 87% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index b34b427f..7495b242 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -1,29 +1,31 @@ -package com.jero.commonProject.controller; +package com.jero.project.controller; import java.util.Arrays; +import java.util.List; import java.util.Objects; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.commonProject.common.PayProjectCommon; -import com.jero.commonProject.service.IPayCommonProjectService; -import com.jero.commonProject.entity.PayCommonProject; +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.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.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.paymentRecord.entity.PayPaymentRecord; +import com.jero.paymentRecord.service.IPayPaymentRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -52,8 +54,8 @@ public class PayCommonProjectController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } PayCommonProject payCommonProject = payCommonProjectService.getById(id); if(payCommonProject==null) { return Result.error("未找到对应数据"); } + JSONObject json = new JSONObject(); + // 企业信息 + PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyId()); + json.put("company",payCompanyManagementTemporary); + // 联系人信息c + PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsId()); + json.put("contacts",payContactsManagementTemporary); + // 到账信息 + LambdaQueryWrapper queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>(); + queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,payCommonProject.getId()); + List payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord); + json.put("payPaymentRecord",payPaymentRecordList); + // todo 开票邮寄记录 + // json.put("payPaymentRecord",payPaymentRecordList); return Result.OK(payCommonProject); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index c3ab8f45..f809b6e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.controller; +package com.jero.project.controller; import java.util.Arrays; import java.util.List; @@ -12,9 +12,8 @@ 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.commonProject.entity.PayCommonProject; -import com.jero.commonProject.service.IPayWorkingGroupService; -import com.jero.commonProject.entity.PayWorkingGroup; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java index 6cac126f..99bd8190 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.controller; +package com.jero.project.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse; 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.commonProject.entity.PayWorkingGroupSubitem; -import com.jero.commonProject.service.IPayWorkingGroupSubitemService; +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.service.IPayWorkingGroupSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 3782d67b..86b65b64 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.entity; +package com.jero.project.entity; import java.io.Serializable; import java.util.Date; @@ -108,12 +108,12 @@ public class PayCommonProject implements Serializable { /**打包（1：是，0：否）*/ @Excel(name = "打包（1：是，0：否）", width = 15) @ApiModelProperty(value = "打包（1：是，0：否）") - private Integer packaging; + private Integer pack; /**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/ @Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15) @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）") @NotNull(message = "需要发票不能为空！") - private Integer invoice; + private Integer needInvoice; /**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ @Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 47ece673..c09c3e3c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.entity; +package com.jero.project.entity; import java.io.Serializable; import java.sql.Date; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java index 42e98c9f..1021309c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java @@ -1,4 +1,4 @@ -package com.jero.commonProject.entity; +package com.jero.project.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; @@ -102,11 +102,11 @@ public class PayWorkingGroupSubitem implements Serializable { /**打包（1：是，0：否）*/ @Excel(name = "打包（1：是，0：否）", width = 15) @ApiModelProperty(value = "打包（1：是，0：否）") - private java.lang.Integer packaging; + private java.lang.Integer pack; /**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/ @Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15) @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）") - private java.lang.Integer invoice; + private java.lang.Integer needInvoice; /**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ @Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java similarity index 89% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java index 2482bbf8..5d5f817c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java @@ -1,8 +1,8 @@ -package com.jero.commonProject.mapper; +package com.jero.project.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.commonProject.entity.PayCommonProject; +import com.jero.project.entity.PayCommonProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index f86c6397..2ddbf284 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -1,6 +1,6 @@ -package com.jero.commonProject.mapper; +package com.jero.project.mapper; -import com.jero.commonProject.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java index eb7fd37d..a4c7667d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java @@ -1,6 +1,6 @@ -package com.jero.commonProject.mapper; +package com.jero.project.mapper; -import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.project.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml similarity index 92% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index d229eb5b..5b90101c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -1,8 +1,8 @@ - + - SELECT pcp.id, pcp.charge_project AS chargeProject, @@ -18,8 +18,8 @@ pcp.paid_amount AS paidAmount, pcp.mail_contacts_id AS mailContactsId, pcp.mail_contacts_name AS mailContactsName, - pcp.packaging, - pcp.invoice, + pcp.pack, + pcp.need_invoice AS needInvoice, pcp.in_account AS inAccount, pcp.make_invoice AS makeInvoice, pcp.mail, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml similarity index 68% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 2308df1f..43808909 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml similarity index 66% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml index 83700b14..e917253c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java similarity index 86% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java index e15a743a..6789d6cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java @@ -1,8 +1,8 @@ -package com.jero.commonProject.service; +package com.jero.project.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.commonProject.entity.PayCommonProject; +import com.jero.project.entity.PayCommonProject; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index c07f4afb..5f66fab8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -1,6 +1,6 @@ -package com.jero.commonProject.service; +package com.jero.project.service; -import com.jero.commonProject.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java index 7f2963cc..98e8c4d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java @@ -1,6 +1,6 @@ -package com.jero.commonProject.service; +package com.jero.project.service; -import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.project.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java similarity index 79% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 61359056..43cd1221 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -1,10 +1,10 @@ -package com.jero.commonProject.service.impl; +package com.jero.project.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.commonProject.service.IPayCommonProjectService; -import com.jero.commonProject.entity.PayCommonProject; -import com.jero.commonProject.mapper.PayCommonProjectMapper; +import com.jero.project.service.IPayCommonProjectService; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.mapper.PayCommonProjectMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index bc000af2..9b378ab7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.commonProject.service.impl; +package com.jero.project.service.impl; -import com.jero.commonProject.service.IPayWorkingGroupService; -import com.jero.commonProject.entity.PayWorkingGroup; -import com.jero.commonProject.mapper.PayWorkingGroupMapper; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.mapper.PayWorkingGroupMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java index aeabf107..7bfcd137 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.commonProject.service.impl; +package com.jero.project.service.impl; -import com.jero.commonProject.service.IPayWorkingGroupSubitemService; -import com.jero.commonProject.entity.PayWorkingGroupSubitem; -import com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper; +import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.mapper.PayWorkingGroupSubitemMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;