From 59793dcc21d72ea7c66048c7610c757be2c48e5e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 16 Sep 2021 15:18:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/util/SpringContextUtil.java | 43 +++++++++++++++++++ .../com/jero/config/shiro/ShiroConfig.java | 1 + .../system/controller/SysUserController.java | 40 +++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java new file mode 100644 index 00000000..cb176626 --- /dev/null +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SpringContextUtil.java @@ -0,0 +1,43 @@ +package com.jero.common.util; + +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +/** + * Spring 上下文工具类 + * @author liJiaRao + * @date 2021-09-16 15:05 + */ +@Component +public class SpringContextUtil implements ApplicationContextAware { + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(@NotNull ApplicationContext applicationContext) throws BeansException { + SpringContextUtil.applicationContext = applicationContext; + } + + /** + * 获取上下文 + */ + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + /** + * 通过 bena 名称获取上下文中的 bean + */ + public static Object getBean(String name) { + return applicationContext.getBean(name); + } + + /** + * 通过类型获取上下文中的bean + */ + public static Object getBean(Class requiredType) { + return applicationContext.getBean(requiredType); + } +} diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 89338d0a..cc3fc4dc 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -96,6 +96,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议 filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件 filterChainDefinitionMap.put("/meeting/payMeetingSituation/page2","anon");//查询参会人 + filterChainDefinitionMap.put("/sys/user/payUserList","anon");//查询负责人 filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 1731b3eb..2a83ec13 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -103,6 +103,9 @@ public class SysUserController { @Resource private BaseCommonService baseCommonService; + @Resource + private AuthenticationUtils authenticationUtils; + /** * 根据角色id和部门id获取用户列表数据 */ @@ -246,6 +249,43 @@ public class SysUserController { return result; } + @ApiOperation(value = "查询列表", notes = "查询列表") + @RequestMapping(value = "/payUserList", method = RequestMethod.GET) + public Result queryList2(SysUser user, HttpServletRequest req) { + String publicKey = req.getParameter("publicKey"); + String token = req.getParameter("token"); + authenticationUtils.check(token,publicKey); + Result> result = new Result<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); + //TODO 外部模拟登陆临时账号，列表不显示 + queryWrapper.ne("username","_reserve_user_external"); + Page page = new Page<>(-1, -1); + IPage pageList = sysUserService.page(page, queryWrapper); + List userList = new ArrayList<>(); + List records = pageList.getRecords(); + for (SysUser record : records) { + //处理邮箱和手机号的加密 + UserUtil.decryptUser(record); + userList.add(record); + } + pageList.setRecords(userList); + //批量查询用户的所属部门 + //step.1 先拿到全部的 useids + //step.2 通过 useids，一次性查询用户的所属部门名字 + List userIds = records.stream().map(SysUser::getId).collect(Collectors.toList()); + if(userIds!=null && userIds.size()>0){ + Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); + records.forEach(item->{ + item.setOrgCodeTxt(useDepNames.get(item.getId())); + }); + } + result.setSuccess(true); + result.setResult(records); + log.info(records.toString()); + return result; + } + + //@RequiresRoles({"admin"}) @RequiresPermissions("user:add") From d3b993fafe220dfe4263f3d68bd891d3d5581233 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 16 Sep 2021 15:21:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E6=80=BB=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mail/mapper/PayMailBillProjectMapper.java | 2 - .../mapper/xml/PayMailBillProjectMapper.xml | 6 -- .../service/impl/PayMailBillServiceImpl.java | 63 ++++++++++++------- .../meeting/entity/PayMeetingSituation.java | 7 +++ .../entity/PayMemberProjectSubitem.java | 7 ++- .../member/entity/TbMemberProjectSubitem.java | 7 +++ .../mapper/xml/PayPaymentRecordMapper.xml | 14 ++--- .../jero/project/entity/PayCommonProject.java | 5 ++ .../entity/PayWorkingGroupSubItem.java | 6 ++ .../project/vo/PayCommonProjectOutput.java | 3 + 10 files changed, 80 insertions(+), 40 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java index f6fb4885..62793c85 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java @@ -14,6 +14,4 @@ import java.math.BigDecimal; */ public interface PayMailBillProjectMapper extends BaseMapper { - // 开票总额 - BigDecimal sumInvoiceAmount(@Param("projectId") String projectId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml index b75235fa..684410fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml @@ -2,10 +2,4 @@ - - \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 64449cbb..a8c23acb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -140,7 +140,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){ return "开票金额大于当前欠未开票金额，输入有误！"; @@ -184,6 +187,9 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){ return "开票金额大于当前欠未开票金额，输入有误！"; @@ -199,6 +205,9 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额，输入有误！"; @@ -214,6 +223,9 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额，输入有误！"; @@ -229,6 +241,9 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额，输入有误！"; @@ -243,54 +258,54 @@ public class PayMailBillServiceImpl extends ServiceImpl - select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,1 as projectType + select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType from ( select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 3ec80eb5..e2626cb2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -167,6 +167,11 @@ public class PayCommonProject implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; + /**开票金额*/ + @ApiModelProperty(value = "开票金额") + @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceAmount; /** * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index b60e8da0..b2bca20b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -178,4 +178,10 @@ public class PayWorkingGroupSubItem implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + /**开票金额*/ + @Excel(name = "开票金额", width = 15) + @ApiModelProperty(value = "开票金额") + @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal invoiceAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java index 3b0d5dbd..ac201104 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java @@ -14,4 +14,7 @@ public class PayCommonProjectOutput extends PayCommonProject implements Serializ @Excel(name = "来款用途", width = 20,orderNum = "1") @ApiModelProperty(value = "来款用途") private String chargeUse_dictText; + + @ApiModelProperty(value = "累加开票金额") + private String invoiceAmount; }