From 290924fd5695abafa800e555fd51549c370d8b52 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 16:27:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix=20bug=2041389=20=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE--=E5=9C=A8=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=B3=BB=E7=BB=9F=E4=B8=AD=E7=BC=96=E8=BE=91=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=86=85=E5=AE=B9=E5=90=8E,=E4=B8=AA=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5=E5=88=B0?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=B3=BB=E7=BB=9F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StableCrossTrainingServiceImpl.java | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java index 881f8dad..d09f3d52 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java @@ -198,31 +198,6 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(StableCrossTraining::getId, stableCrossTraining.getId()) - .set(StringUtils.isNotBlank(stableCrossTraining.getName()), StableCrossTraining::getName, stableCrossTraining.getName())//会议名称 - .set(stableCrossTraining.getMeetingType() != null, StableCrossTraining::getMeetingType, stableCrossTraining.getMeetingType())//培训类型：1.标准宣贯, 2.学习培训 - .set(stableCrossTraining.getMeetingState() != null, StableCrossTraining::getMeetingState, stableCrossTraining.getMeetingState())//会议状态: 1.可报名, 2.已结束 - .set(StringUtils.isNotBlank(stableCrossTraining.getYear()), StableCrossTraining::getYear, stableCrossTraining.getYear())//年份 - .set(stableCrossTraining.getConvokeStartTime() != null, StableCrossTraining::getConvokeStartTime, stableCrossTraining.getConvokeStartTime())//召开开始时间 - .set(stableCrossTraining.getConvokeEndTime() != null, StableCrossTraining::getConvokeEndTime, stableCrossTraining.getConvokeEndTime())//召开结束时间 - .set(StringUtils.isNotBlank(stableCrossTraining.getConvokeLocale()), StableCrossTraining::getConvokeLocale, stableCrossTraining.getConvokeLocale())//召开地点 - .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式 - .set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件 - .set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件 - .set(StableCrossTraining::getPaymentQrCode, stableCrossTraining.getPaymentQrCode())//付款二维码 - .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介 - .set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注 - .set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码 - .set(StringUtils.isNotBlank(stableCrossTraining.getPlaceName()), StableCrossTraining::getPlaceName, stableCrossTraining.getPlaceName())//召开省市地点名称 - .set(StringUtils.isNotBlank(stableCrossTraining.getSignInTime()), StableCrossTraining::getSignInTime, stableCrossTraining.getSignInTime())//召开省市地点名称 - .set(stableCrossTraining.getSignInStart() != null, StableCrossTraining::getSignInStart, stableCrossTraining.getSignInStart())//召开省市地点名称 - .set(stableCrossTraining.getSignInEnd() != null, StableCrossTraining::getSignInEnd, stableCrossTraining.getSignInEnd())//召开省市地点名称 - .set(StableCrossTraining::getUpdateBy, stableCrossTraining.getUpdateBy())//修改人 - .set(StableCrossTraining::getUpdateTime, stableCrossTraining.getUpdateTime());//修改时间 - //TODO 酒店信息 -// stableCrossTraining.getId() //添加酒店信息 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HotelManagement::getTrainingId, stableCrossTraining.getId()); @@ -237,7 +212,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl Date: Tue, 26 Oct 2021 16:42:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/pack/entity/PayPackCompany.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java index 2fc90006..7886e40f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java @@ -57,6 +57,10 @@ public class PayPackCompany implements Serializable { // @Excel(name = "企业联系人id", width = 15) @ApiModelProperty(value = "企业联系人id") private java.lang.String companyContactTemporaryId; + /**企业联系人*/ + @Excel(name = "企业联系人", width = 15) + @ApiModelProperty(value = "企业联系人") + private java.lang.String companyContactTemporaryName; /**打包年份*/ @Excel(name = "打包年份", width = 15) @ApiModelProperty(value = "打包年份") @@ -121,21 +125,17 @@ public class PayPackCompany implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**企业联系人*/ - @Excel(name = "企业联系人", width = 15) - @ApiModelProperty(value = "企业联系人") - private java.lang.String companyContactTemporaryName; /** * 手机号 */ - @Excel(name = "联系人电话", width = 15) +// @Excel(name = "联系人电话", width = 15) @TableField(exist = false) @ApiModelProperty(value = "手机号") private String phone; /** * 邮箱 */ - @Excel(name = "邮箱", width = 15) +// @Excel(name = "邮箱", width = 15) @TableField(exist = false) @ApiModelProperty(value = "邮箱") private String email; From 9bdcb64bb440cb6a6adabef287c8986613784806 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 16:48:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=20=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingSituationController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 1c686cfa..2b2820fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -66,7 +66,7 @@ public class PayMeetingSituationController extends JeroController queryPageList(PayMeetingSituation payMeetingSituation, @@ -131,7 +131,7 @@ public class PayMeetingSituationController extends JeroController edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { @@ -179,7 +179,7 @@ public class PayMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); From 81827eab0823b7417bde55ed1265f604db53264f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 16:55:41 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix=20bug=2041475=20=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98=E9=A1=B9=E7=9B=AE--=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E5=AF=BC=E5=85=A5--=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMemberProjectSubitemController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 914ebf5c..398db4c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -227,7 +227,7 @@ public class PayMemberProjectSubitemController extends JeroController paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); Map paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String paymentMethod = projectSubitemExcel.getPaymentMethod(); - if (paymentTypeMap.containsKey(paymentMethod)) { + if (StringUtils.isBlank(paymentMethod)){ + errorMessage.add("第" + errorRowNum + "行：来款方式不能为空"); + }else if (paymentTypeMap.containsKey(paymentMethod)) { projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod))); } else { errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范"); @@ -244,7 +246,9 @@ public class PayMemberProjectSubitemController extends JeroController invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type"); Map invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String needInvoice = projectSubitemExcel.getNeedInvoice(); - if (invoiceTypeMap.containsKey(needInvoice)) { + if (StringUtils.isBlank(needInvoice)){ + errorMessage.add("第" + errorRowNum + "行：需要发票不能为空"); + }else if (invoiceTypeMap.containsKey(needInvoice)) { projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice))); } else { errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范"); From f1a5b3ac37be78eb176134448031ab7887dc7c0c 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, 26 Oct 2021 17:00:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/contract/entity/PaySpendingContract.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 39051857..252817fc 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 @@ -164,15 +164,15 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "合同约定付款次数") private String contractPaymentTimes; /**是否打包（1：是，0：否）*/ - @Excel(name = "是否打包（1：是，0：否）", width = 15) +// @Excel(name = "是否打包（1：是，0：否）", width = 15) @ApiModelProperty(value = "是否打包（1：是，0：否）") - @NotNull(message = "是否打包不能为空") - @Dict(dicCode = "yn") +// @NotNull(message = "是否打包不能为空") +// @Dict(dicCode = "yn") private Integer pack; /**打包年份*/ - @Excel(name = "打包年份", width = 15) +// @Excel(name = "打包年份", width = 15) @ApiModelProperty(value = "打包年份") - @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误") +// @Pattern(regexp = "^\\d{4}$",message = "打包年份式错误") private String packYear; /**创建人*/ @ApiModelProperty(value = "创建人") From ea0d4e0be7d4544102c1091901565c239d9a964d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 17:03:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=20bug=2041403=20=E5=88=B0=E8=B4=A6?= =?UTF-8?q?=E5=BC=80=E7=A5=A8--=E5=A4=9A=E6=AC=A1=E6=9D=A5=E6=AC=BE?= =?UTF-8?q?=E5=90=8E,=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=86=E5=A4=9A=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index c4b35aba..fe384642 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -153,7 +153,7 @@