From 0548f84f22762a13cf3b076337d71194c5c358ba Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 25 Oct 2021 16:07:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=2041219=20=E8=AE=BE=E7=BD=AE=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E4=BA=BA=E5=90=8E=EF=BC=8C=E5=AF=B9=E6=8E=A5=E4=BA=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9C=8B=E5=88=B0=E4=BC=9A=E8=AE=AE=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=90=E9=98=BB=E5=A1=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 3 ++- .../jero/meeting/mapper/PayMeetingMapper.java | 2 ++ .../meeting/mapper/xml/PayMeetingMapper.xml | 7 ++++++ .../service/impl/PayMeetingServiceImpl.java | 24 +++++++++++++++---- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 3cf1ddb6..4694c559 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -77,7 +77,8 @@ public class SendMessageServiceImpl implements SendMessageService { if(!Objects.isNull(map)) { // 替换企业端系统url与小程序名称 // todo 替换系统地址，小程序名称 - if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode()) + ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index 2fa22c79..aee0fa99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -19,4 +19,6 @@ public interface PayMeetingMapper extends BaseMapper { IPage pageListContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("now") String now); + + IPage internelPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index 2b48ff04..d13b97b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -85,4 +85,11 @@ left join pay_meeting_remind_record pmrr on pm.id = pmrr.meeting_id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 21fde651..8dac46cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -512,9 +512,7 @@ public class PayMeetingServiceImpl extends ServiceImpl queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (!rolePermissionService.getRolePermission("generalProject:search")) { - payMeeting.setDirectorId(sysUser.getId()); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); String meetingStartTime = req.getParameter("meetingStartTime"); String meetingEndTime = req.getParameter("meetingEndTime"); @@ -531,9 +529,25 @@ public class PayMeetingServiceImpl extends ServiceImpl a.gt("start_time", meetingEndTime) ); } - Page page = new Page<>(pageNo, pageSize); - IPage pageList = page(page, queryWrapper); + IPage pageList; + if (!rolePermissionService.getRolePermission("generalProject:search")) { + if (!payMeeting.getMeetingType().equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) { + payMeeting.setDirectorId(sysUser.getId()); + pageList = page(page, queryWrapper); + }else { + queryWrapper.and( + a -> a.eq("director_id", sysUser.getId()) + .or() + .eq("dock_id", sysUser.getId()) + ); + pageList = baseMapper.internelPage(page,queryWrapper); + } + }else { + pageList = page(page, queryWrapper); + } + + for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); From abbafe11099dc215ffd7693c93fb4974d9adbeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 16:18:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41370?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProjectDetailServiceImpl.java | 9 +++++++++ .../java/com/jero/contract/entity/PayIncomeContract.java | 2 +- .../com/jero/contract/entity/PaySpendingContract.java | 2 +- .../service/impl/PayIncomeContractServiceImpl.java | 8 ++++++++ .../project/controller/PayCommonProjectController.java | 8 ++++++++ .../controller/PayWorkingGroupSubItemController.java | 5 +++++ 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 95d84e6a..9e8ea675 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -29,6 +29,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; @@ -86,6 +87,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject)){ throw new JeroBootException("项目不存在！"); } + if(Objects.equals(PayProjectCommon.PROJECT_TYPE4,String.valueOf(payCommonProject.getProjectType())) && !StringUtils.isEmpty(payCommonProject.getPrincipalId())){ + LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); + querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId()); + List listSysUser = sysUserService.list(querySysUser); + if(!CollectionUtils.isEmpty(listSysUser)){ + payCommonProject.setPrincipalName(listSysUser.get(0).getRealname()); + } + } if(Objects.isNull(payCommonProject.getPaidAmount())){ payCommonProject.setPaidAmount(new BigDecimal("0.00")); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index a3ae65ba..96f4e955 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -138,7 +138,7 @@ public class PayIncomeContract implements Serializable { /**合同约定主要时点*/ @Excel(name = "合同约定主要时点", width = 15) @ApiModelProperty(value = "合同约定主要时点") - @Size(max = 50, message = "合同约定主要时点不能大于50个字符") + @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private java.lang.String contractTimePoints; /**应收金额*/ @Excel(name = "应收金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index 6151ebdb..a6af2b0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -132,7 +132,7 @@ public class PaySpendingContract implements Serializable { /**合同约定主要时点*/ @Excel(name = "合同约定主要时点", width = 15) @ApiModelProperty(value = "合同约定主要时点") - @Size(max = 50, message = "合同约定主要时点不能大于50个字符") + @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private String contractTimePoints; /**应收金额*/ @Excel(name = "应收金额", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index e79bb8bd..e6aea71e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -63,6 +63,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -324,6 +325,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ String projectName = ""; String principalId = ""; @@ -341,6 +345,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl querySysUser = new LambdaQueryWrapper<>(); + querySysUser.eq(SysUser::getId,payCommonProject.getPrincipalId()); + List listSysUser = sysUserService.list(querySysUser); + if(!CollectionUtils.isEmpty(listSysUser)){ + payCommonProject.setPrincipalName(listSysUser.get(0).getRealname()); + } + } // 工作组项目资料 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 27e40550..7b6e8938 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; +import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; import com.jero.common.service.SendMessageService; import com.jero.common.system.base.controller.JeroController; @@ -496,6 +497,10 @@ public class PayWorkingGroupSubItemController extends JeroController importExcel(HttpServletRequest request) { + List excelData = super.getExcelData(request, PayWorkingGroupSubItem.class); + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空，请填写数据之后重新导入！"); + } payWorkingGroupSubItemService.importExcel(request); return Result.OK("文件导入成功！"); } From e0bb2eaa3ef1635a6f28624a8a4174e9d899581a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 16:29:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41370?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/pack/controller/PayPackCompanyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index 99129a36..f616ed7e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -82,7 +82,7 @@ public class PayPackCompanyController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap()); Page page = new Page(pageNo, pageSize); if(!StringUtils.isEmpty(payPackCompany.getCompanyTemporaryName())){ - payPackCompany.setPhone(PasswordUtil.encrypt(payPackCompany.getCompanyTemporaryName())); + payPackCompany.setCompanyTemporaryName(oConvertUtils.replaceAllPercent(payPackCompany.getCompanyTemporaryName())); } IPage pageList = payPackCompanyService.queryPageList(page, payPackCompany); if(!CollectionUtils.isEmpty(pageList.getRecords())){ From c36aac4a9b4a10f5e255c528f47b0e465e1d4121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 16:45:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8C=85=E7=8A=B6=E6=80=81=EF=BC=8C=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/contract/mapper/xml/PayIncomeContractMapper.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 665948b1..2e9272cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -93,6 +93,12 @@ AND aa.principalId = #{payIncomeContract.principalId} + + AND aa.pack = #{payIncomeContract.pack} + + + AND aa.packYear = #{payIncomeContract.packYear} + ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc From bd8c0388733fe081c3707c6486372198a87f5b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 25 Oct 2021 17:30:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E7=B3=BB=E4=BA=BA=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E3=80=81=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/PayIncomeContractCommon.java | 4 +-- .../contract/entity/PaySpendingContract.java | 28 ++++++++--------- .../PaySpendingContractInstallment.java | 30 +++++++++---------- .../controller/PayPackCompanyController.java | 12 ++++++++ .../com/jero/pack/entity/PayPackCompany.java | 10 ++++--- .../pack/mapper/xml/PayPackCompanyMapper.xml | 6 ++-- 6 files changed, 53 insertions(+), 37 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index ff059009..304f197d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java @@ -80,11 +80,11 @@ public class PayIncomeContractCommon { */ public final static List LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人", "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点", - "应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份"); + "应付金额","已付金额","未付金额","账款状态","合同约定付款次数","是否打包","打包年份"); /** * 支出合同分期信息excel 表头 */ - public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应收","阶段应收时间","阶段实收","阶段实收时间"); + public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应付","阶段应付时间","阶段实付","阶段实付时间"); /** * 来源（1:收入合同,2:打包管理） diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index a6af2b0d..39051857 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "合同约定主要时点") @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private String contractTimePoints; - /**应收金额*/ - @Excel(name = "应收金额", width = 15) - @ApiModelProperty(value = "应收金额") - @NotNull(message = "应收金额不能为空") + /**应付金额*/ + @Excel(name = "应付金额", width = 15) + @ApiModelProperty(value = "应付金额") + @NotNull(message = "应付金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应付金额格式错误") private BigDecimal accountsReceivableAmount; - /**已收金额*/ - @Excel(name = "已收金额", width = 15) - @ApiModelProperty(value = "已收金额") - @NotNull(message = "已收金额不能为空") + /**已付金额*/ + @Excel(name = "已付金额", width = 15) + @ApiModelProperty(value = "已付金额") + @NotNull(message = "已付金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "已收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "已付金额格式错误") private BigDecimal amountReceived; - /**未收金额*/ - @Excel(name = "未收金额", width = 15) - @ApiModelProperty(value = "未收金额") + /**未付金额*/ + @Excel(name = "未付金额", width = 15) + @ApiModelProperty(value = "未付金额") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "未收金额格式错误") + @DecimalMax(value = "9999999999.99",message = "未付金额格式错误") private BigDecimal outstandingAmount; /**账款状态（1：未支付，2：部分支付，3：已付全款）*/ @Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index eb3d8d60..e3ec4ae0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable { @NotEmpty(message = "阶段不能为空") @Size(max = 50, message = "阶段长度不能大于50个字符") private String phaseName; - /**应收金额*/ - @Excel(name = "阶段应收金额", width = 15) - @ApiModelProperty(value = "应收金额") - @NotNull(message = "阶段应收不能为空") - @DecimalMax(value = "9999999999.99",message = "阶段应收格式错误") + /**应付金额*/ + @Excel(name = "阶段应付金额", width = 15) + @ApiModelProperty(value = "应付金额") + @NotNull(message = "阶段应付不能为空") + @DecimalMax(value = "9999999999.99",message = "阶段应付格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; - /**应收时间*/ - @Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd") + /**应付时间*/ + @Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "应收时间") + @ApiModelProperty(value = "应付时间") private Date accountsReceivableTime; - /**实收金额*/ - @Excel(name = "阶段实收金额", width = 15) - @ApiModelProperty(value = "阶段实收金额") - @DecimalMax(value = "9999999999.99",message = "阶段实收格式错误") + /**实付金额*/ + @Excel(name = "阶段实付金额", width = 15) + @ApiModelProperty(value = "阶段实付金额") + @DecimalMax(value = "9999999999.99",message = "阶段实付格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; - /**实收时间*/ - @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") + /**实付时间*/ + @Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实收时间") + @ApiModelProperty(value = "实付时间") private Date paidTime; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index f616ed7e..af8fa356 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -97,6 +97,12 @@ public class PayPackCompanyController extends JeroController