From 3cea3815b29a6c311a47093ed40deee20a319f19 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 15:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6=E8=A1=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCommonProjectController.java | 99 +++++++---- .../controller/PayWorkingGroupController.java | 89 ++++++++++ .../entity/PayCommonProject.java | 3 +- .../commonProject/entity/PayWorkingGroup.java | 56 +++--- ...yCompanyManagementTemporaryController.java | 148 ++++++++++++++++ ...ContactsManagementTemporaryController.java | 148 ++++++++++++++++ .../entity/PayCompanyManagementTemporary.java | 94 ++++++++++ .../PayContactsManagementTemporary.java | 98 +++++++++++ .../PayCompanyManagementTemporaryMapper.java | 15 ++ .../PayContactsManagementTemporaryMapper.java | 15 ++ .../PayCompanyManagementTemporaryMapper.xml | 5 + .../PayContactsManagementTemporaryMapper.xml | 5 + ...IPayCompanyManagementTemporaryService.java | 24 +++ ...PayContactsManagementTemporaryService.java | 25 +++ ...CompanyManagementTemporaryServiceImpl.java | 58 +++++++ ...ontactsManagementTemporaryServiceImpl.java | 59 +++++++ .../vue/PayCompanyManagementTemporaryList.vue | 0 .../PayContactsManagementTemporaryList.vue | 0 .../PayCompanyManagementTemporaryForm.vue | 164 ++++++++++++++++++ .../PayCompanyManagementTemporaryModal.vue | 60 +++++++ ...ManagementTemporaryModal__Style#Drawer.vue | 0 .../PayContactsManagementTemporaryForm.vue | 159 +++++++++++++++++ .../PayContactsManagementTemporaryModal.vue | 60 +++++++ ...ManagementTemporaryModal__Style#Drawer.vue | 84 +++++++++ 24 files changed, 1410 insertions(+), 58 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayCompanyManagementTemporaryController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayContactsManagementTemporaryController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayCompanyManagementTemporary.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayCompanyManagementTemporaryService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayContactsManagementTemporaryService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayCompanyManagementTemporaryList.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/PayContactsManagementTemporaryList.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryForm.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryForm.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal.vue create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue 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/commonProject/controller/PayCommonProjectController.java index 6948db52..b34b427f 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/commonProject/controller/PayCommonProjectController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse; 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; @@ -15,15 +16,19 @@ import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -42,9 +47,12 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayCommonProject payCommonProject, MultipartFile file) { + @Transactional + public Result add(@RequestBody PayCommonProject payCommonProject) { StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -100,21 +109,7 @@ public class PayCommonProjectController extends JeroController edit(@RequestBody PayCommonProject payCommonProject) { StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ @@ -149,24 +145,57 @@ public class PayCommonProjectController extends JeroController { @Autowired private IPayWorkingGroupService payWorkingGroupService; + @Autowired + private ISysUserService sysUserService; /** * 分页列表查询 @@ -48,9 +60,13 @@ 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(); + } return Result.OK(pageList); } @@ -63,6 +79,24 @@ public class PayWorkingGroupController extends JeroController add(@RequestBody PayWorkingGroup payWorkingGroup) { + StringBuilder msg = ValidUtil.validateAll(payWorkingGroup); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayWorkingGroup::getWorkingGroupProject,payWorkingGroup.getWorkingGroupProject()); + PayWorkingGroup payWorkingGroupNew = payWorkingGroupService.getOne(queryWrapper); + // 来款项目存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payWorkingGroupNew)) { + return Result.error("工作组项目已存在！"); + } + }catch (Exception e){ + log.info("工作组项目-添加异常",e); + return Result.error("工作组项目已存在！"); + } + payWorkingGroup = setPayWorkingGroup(payWorkingGroup); payWorkingGroupService.save(payWorkingGroup); return Result.OK("添加成功！"); } @@ -76,9 +110,52 @@ public class PayWorkingGroupController extends JeroController edit(@RequestBody PayWorkingGroup payWorkingGroup) { + StringBuilder msg = ValidUtil.validateAll(payWorkingGroup); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayWorkingGroup::getWorkingGroupProject,payWorkingGroup.getWorkingGroupProject()); + PayWorkingGroup payWorkingGroupNew = payWorkingGroupService.getOne(queryWrapper); + // 来款项目存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payWorkingGroupNew) && !Objects.equals(payWorkingGroupNew.getId(),payWorkingGroup.getId())) { + return Result.error("工作组项目已存在！"); + } + }catch (Exception e){ + log.info("工作组项目-编辑异常",e); + return Result.error("工作组项目已存在！"); + } + payWorkingGroup = setPayWorkingGroup(payWorkingGroup); payWorkingGroupService.updateById(payWorkingGroup); return Result.OK("编辑成功!"); } + /** + * @Description 获取负责人A名称，负责人B名称 + * @Author lqt + * @Date 2021/8/31 + * @Param payWorkingGroup + * @Return + * @Exception + */ + private PayWorkingGroup setPayWorkingGroup(PayWorkingGroup payWorkingGroup){ + // 负责人A名称 + SysUser principalIdA = sysUserService.getById(payWorkingGroup.getPrincipalIdA()); + if (Objects.isNull(principalIdA)) { + throw new JeroBootException("负责人A不存在！"); + } + payWorkingGroup.setPrincipalNameA(principalIdA.getRealname()); + // 负责人B名称 + if(!StringUtils.isBlank(payWorkingGroup.getPrincipalIdB())){ + SysUser principalIdB = sysUserService.getById(payWorkingGroup.getPrincipalIdB()); + if(Objects.isNull(principalIdB)){ + throw new JeroBootException("负责人B不存在！"); + } + payWorkingGroup.setPrincipalNameB(principalIdB.getRealname()); + } + return payWorkingGroup; + } /** * 通过id删除 @@ -89,6 +166,9 @@ public class PayWorkingGroupController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } payWorkingGroupService.removeById(id); return Result.OK("删除成功!"); } @@ -102,6 +182,15 @@ public class PayWorkingGroupController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if(StringUtils.isBlank(s1)){ + return Result.error("id不能为空!"); + } + } this.payWorkingGroupService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } 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/commonProject/entity/PayCommonProject.java index 4520a613..3782d67b 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/commonProject/entity/PayCommonProject.java @@ -1,7 +1,7 @@ package com.jero.commonProject.entity; import java.io.Serializable; -import java.sql.Date; +import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -73,7 +73,6 @@ public class PayCommonProject implements Serializable { /**来款企业*/ @Excel(name = "来款企业", width = 15) @ApiModelProperty(value = "来款企业") - @NotEmpty(message = "来款企业不能为空！") private String chargeCompanyName; /**联系人id*/ @Excel(name = "联系人id", width = 15) 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/commonProject/entity/PayWorkingGroup.java index 04760483..47ece673 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/commonProject/entity/PayWorkingGroup.java @@ -1,6 +1,8 @@ package com.jero.commonProject.entity; import java.io.Serializable; +import java.sql.Date; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -30,85 +32,97 @@ public class PayWorkingGroup implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private java.lang.String id; + private String id; /**工作组项目*/ @Excel(name = "工作组项目", width = 15) @ApiModelProperty(value = "工作组项目") - private java.lang.String workingGroupProject; + private String workingGroupProject; /**运行年份*/ @Excel(name = "运行年份", width = 15) @ApiModelProperty(value = "运行年份") - private java.lang.Integer year; + private Integer year; /**负责人Aid*/ @Excel(name = "负责人Aid", width = 15) @ApiModelProperty(value = "负责人Aid") - private java.lang.String principalIdA; + private String principalIdA; /**负责人名称A*/ @Excel(name = "负责人名称A", width = 15) @ApiModelProperty(value = "负责人名称A") - private java.lang.String principalNameA; + private String principalNameA; /**负责人Bid*/ @Excel(name = "负责人Bid", width = 15) @ApiModelProperty(value = "负责人Bid") - private java.lang.String principalIdB; + private String principalIdB; /**负责人名称B*/ @Excel(name = "负责人名称B", width = 15) @ApiModelProperty(value = "负责人名称B") - private java.lang.String principalNameB; + private String principalNameB; /**每年召开次数*/ @Excel(name = "每年召开次数", width = 15) @ApiModelProperty(value = "每年召开次数") - private java.lang.String convokeNum; + private String convokeNum; /**运行周期*/ @Excel(name = "运行周期", width = 15) @ApiModelProperty(value = "运行周期") - private java.lang.String operationCycle; + private String operationCycle; /**本年应收款A（元）*/ @Excel(name = "本年应收款A（元）", width = 15) @ApiModelProperty(value = "本年应收款A（元）") - private java.lang.Integer yearChargeA; + private Integer yearChargeA; /**收费通知号A*/ @Excel(name = "收费通知号A", width = 15) @ApiModelProperty(value = "收费通知号A") - private java.lang.String chargeNoticeNoA; + private String chargeNoticeNoA; /**收费通知文件Aid*/ @Excel(name = "收费通知文件Aid", width = 15) @ApiModelProperty(value = "收费通知文件Aid") - private java.lang.String chargeNoticeAId; + private String chargeNoticeAId; /**本年应收款B（元）*/ @Excel(name = "本年应收款B（元）", width = 15) @ApiModelProperty(value = "本年应收款B（元）") - private java.lang.Integer yearChargeB; + private Integer yearChargeB; /**收费通知号B*/ @Excel(name = "收费通知号B", width = 15) @ApiModelProperty(value = "收费通知号B") - private java.lang.String chargeNoticeNoB; + private String chargeNoticeNoB; /**收费通知文件Bid*/ @Excel(name = "收费通知文件Bid", width = 15) @ApiModelProperty(value = "收费通知文件Bid") - private java.lang.String chargeNoticeBId; + private String chargeNoticeBId; /**任务及目标*/ @Excel(name = "任务及目标", width = 15) @ApiModelProperty(value = "任务及目标") - private java.lang.String missionAndObjectives; + private String missionAndObjectives; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - private java.lang.String remarks; + private String remarks; /**创建人*/ @ApiModelProperty(value = "创建人") - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; + private Date updateTime; + /** + * 已付全款 + */ + private String allPayment; + /** + * 部分付款 + */ + private String partPayment; + /** + * 未付款 + */ + private String notPayment; } 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/companyTemporary/controller/PayCompanyManagementTemporaryController.java new file mode 100644 index 00000000..a46c314a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayCompanyManagementTemporaryController.java @@ -0,0 +1,148 @@ +package com.jero.companyTemporary.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.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; +import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; +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_company_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Api(tags="pay_company_management_temporary") +@RestController +@RequestMapping("/companyTemporary/payCompanyManagementTemporary") +@Slf4j +public class PayCompanyManagementTemporaryController extends JeroController { + @Autowired + private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService; + + /** + * 分页列表查询 + * + * @param payCompanyManagementTemporary + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="pay_company_management_temporary-分页列表查询", notes="pay_company_management_temporary-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayCompanyManagementTemporary payCompanyManagementTemporary, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagementTemporary, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payCompanyManagementTemporaryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payCompanyManagementTemporary + * @return + */ + @ApiOperation(value="pay_company_management_temporary-添加", notes="pay_company_management_temporary-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) { + payCompanyManagementTemporaryService.save(payCompanyManagementTemporary); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payCompanyManagementTemporary + * @return + */ + @ApiOperation(value="pay_company_management_temporary-编辑", notes="pay_company_management_temporary-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayCompanyManagementTemporary payCompanyManagementTemporary) { + payCompanyManagementTemporaryService.updateById(payCompanyManagementTemporary); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="pay_company_management_temporary-通过id删除", notes="pay_company_management_temporary-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payCompanyManagementTemporaryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="pay_company_management_temporary-批量删除", notes="pay_company_management_temporary-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="pay_company_management_temporary-通过id查询", notes="pay_company_management_temporary-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(id); + if(payCompanyManagementTemporary==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payCompanyManagementTemporary); + } + + /** + * 导出excel + * + * @param request + * @param payCompanyManagementTemporary + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagementTemporary payCompanyManagementTemporary) { + return super.exportXls(request, payCompanyManagementTemporary, PayCompanyManagementTemporary.class, "pay_company_management_temporary"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayCompanyManagementTemporary.class); + } + +} 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/companyTemporary/controller/PayContactsManagementTemporaryController.java new file mode 100644 index 00000000..4ee83aaa --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/controller/PayContactsManagementTemporaryController.java @@ -0,0 +1,148 @@ +package com.jero.companyTemporary.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.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.companyTemporary.entity.PayContactsManagementTemporary; +import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; +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_contacts_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Api(tags="pay_contacts_management_temporary") +@RestController +@RequestMapping("/companyTemporary/payContactsManagementTemporary") +@Slf4j +public class PayContactsManagementTemporaryController extends JeroController { + @Autowired + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + + /** + * 分页列表查询 + * + * @param payContactsManagementTemporary + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-分页列表查询", notes="pay_contacts_management_temporary-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayContactsManagementTemporary payContactsManagementTemporary, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payContactsManagementTemporary, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payContactsManagementTemporaryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payContactsManagementTemporary + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-添加", notes="pay_contacts_management_temporary-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) { + payContactsManagementTemporaryService.save(payContactsManagementTemporary); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payContactsManagementTemporary + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-编辑", notes="pay_contacts_management_temporary-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayContactsManagementTemporary payContactsManagementTemporary) { + payContactsManagementTemporaryService.updateById(payContactsManagementTemporary); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-通过id删除", notes="pay_contacts_management_temporary-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payContactsManagementTemporaryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-批量删除", notes="pay_contacts_management_temporary-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="pay_contacts_management_temporary-通过id查询", notes="pay_contacts_management_temporary-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(id); + if(payContactsManagementTemporary==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payContactsManagementTemporary); + } + + /** + * 导出excel + * + * @param request + * @param payContactsManagementTemporary + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayContactsManagementTemporary payContactsManagementTemporary) { + return super.exportXls(request, payContactsManagementTemporary, PayContactsManagementTemporary.class, "pay_contacts_management_temporary"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayContactsManagementTemporary.class); + } + +} 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/companyTemporary/entity/PayCompanyManagementTemporary.java new file mode 100644 index 00000000..bb0b378c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayCompanyManagementTemporary.java @@ -0,0 +1,94 @@ +package com.jero.companyTemporary.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_company_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Data +@TableName("pay_company_management_temporary") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_company_management_temporary对象", description="pay_company_management_temporary") +public class PayCompanyManagementTemporary implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + /**公司地址*/ + @Excel(name = "公司地址", width = 15) + @ApiModelProperty(value = "公司地址") + private java.lang.String companyAddress; + /**公司电话*/ + @Excel(name = "公司电话", width = 15) + @ApiModelProperty(value = "公司电话") + private java.lang.String companyPhone; + /**邮编*/ + @Excel(name = "邮编", width = 15) + @ApiModelProperty(value = "邮编") + private java.lang.String postalCode; + /**银行户名*/ + @Excel(name = "银行户名", width = 15) + @ApiModelProperty(value = "银行户名") + private java.lang.String bankAccountName; + /**开户行*/ + @Excel(name = "开户行", width = 15) + @ApiModelProperty(value = "开户行") + private java.lang.String openingBank; + /**银行账号*/ + @Excel(name = "银行账号", width = 15) + @ApiModelProperty(value = "银行账号") + private java.lang.String bankAccount; + /**税号*/ + @Excel(name = "税号", width = 15) + @ApiModelProperty(value = "税号") + private java.lang.String dutyCode; + /**数据来源(1：管理端，2：报名)*/ + @Excel(name = "数据来源(1：管理端，2：报名)", width = 15) + @ApiModelProperty(value = "数据来源(1：管理端，2：报名)") + private java.lang.Integer dataSource; + /**报名新增（1：是，0：否）*/ + @Excel(name = "报名新增（1：是，0：否）", width = 15) + @ApiModelProperty(value = "报名新增（1：是，0：否）") + private java.lang.Integer signingUp; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remarks; + /**创建人*/ + @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/companyTemporary/entity/PayContactsManagementTemporary.java b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java new file mode 100644 index 00000000..6dfe6a97 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/entity/PayContactsManagementTemporary.java @@ -0,0 +1,98 @@ +package com.jero.companyTemporary.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_contacts_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Data +@TableName("pay_contacts_management_temporary") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_contacts_management_temporary对象", description="pay_contacts_management_temporary") +public class PayContactsManagementTemporary implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String name; + /**性别（1：男，2：女）*/ + @Excel(name = "性别（1：男，2：女）", width = 15) + @ApiModelProperty(value = "性别（1：男，2：女）") + private java.lang.Integer gender; + /**职务*/ + @Excel(name = "职务", width = 15) + @ApiModelProperty(value = "职务") + private java.lang.String post; + /**手机号*/ + @Excel(name = "手机号", width = 15) + @ApiModelProperty(value = "手机号") + private java.lang.String phone; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private java.lang.String email; + /**通讯地址*/ + @Excel(name = "通讯地址", width = 15) + @ApiModelProperty(value = "通讯地址") + private java.lang.String contactAddress; + /**邮政编码*/ + @Excel(name = "邮政编码", width = 15) + @ApiModelProperty(value = "邮政编码") + private java.lang.String postalCode; + /**数据来源(1：管理端，2：报名)*/ + @Excel(name = "数据来源(1：管理端，2：报名)", width = 15) + @ApiModelProperty(value = "数据来源(1：管理端，2：报名)") + private java.lang.Integer dataSource; + /**报名新增（0：否，1：:是）*/ + @Excel(name = "报名新增（0：否，1：:是）", width = 15) + @ApiModelProperty(value = "报名新增（0：否，1：:是）") + private java.lang.Integer signingUp; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remarks; + /**创建人*/ + @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/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java new file mode 100644 index 00000000..44149cbc --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayCompanyManagementTemporaryMapper.java @@ -0,0 +1,15 @@ +package com.jero.companyTemporary.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; + +/** + * @Description: pay_company_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface PayCompanyManagementTemporaryMapper extends BaseMapper { + +} 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/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java new file mode 100644 index 00000000..631760e3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/PayContactsManagementTemporaryMapper.java @@ -0,0 +1,15 @@ +package com.jero.companyTemporary.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.companyTemporary.entity.PayContactsManagementTemporary; + +/** + * @Description: pay_contacts_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface PayContactsManagementTemporaryMapper extends BaseMapper { + +} 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/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml new file mode 100644 index 00000000..f5dc8cc9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayCompanyManagementTemporaryMapper.xml @@ -0,0 +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/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml new file mode 100644 index 00000000..e1b31c83 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/mapper/xml/PayContactsManagementTemporaryMapper.xml @@ -0,0 +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/companyTemporary/service/IPayCompanyManagementTemporaryService.java new file mode 100644 index 00000000..7c9e4cbb --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayCompanyManagementTemporaryService.java @@ -0,0 +1,24 @@ +package com.jero.companyTemporary.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; + +/** + * @Description: pay_company_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface IPayCompanyManagementTemporaryService extends IService { + + /** + * @Description 拷贝企业信息数据 + * @Author lqt + * @Date 2021/8/31 + * @Param companyId 企业id + * @Return 企业信息 + * @Exception + */ + PayCompanyManagementTemporary insertCompanyManagementTemporary(String companyId); +} 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/companyTemporary/service/IPayContactsManagementTemporaryService.java new file mode 100644 index 00000000..22c353aa --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/IPayContactsManagementTemporaryService.java @@ -0,0 +1,25 @@ +package com.jero.companyTemporary.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.companyTemporary.entity.PayContactsManagementTemporary; + +/** + * @Description: pay_contacts_management_temporary + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +public interface IPayContactsManagementTemporaryService extends IService { + + /** + * @Description 拷贝联系人信息数据 + * @Author lqt + * @Date 2021/8/31 + * @Param contactsId 联系人id + * @Return 返回联系人信息 + * @Exception + */ + PayContactsManagementTemporary insertContactsManagementTemporary(String contactsId); + +} 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 new file mode 100644 index 00000000..fb3e815c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -0,0 +1,58 @@ +package com.jero.companyTemporary.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 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 + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Service +public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl implements IPayCompanyManagementTemporaryService { + + @Autowired + private IPayCompanyManagementService payCompanyManagementService; + @Autowired + private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService; + + @Override + public PayCompanyManagementTemporary insertCompanyManagementTemporary(String companyId) { + if(StringUtils.isBlank(companyId)){ + throw new JeroBootException("企业id不能为空！"); + } + // 企业管理表 + PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId); + String str; + if(Objects.isNull(payCompanyManagement)){ + // 企业管理临时表 + PayCompanyManagementTemporary temporary = payCompanyManagementTemporaryService.getById(companyId); + if(Objects.isNull(temporary)){ + throw new JeroBootException("没有查询到企业信息！"); + } + str = JSONObject.toJSONString(temporary); + }else{ + str = JSONObject.toJSONString(payCompanyManagement); + } + PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class); + String companyIdNew = UUID.randomUUID().toString().replace("-",""); + payCompanyManagementTemporary.setId(companyIdNew); + payCompanyManagementTemporaryService.save(payCompanyManagementTemporary); + return payCompanyManagementTemporary; + } +} 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/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java new file mode 100644 index 00000000..89ed2788 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/service/impl/PayContactsManagementTemporaryServiceImpl.java @@ -0,0 +1,59 @@ +package com.jero.companyTemporary.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 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 + * @Author: jeecg-boot + * @Date: 2021-08-31 + * @Version: V1.0 + */ +@Service +public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl implements IPayContactsManagementTemporaryService { + + @Autowired + private IPayContactsManagementService payContactsManagementService; + + @Autowired + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + + @Override + public PayContactsManagementTemporary insertContactsManagementTemporary(String contactsId) { + if(StringUtils.isBlank(contactsId)){ + throw new JeroBootException("联系人id不能为空！"); + } + String str; + PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactsId); + if(Objects.isNull(payContactsManagement)){ + PayContactsManagementTemporary temporary = payContactsManagementTemporaryService.getById(contactsId); + if(Objects.isNull(temporary)){ + throw new JeroBootException("没有查询到联系人信息！"); + } + str = JSONObject.toJSONString(temporary); + }else{ + str = JSONObject.toJSONString(payContactsManagement); + } + + PayContactsManagementTemporary payContactsManagementTemporary = JSON.parseObject(str,PayContactsManagementTemporary.class); + String contactsIdNew = UUID.randomUUID().toString().replace("-",""); + payContactsManagementTemporary.setId(contactsIdNew); + payContactsManagementTemporaryService.save(payContactsManagementTemporary); + return payContactsManagementTemporary; + } +} 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/companyTemporary/vue/PayCompanyManagementTemporaryList.vue new file mode 100644 index 00000000..e69de29b 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/companyTemporary/vue/PayContactsManagementTemporaryList.vue new file mode 100644 index 00000000..e69de29b 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/companyTemporary/vue/modules/PayCompanyManagementTemporaryForm.vue new file mode 100644 index 00000000..1fb26cb9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryForm.vue @@ -0,0 +1,164 @@ + + + \ No newline at end of file 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/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal.vue new file mode 100644 index 00000000..99145580 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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/companyTemporary/vue/modules/PayCompanyManagementTemporaryModal__Style#Drawer.vue new file mode 100644 index 00000000..e69de29b 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/companyTemporary/vue/modules/PayContactsManagementTemporaryForm.vue new file mode 100644 index 00000000..63950fe6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryForm.vue @@ -0,0 +1,159 @@ + + + \ No newline at end of file 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/companyTemporary/vue/modules/PayContactsManagementTemporaryModal.vue new file mode 100644 index 00000000..b34d441e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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/companyTemporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue new file mode 100644 index 00000000..23070992 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/companyTemporary/vue/modules/PayContactsManagementTemporaryModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file