From 6fea57ba6402970f39fa314505dbd1af9fa01031 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 17:10:27 +0800 Subject: [PATCH 01/14] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/CommonConstant.java | 2 +- .../com/jero/common/util/ImportExcelUtil.java | 17 +++--- .../controller/QuartzJobController.java | 5 +- .../controller/SysDepartController.java | 2 +- .../system/controller/SysDictController.java | 5 +- .../system/controller/SysUserController.java | 57 ++++++++++++++----- .../jero/modules/system/entity/SysUser.java | 47 +++++++-------- .../service/impl/SysRoleServiceImpl.java | 2 +- .../jero/modules/system/util/UserUtil.java | 47 +++++++++++++++ 9 files changed, 124 insertions(+), 60 deletions(-) create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index dd256592..04045acd 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -224,7 +224,7 @@ public interface CommonConstant { public static final Integer USER_IDENTITY_2 = 2; /** sys_user 表 username 唯一键索引 */ - public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username"; + public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "index_user_name"; /** sys_user 表 work_no 唯一键索引 */ public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no"; /** sys_user 表 phone 唯一键索引 */ diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java index 8a09ad20..65075d0b 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java @@ -16,7 +16,7 @@ import java.util.List; @Slf4j public class ImportExcelUtil { - public static Result imporReturnRes(int errorLines,int successLines,List errorMessage) throws IOException { + public static Result importReturnRes(int errorLines, int successLines, List errorMessage) throws IOException { if (errorLines == 0) { return Result.OK("共" + successLines + "行数据全部导入成功！"); } else { @@ -25,15 +25,14 @@ public class ImportExcelUtil { result.put("totalCount", totalCount); result.put("errorCount", errorLines); result.put("successCount", successLines); - result.put("msg", "总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误行数：" + errorLines); + result.put("msg", "总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误次数：" + errorLines +"，错误信息：" +errorMessage); String fileUrl = PmsUtil.saveErrorTxtByList(errorMessage, "userImportExcelErrorLog"); - int lastIndex = fileUrl.lastIndexOf(File.separator); - String fileName = fileUrl.substring(lastIndex + 1); - result.put("fileUrl", "/sys/common/static/" + fileUrl); - result.put("fileName", fileName); - Result res = Result.OK(result); - res.setCode(201); - res.setMessage("文件导入成功，但有错误。"); + //int lastIndex = fileUrl.lastIndexOf(File.separator); + //String fileName = fileUrl.substring(lastIndex + 1); + //result.put("fileUrl", "/sys/common/static/" + fileUrl); + //result.put("fileName", fileName); + Result res = Result.OK(result); + res.setMessage("文件导入成功，但有错误。\n"+"总上传行数：" + totalCount + "，已导入行数：" + successLines + "，错误次数：" + errorLines +"，错误信息：" +errorMessage); return res; } } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java b/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java index e21669ca..91031a31 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java @@ -9,10 +9,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ImportExcelUtil; import com.jero.modules.quartz.entity.QuartzJob; @@ -22,7 +20,6 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.quartz.JobKey; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; @@ -259,7 +256,7 @@ public class QuartzJobController { } } } - return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); + return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage); } /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index b60d452f..a9542196 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -381,7 +381,7 @@ public class SysDepartController { Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); redisTemplate.delete(keys3); redisTemplate.delete(keys4); - return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList); + return ImportExcelUtil.importReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("文件导入失败:"+e.getMessage()); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index ec21987a..45598acb 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -1,7 +1,6 @@ package com.jero.modules.system.controller; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,7 +16,6 @@ import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; -import com.jero.common.system.vo.DictQuery; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.SqlInjectionUtil; @@ -37,7 +35,6 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -520,7 +517,7 @@ public class SysDictController { errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。"); } } - return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); + return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("文件导入失败:"+e.getMessage()); 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 e85c559e..f03dc699 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 @@ -9,12 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.base.Joiner; import com.jero.common.exception.JeroBootException; +import com.jero.modules.system.util.UserUtil; import com.jero.modules.system.vo.SysUserVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import com.jero.common.api.vo.Result; @@ -116,8 +117,8 @@ public class SysUserController { IPage pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId); List userList = new ArrayList<>(); for (SysUserVo record : pageList.getRecords()) { - record.setEmail(PasswordUtil.decrypt(record.getEmail())); - record.setPhone(PasswordUtil.decrypt(record.getPhone())); + //处理邮箱和手机号的加密 + UserUtil.decryptUser(record); userList.add(record); } pageList.setRecords(userList); @@ -158,8 +159,8 @@ public class SysUserController { IPage pageList = sysUserService.page(page, queryWrapper); List userList = new ArrayList<>(); for (SysUser record : pageList.getRecords()) { - record.setEmail(PasswordUtil.decrypt(record.getEmail())); - record.setPhone(PasswordUtil.decrypt(record.getPhone())); + //处理邮箱和手机号的加密 + UserUtil.decryptUser(record); userList.add(record); } pageList.setRecords(userList); @@ -191,8 +192,8 @@ public class SysUserController { List userList = new ArrayList<>(); List records = pageList.getRecords(); for (SysUser record : records) { - record.setEmail(PasswordUtil.decrypt(record.getEmail())); - record.setPhone(PasswordUtil.decrypt(record.getPhone())); + //处理邮箱和手机号的加密 + UserUtil.decryptUser(record); userList.add(record); } pageList.setRecords(userList); @@ -540,12 +541,21 @@ public class SysUserController { } //update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据---------------------- List pageList = sysUserService.list(queryWrapper); - + for (SysUser record : pageList) { + String username = record.getUsername(); + String phone = record.getPhone(); + if (StringUtils.isNotBlank(phone)){ + record.setPhone(PasswordUtil.decrypt(phone)); + } + List roleIdsByUsername = sysBaseAPI.getRoleIdsByUsername(username); + List departIdsByUsername = sysBaseAPI.getDepartIdsByUsername(username); + record.setRoleIds(Joiner.on(",").join(roleIdsByUsername)); + record.setDepartIds(Joiner.on(",").join(departIdsByUsername)); + } //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表"); mv.addObject(NormalExcelConstants.CLASS, SysUser.class); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息"); + ExportParams exportParams = new ExportParams("用户列表数据", "导出信息"); exportParams.setImageBasePath(upLoadPath); mv.addObject(NormalExcelConstants.PARAMS, exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); @@ -555,7 +565,7 @@ public class SysUserController { /** * 导出excel模板 */ - @RequiresPermissions("defect:download:template") + @RequiresPermissions("sys:user:import") @ApiOperation(value="用户-导出excel模板", notes="用户-导出excel模板") @GetMapping(value = "/exportTemplate") public ModelAndView exportTemplate() { @@ -594,6 +604,7 @@ public class SysUserController { try { List listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params); for (int i = 0; i < listSysUsers.size(); i++) { + int lineNumber = i + 3; SysUser sysUserExcel = listSysUsers.get(i); if (StringUtils.isBlank(sysUserExcel.getPassword())) { // 存入默认密码 @@ -603,14 +614,22 @@ public class SysUserController { String salt = oConvertUtils.randomGen(8); sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); + try { + ValidUtil.validate(sysUserExcel); + }catch (JeroBootException e) { + errorLines++; + errorMessage.add("第 " + lineNumber + " 行：" + e.getMessage()); + } sysUserExcel.setPassword(passwordEncode); + //处理邮箱和手机号的加密 + UserUtil.encryptUser(sysUserExcel); + sysUserExcel.setDelFlag(0); try { sysUserService.save(sysUserExcel); successLines++; } catch (Exception e) { errorLines++; String message = e.getMessage().toLowerCase(); - int lineNumber = i + 1; // 通过索引名判断出错信息 if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)) { errorMessage.add("第 " + lineNumber + " 行：用户名已经存在，忽略导入。"); @@ -625,10 +644,10 @@ public class SysUserController { log.error(e.getMessage(), e); } } + String userId = sysUserExcel.getId(); // 批量将部门和用户信息建立关联关系 String departIds = sysUserExcel.getDepartIds(); if (StringUtils.isNotBlank(departIds)) { - String userId = sysUserExcel.getId(); String[] departIdArray = departIds.split(","); List userDepartList = new ArrayList<>(departIdArray.length); for (String departId : departIdArray) { @@ -636,6 +655,16 @@ public class SysUserController { } sysUserDepartService.saveBatch(userDepartList); } + //批量处理角色和用户的关联关系 + String roleIds = sysUserExcel.getRoleIds(); + if (StringUtils.isNotBlank(roleIds)) { + String[] roleIdArray = roleIds.split(","); + List userRoleList = new ArrayList<>(); + for (String roleId : roleIdArray) { + userRoleList.add(new SysUserRole(userId,roleId)); + } + sysUserRoleService.saveBatch(userRoleList); + } } } catch (Exception e) { @@ -649,7 +678,7 @@ public class SysUserController { } } } - return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); + return ImportExcelUtil.importReturnRes(errorLines,successLines,errorMessage); } /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 588a1936..15a65a7a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -20,9 +20,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; /** *

@@ -48,17 +46,17 @@ public class SysUser implements Serializable { /** * 登录账号 */ - @Excel(name = "登录账号", width = 15) - @NotBlank(message = "账号不能为空") - @Size(max = 50,message = "账号最长为50") + @Excel(name = "用户账号", width = 15) + @NotBlank(message = "用户账号不能为空") + @Size(max = 50,message = "用户账号最长为50") private String username; /** * 真实姓名 */ - @Excel(name = "真实姓名", width = 15) - @NotBlank(message = "姓名不能为空") - @Size(max = 50,message = "姓名最长为50") + @Excel(name = "用户姓名", width = 15) + @NotBlank(message = "用户姓名不能为空") + @Size(max = 50,message = "用户姓名最长为50") private String realname; /** @@ -77,13 +75,11 @@ public class SysUser implements Serializable { /** * 头像 */ - @Excel(name = "头像", width = 15,type = 2) private String avatar; /** * 生日 */ - @Excel(name = "生日", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date birthday; @@ -91,21 +87,21 @@ public class SysUser implements Serializable { /** * 性别（1：男 2：女） */ - @Excel(name = "性别", width = 15,dicCode="sex") @Dict(dicCode = "sex") private Integer sex; /** * 电子邮箱 */ - @Excel(name = "电子邮箱", width = 15) - @Email(message = "电子邮箱格式不正确") + @Email(message = "邮箱格式不正确") private String email; /** * 电话 */ - @Excel(name = "电话", width = 15) + @Excel(name = "手机号", width = 15) + @NotEmpty(message = "手机号不能为空！") + @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") private String phone; /** @@ -119,27 +115,23 @@ public class SysUser implements Serializable { /** * 状态(1：正常 2：冻结 ） */ - @Excel(name = "状态", width = 15,dicCode="user_status") @Dict(dicCode = "user_status") private Integer status; /** * 删除状态（0，正常，1已删除） */ - @Excel(name = "删除状态", width = 15,dicCode="del_flag") @TableLogic private Integer delFlag; /** * 工号，唯一键 */ - @Excel(name = "工号", width = 15) private String workNo; /** * 座机号 */ - @Excel(name = "座机号", width = 15) private String telephone; /** @@ -150,6 +142,9 @@ public class SysUser implements Serializable { /** * 创建时间 */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", orderNum = "1",format = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** @@ -171,13 +166,6 @@ public class SysUser implements Serializable { */ private Integer userIdentity; - /** - * 负责部门 - */ - @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private String departIds; - /** * 角色类型 */ @@ -185,6 +173,13 @@ public class SysUser implements Serializable { @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id") private String roleIds; + /** + * 组织机构 + */ + @Excel(name="组织机构",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") + @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") + private String departIds; + /** * 多租户id配置，编辑用户的时候设置 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java index 9ce2f9c7..fa0c08bb 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java @@ -64,7 +64,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl List list = ImportExcelUtil.importDateSave(listSysRoles, ISysRoleService.class, errorStrs, CommonConstant.SQL_INDEX_UNIQ_SYS_ROLE_CODE); errorLines+=list.size(); successLines+=(listSysRoles.size()-errorLines); - return ImportExcelUtil.imporReturnRes(errorLines,successLines,list); + return ImportExcelUtil.importReturnRes(errorLines,successLines,list); } @Override diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java new file mode 100644 index 00000000..9d1a10d7 --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/UserUtil.java @@ -0,0 +1,47 @@ +package com.jero.modules.system.util; + +import com.jero.common.util.PasswordUtil; +import com.jero.modules.system.entity.SysUser; +import org.apache.commons.lang.StringUtils; + +/** + * @author liJiaRao + * @date 2021-08-30 16:42 + */ +public class UserUtil { + /** + * 解密密文SysUser手机号邮箱 + * + * @param record + * SysUser + */ + public static void decryptUser(SysUser record) { + //处理邮箱和手机号的加密 + String email = record.getEmail(); + if (StringUtils.isNotBlank(email)){ + record.setEmail(PasswordUtil.decrypt(email)); + } + String phone = record.getPhone(); + if (StringUtils.isNotBlank(phone)){ + record.setPhone(PasswordUtil.decrypt(phone)); + } + } + + /** + * 加密密文SysUser手机号邮箱 + * + * @param record + * SysUser + */ + public static void encryptUser(SysUser record) { + //处理邮箱和手机号的加密 + String email = record.getEmail(); + if (StringUtils.isNotBlank(email)){ + record.setEmail(PasswordUtil.encrypt(email)); + } + String phone = record.getPhone(); + if (StringUtils.isNotBlank(phone)){ + record.setPhone(PasswordUtil.encrypt(phone)); + } + } +} From 3c37edc23002362c3ccbea71a4aab6665ae75ec7 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, 30 Aug 2021 17:14:51 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/common/PayProjectCommon.java | 50 ++++++++++ .../PayCommonProjectController.java | 8 +- .../jero/project/entity/PayCommonProject.java | 91 +++++++++++++------ .../PayWorkingGroupSubitemServiceImpl.java | 19 ++++ 4 files changed, 137 insertions(+), 31 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java new file mode 100644 index 00000000..a22b5825 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -0,0 +1,50 @@ +package com.jero.project.common; + +public class PayProjectCommon { + + /** + * 打包（1：是，0：否） + */ + public final static Integer PACKAGING1 = 1; + /** + * 打包（1：是，0：否） + */ + public final static Integer PACKAGING0 = 0; + /** + * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer IN_ACCOUNT1 = 1; + /** + * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer IN_ACCOUNT2 = 2; + /** + * 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer IN_ACCOUNT3 = 3; + /** + * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer MAKE_INVOICE1 = 1; + /** + * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer MAKE_INVOICE2 = 2; + /** + * 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）） + */ + public final static Integer MAKE_INVOICE3 = 3; + /** + * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） + */ + public final static Integer MAIL1 = 1; + /** + * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） + */ + public final static Integer MAIL2 = 2; + /** + * 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））） + */ + public final static Integer MAIL3 = 3; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index e2fec6c0..a4755f5e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -10,6 +10,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; import com.jero.company.entity.PayCompanyManagement; +import com.jero.project.common.PayProjectCommon; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.entity.PayCommonProject; @@ -19,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -73,7 +75,7 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayCommonProject payCommonProject) { + public Result add(@RequestBody PayCommonProject payCommonProject, MultipartFile file) { StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -91,6 +93,10 @@ public class PayCommonProjectController extends JeroController0 && <总金额（半满标志））*/ @Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") - private java.lang.String inAccount; + private Integer inAccount; /**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ @Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") - private java.lang.String makeInvoice; + private Integer makeInvoice; /**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/ @Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15) @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））") - private java.lang.String mail; + private Integer mail; /**来款方式（1：无，2：合同，3：收费通知）*/ @Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15) @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") - private java.lang.Integer chargeWay; + @NotNull(message = "需要发票不能为空！") + private Integer chargeWay; /**合同编号*/ @Excel(name = "合同编号", width = 15) @ApiModelProperty(value = "合同编号") - private java.lang.String contractNum; + @Size(max = 50,message = "合同编号长度应小于50个字符") + private String contractNum; /**收费通知号*/ @Excel(name = "收费通知号", width = 15) @ApiModelProperty(value = "收费通知号") - private java.lang.String chargeNoticeNo; + @Size(max = 50,message = "收费通知号长度应小于50个字符") + private String chargeNoticeNo; /**收费通知文件id*/ @Excel(name = "收费通知文件id", width = 15) @ApiModelProperty(value = "收费通知文件id") - private java.lang.String chargeNoticeId; + private String chargeNoticeId; /**催款次数*/ @Excel(name = "催款次数", width = 15) @ApiModelProperty(value = "催款次数") - private java.lang.Integer pressMoneyTimes; + private Integer pressMoneyTimes; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") - private java.lang.String remarks; + @Size(max = 200,message = "备注长度应小于200个字符") + 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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java new file mode 100644 index 00000000..7bfcd137 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java @@ -0,0 +1,19 @@ +package com.jero.project.service.impl; + +import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.mapper.PayWorkingGroupSubitemMapper; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: pay_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Service +public class PayWorkingGroupSubitemServiceImpl extends ServiceImpl implements IPayWorkingGroupSubitemService { + +} From 870b802aec0812987af5c52f1d7bf91b606d50a1 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, 30 Aug 2021 17:19:43 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayWorkingGroupController.java | 151 ++++++++++++++++++ .../PayWorkingGroupSubitemController.java | 149 +++++++++++++++++ .../jero/project/entity/PayWorkingGroup.java | 8 +- .../entity/PayWorkingGroupSubitem.java | 146 +++++++++++++++++ .../project/mapper/PayWorkingGroupMapper.java | 14 ++ .../mapper/PayWorkingGroupSubitemMapper.java | 14 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 5 + .../xml/PayWorkingGroupSubitemMapper.xml | 5 + .../service/IPayWorkingGroupService.java | 14 ++ .../IPayWorkingGroupSubitemService.java | 14 ++ .../impl/PayWorkingGroupServiceImpl.java | 19 +++ 11 files changed, 535 insertions(+), 4 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java new file mode 100644 index 00000000..ec063a8e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -0,0 +1,151 @@ +package com.jero.project.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.entity.PayWorkingGroup; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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: 工作组项目 + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Api(tags="工作组项目") +@RestController +@RequestMapping("/project/payWorkingGroup") +@Slf4j +public class PayWorkingGroupController extends JeroController { + @Autowired + private IPayWorkingGroupService payWorkingGroupService; + + /** + * 分页列表查询 + * + * @param payWorkingGroup + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="工作组项目-分页列表查询", notes="工作组项目-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayWorkingGroup payWorkingGroup, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payWorkingGroup + * @return + */ + @ApiOperation(value="工作组项目-添加", notes="工作组项目-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayWorkingGroup payWorkingGroup) { + payWorkingGroupService.save(payWorkingGroup); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payWorkingGroup + * @return + */ + @ApiOperation(value="工作组项目-编辑", notes="工作组项目-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayWorkingGroup payWorkingGroup) { + payWorkingGroupService.updateById(payWorkingGroup); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="工作组项目-通过id删除", notes="工作组项目-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payWorkingGroupService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="工作组项目-批量删除", notes="工作组项目-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payWorkingGroupService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="工作组项目-通过id查询", notes="工作组项目-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(id); + if(payWorkingGroup==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payWorkingGroup); + } + + /** + * 导出excel + * + * @param request + * @param payWorkingGroup + */ + @GetMapping(value = "/exportXls") + @ApiOperation(value="工作组项目-导出excel", notes="工作组项目-导出excel") + public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroup payWorkingGroup) { + return super.exportXls(request, payWorkingGroup, PayWorkingGroup.class, "pay_working_group"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @PostMapping(value = "/importExcel") + @ApiOperation(value="工作组项目-通过excel导入数据", notes="工作组项目-通过excel导入数据") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayWorkingGroup.class); + } + +} 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 new file mode 100644 index 00000000..99bd8190 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java @@ -0,0 +1,149 @@ +package com.jero.project.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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: 工作组成员 + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Api(tags="工作组成员") +@RestController +@RequestMapping("/project/payWorkingGroupSubitem") +@Slf4j +public class PayWorkingGroupSubitemController extends JeroController { + @Autowired + private IPayWorkingGroupSubitemService payWorkingGroupSubitemService; + + /** + * 分页列表查询 + * + * @param payWorkingGroupSubitem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="工作组成员-分页列表查询", notes="工作组成员-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayWorkingGroupSubitem payWorkingGroupSubitem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payWorkingGroupSubitemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payWorkingGroupSubitem + * @return + */ + @ApiOperation(value="工作组成员-添加", notes="工作组成员-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) { + payWorkingGroupSubitemService.save(payWorkingGroupSubitem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payWorkingGroupSubitem + * @return + */ + @ApiOperation(value="工作组成员-编辑", notes="工作组成员-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) { + payWorkingGroupSubitemService.updateById(payWorkingGroupSubitem); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value="工作组成员-通过id删除", notes="工作组成员-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payWorkingGroupSubitemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value="工作组成员-批量删除", notes="工作组成员-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payWorkingGroupSubitemService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value="工作组成员-通过id查询", notes="工作组成员-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayWorkingGroupSubitem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id); + if(payWorkingGroupSubitem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payWorkingGroupSubitem); + } + + /** + * 导出excel + * + * @param request + * @param payWorkingGroupSubitem + */ + @GetMapping(value = "/exportXls") + @ApiOperation(value="工作组成员-导出excel", notes="工作组成员-导出excel") + public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubitem payWorkingGroupSubitem) { + return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubitem.class, "pay_working_group_subitem"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @PostMapping(value = "/importExcel") + @ApiOperation(value="工作组成员-通过excel导入数据", notes="工作组成员-通过excel导入数据") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayWorkingGroupSubitem.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 6b9eccbf..5d6fdb58 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -99,16 +99,16 @@ public class PayWorkingGroup implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @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; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @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; } 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 new file mode 100644 index 00000000..3e5388ba --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java @@ -0,0 +1,146 @@ +package com.jero.project.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_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Data +@TableName("pay_working_group_subitem") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_working_group_subitem对象", description="pay_working_group_subitem") +public class PayWorkingGroupSubitem 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 chargeProject; + /**工作组id*/ + @Excel(name = "工作组id", width = 15) + @ApiModelProperty(value = "工作组id") + private java.lang.String workingGroupId; + /**成员单位id*/ + @Excel(name = "成员单位id", width = 15) + @ApiModelProperty(value = "成员单位id") + private java.lang.String chargeCompanyId; + /**成员单位*/ + @Excel(name = "成员单位", width = 15) + @ApiModelProperty(value = "成员单位") + private java.lang.String chargeCompanyName; + /**企业联系人一id*/ + @Excel(name = "企业联系人一id", width = 15) + @ApiModelProperty(value = "企业联系人一id") + private java.lang.String contactsIdOne; + /**企业联系人一名称*/ + @Excel(name = "企业联系人一名称", width = 15) + @ApiModelProperty(value = "企业联系人一名称") + private java.lang.String contactsNameOne; + /**企业联系人二id*/ + @Excel(name = "企业联系人二id", width = 15) + @ApiModelProperty(value = "企业联系人二id") + private java.lang.String contactsIdTwo; + /**企业联系人二名称*/ + @Excel(name = "企业联系人二名称", width = 15) + @ApiModelProperty(value = "企业联系人二名称") + private java.lang.String contactsNameTwo; + /**企业联系人三id*/ + @Excel(name = "企业联系人三id", width = 15) + @ApiModelProperty(value = "企业联系人三id") + private java.lang.String contactsIdThree; + /**企业联系人三名称*/ + @Excel(name = "企业联系人三名称", width = 15) + @ApiModelProperty(value = "企业联系人三名称") + private java.lang.String contactsNameThree; + /**应收金额（元）*/ + @Excel(name = "应收金额（元）", width = 15) + @ApiModelProperty(value = "应收金额（元）") + private java.lang.Integer receivableAmount; + /**实收金额（元）*/ + @Excel(name = "实收金额（元）", width = 15) + @ApiModelProperty(value = "实收金额（元）") + private java.lang.Integer paidAmount; + /**邮寄联系人id*/ + @Excel(name = "邮寄联系人id", width = 15) + @ApiModelProperty(value = "邮寄联系人id") + private java.lang.String mailContactsId; + /**来款方式（1：无，2：合同，3：收费通知）*/ + @Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15) + @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") + private java.lang.Integer chargeWay; + /**合同编号*/ + @Excel(name = "合同编号", width = 15) + @ApiModelProperty(value = "合同编号") + private java.lang.String contractNum; + /**收费通知号*/ + @Excel(name = "收费通知号", width = 15) + @ApiModelProperty(value = "收费通知号") + private java.lang.String chargeNoticeNo; + /**收费通知文件id*/ + @Excel(name = "收费通知文件id", width = 15) + @ApiModelProperty(value = "收费通知文件id") + private java.lang.String chargeNoticeId; + /**打包（1：是，0：否）*/ + @Excel(name = "打包（1：是，0：否）", width = 15) + @ApiModelProperty(value = "打包（1：是，0：否）") + private java.lang.Integer packaging; + /**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/ + @Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15) + @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）") + private java.lang.Integer invoice; + /**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ + @Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) + @ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") + private java.lang.Integer inAccount; + /**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ + @Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) + @ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") + private java.lang.Integer makeInvoice; + /**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/ + @Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15) + @ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））") + private java.lang.Integer mail; + /**催款次数*/ + @Excel(name = "催款次数", width = 15) + @ApiModelProperty(value = "催款次数") + private java.lang.Integer pressMoneyTimes; + /**备注*/ + @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 HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.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; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java new file mode 100644 index 00000000..2ddbf284 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -0,0 +1,14 @@ +package com.jero.project.mapper; + +import com.jero.project.entity.PayWorkingGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: pay_working_group + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +public interface PayWorkingGroupMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java new file mode 100644 index 00000000..a4c7667d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java @@ -0,0 +1,14 @@ +package com.jero.project.mapper; + +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: pay_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +public interface PayWorkingGroupSubitemMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml new file mode 100644 index 00000000..43808909 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml new file mode 100644 index 00000000..e917253c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java new file mode 100644 index 00000000..5f66fab8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -0,0 +1,14 @@ +package com.jero.project.service; + +import com.jero.project.entity.PayWorkingGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: pay_working_group + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +public interface IPayWorkingGroupService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java new file mode 100644 index 00000000..98e8c4d7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java @@ -0,0 +1,14 @@ +package com.jero.project.service; + +import com.jero.project.entity.PayWorkingGroupSubitem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: pay_working_group_subitem + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +public interface IPayWorkingGroupSubitemService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java new file mode 100644 index 00000000..9b378ab7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -0,0 +1,19 @@ +package com.jero.project.service.impl; + +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.mapper.PayWorkingGroupMapper; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: pay_working_group + * @Author: jeecg-boot + * @Date: 2021-08-27 + * @Version: V1.0 + */ +@Service +public class PayWorkingGroupServiceImpl extends ServiceImpl implements IPayWorkingGroupService { + +} From 14e34c247d8ae0657f825a8dc77ef5bf2be38da0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 17:40:46 +0800 Subject: [PATCH 04/14] =?UTF-8?q?fix=20=E8=A7=92=E8=89=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/system/vo/SysRoleTreeModel.java | 5 +++++ .../jero/modules/system/service/impl/SysRoleServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java index 016227ba..3a22b186 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysRoleTreeModel.java @@ -48,6 +48,11 @@ public class SysRoleTreeModel implements Serializable { */ private String parentId; + /** + * 父类名称 + */ + private String parentName; + /** * 角色名称 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java index fa0c08bb..8285ca0c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java @@ -119,10 +119,14 @@ public class SysRoleServiceImpl extends ServiceImpl impl treeModel.setKey(sysRole.getId()); treeModel.setValue(sysRole.getId()); treeModel.setTitle(sysRole.getRoleName()); + treeModel.setParentName(sysRole.getRoleName()); List children = getChildrenByParentId(sysRole.getId()); treeModel.setChildren(children); treeModelList.add(treeModel); } + if (treeModelList.isEmpty()){ + return null; + } return treeModelList; } From b06e2a3b715381c6deedbd2171cf23800b16b946 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 17:53:43 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix=20=E8=A7=92=E8=89=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysRoleServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java index 8285ca0c..840225b3 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java @@ -105,6 +105,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return */ private List getChildrenByParentId(String parentId){ + SysRole sysRole1 = baseMapper.selectById(parentId); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (parentId==null){ wrapper.isNull(SysRole::getParentId); @@ -119,7 +120,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl treeModel.setKey(sysRole.getId()); treeModel.setValue(sysRole.getId()); treeModel.setTitle(sysRole.getRoleName()); - treeModel.setParentName(sysRole.getRoleName()); + treeModel.setParentName(sysRole1.getRoleName()); List children = getChildrenByParentId(sysRole.getId()); treeModel.setChildren(children); treeModelList.add(treeModel); From 22ea444a11f099e74ecad4c40378615ead9ac5cd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 18:00:41 +0800 Subject: [PATCH 06/14] =?UTF-8?q?add=20=E6=89=B9=E9=87=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/controller/OSSFileController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index 9d76cb22..89c92a91 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -2,6 +2,7 @@ package com.jero.modules.oss.controller; import javax.servlet.http.HttpServletRequest; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -21,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.util.Arrays; +import java.util.List; + @Slf4j @Controller @RequestMapping("/sys/oss/file") @@ -94,4 +98,17 @@ public class OSSFileController { return result; } + /** + * 通过ids查询. + */ + @ResponseBody + @GetMapping("/queryByIds") + public Result> queryByIds(@RequestParam(name = "ids") String ids) { + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(OSSFile::getId ,Arrays.asList(ids.split(","))); + List list = ossFileService.list(wrapper); + return Result.OK(list); + } + } From b19348d5f6dacb78fcb500cbcf945f2f10ae4540 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 18:28:30 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix=20=E5=B7=B2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=B8=8D=E8=83=BD=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E5=AF=B9=E5=BA=94=E7=9A=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E6=80=81=E6=A1=86=E5=88=97=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/system/mapper/xml/SysUserMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 13e9d8f4..24af04fc 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -182,6 +182,10 @@ and a.username LIKE CONCAT('%', #{user.username},'%') + + and a.id not in (select user_id from sys_user_depart where dep_id = + (select id from sys_depart where org_code = #{user.orgCode})) + From 7e3ce9a0e62e36b444606547b441ed8a7b5c8b84 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 18:36:27 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix=20=E9=83=A8=E9=97=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 16 ++++++---------- .../modules/system/mapper/xml/SysUserMapper.xml | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) 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 f03dc699..4836de1e 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 @@ -834,20 +834,17 @@ public class SysUserController { @RequestMapping(value = "/departUserList", method = RequestMethod.GET) @RequiresPermissions("sys:user:list") public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result<>(); Page page = new Page(pageNo, pageSize); String depId = req.getParameter("depId"); String username = req.getParameter("username"); //根据部门ID查询,当前和下级所有的部门IDS List subDepids = new ArrayList<>(); - //部门id为空时，查询我的部门下所有用户 + //部门id为空时，返回空 if(oConvertUtils.isEmpty(depId)){ - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; - if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ - subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); - } + return result; }else{ subDepids = sysDepartService.getSubDepIdsByDepId(depId); } @@ -855,8 +852,7 @@ public class SysUserController { IPage pageList = sysUserService.getUserByDepIds(page,subDepids,username); List userList = new ArrayList<>(); for (SysUser record : pageList.getRecords()) { - record.setEmail(PasswordUtil.decrypt(record.getEmail())); - record.setPhone(PasswordUtil.decrypt(record.getPhone())); + UserUtil.decryptUser(record); userList.add(record); } pageList.setRecords(userList); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 24af04fc..bcbb7520 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -34,7 +34,7 @@ ) - and username = #{username} + and username like concat('%',#{username},'%') From 544b74287a4265cb46e9b3e1aeb08cff96e73902 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 18:47:15 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix=20=E9=83=A8=E9=97=A8=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDepartController.java | 4 ++-- .../modules/system/controller/SysDictController.java | 6 +++--- .../java/com/jero/modules/system/entity/SysDepart.java | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index a9542196..7e21d935 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -310,7 +310,7 @@ public class SysDepartController { mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepart.class); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:"+user.getRealname(), "导出信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } @@ -334,7 +334,7 @@ public class SysDepartController { for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); + params.setTitleRows(1); params.setHeadRows(1); params.setNeedSave(true); try { diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 45598acb..db76b5a0 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -463,7 +463,7 @@ public class SysDictController { mv.addObject(NormalExcelConstants.CLASS, SysDictPage.class); // 自定义表格参数 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "导出人:"+user.getRealname(), "数据字典")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "数据字典")); // 导出数据列表 mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; @@ -485,8 +485,8 @@ public class SysDictController { for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(2); + params.setTitleRows(1); + params.setHeadRows(1); params.setNeedSave(true); try { //导入Excel格式校验，看匹配的字段文本概率 diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 62cc6b75..f440a099 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -35,7 +35,6 @@ public class SysDepart implements Serializable { @Excel(name="机构/部门名称",width=15) private String departName; /**英文名*/ - @Excel(name="英文名",width=15) private String departNameEn; /**缩写*/ private String departNameAbbr; @@ -46,7 +45,7 @@ public class SysDepart implements Serializable { @Excel(name="描述",width=15) private String description; /**机构类别 1公司，2组织机构，2岗位*/ - @Excel(name="机构类别",width=15,dicCode="org_category") + @Excel(name="机构类别",width=15,dicCode="org_category",orderNum = "1") private String orgCategory; /**机构类型*/ private String orgType; @@ -54,16 +53,15 @@ public class SysDepart implements Serializable { @Excel(name="机构编码",width=15) private String orgCode; /**手机号*/ - @Excel(name="手机号",width=15) + @Excel(name="电话",width=15,orderNum = "2") private String mobile; /**传真*/ - @Excel(name="传真",width=15) private String fax; /**地址*/ - @Excel(name="地址",width=15) + @Excel(name="地址",width=15,orderNum = "3") private String address; /**备注*/ - @Excel(name="备注",width=15) + @Excel(name="备注",width=15,orderNum = "4") private String memo; /**状态（1启用，0不启用）*/ @Dict(dicCode = "depart_status") From 1ff055a5f7612042018c67c787caa2bda397c047 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 19:06:26 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix=20=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysUserController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 4836de1e..7600a779 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 @@ -33,6 +33,7 @@ import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.*; import com.jero.modules.system.vo.SysDepartUsersVO; import com.jero.modules.system.vo.SysUserRoleVO; +import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -602,6 +603,13 @@ public class SysUserController { params.setHeadRows(1); params.setNeedSave(true); try { + //导入Excel格式校验，看匹配的字段文本概率 + Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysUser.class, params); + if(!t){ + errorLines++; + errorMessage.add("导入Excel校验失败 ！"); + throw new RuntimeException("导入Excel校验失败 ！"); + } List listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params); for (int i = 0; i < listSysUsers.size(); i++) { int lineNumber = i + 3; @@ -833,7 +841,7 @@ public class SysUserController { */ @RequestMapping(value = "/departUserList", method = RequestMethod.GET) @RequiresPermissions("sys:user:list") - public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + public Result departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result<>(); @@ -844,7 +852,7 @@ public class SysUserController { List subDepids = new ArrayList<>(); //部门id为空时，返回空 if(oConvertUtils.isEmpty(depId)){ - return result; + return Result.OK(new ArrayList<>()); }else{ subDepids = sysDepartService.getSubDepIdsByDepId(depId); } From d18d22dacc04779f927b95c3db74ac247ec4b9a5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 19:13:50 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix=20=E6=A0=A1=E9=AA=8CExcel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysUserController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 7600a779..b7979e52 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 @@ -606,9 +606,7 @@ public class SysUserController { //导入Excel格式校验，看匹配的字段文本概率 Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysUser.class, params); if(!t){ - errorLines++; - errorMessage.add("导入Excel校验失败 ！"); - throw new RuntimeException("导入Excel校验失败 ！"); + return Result.error("导入Excel校验失败 ！"); } List listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params); for (int i = 0; i < listSysUsers.size(); i++) { From c05c66bd8e2a710b4cb3fca032bb53d25ed9829c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 19:33:55 +0800 Subject: [PATCH 12/14] =?UTF-8?q?fix=20=E6=A0=A1=E9=AA=8CExcel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 17 ++++--- .../modules/system/vo/SysUserTemplate.java | 47 +++++++++++++++++++ 2 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java 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 b7979e52..88d913fe 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 @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Joiner; import com.jero.common.exception.JeroBootException; import com.jero.modules.system.util.UserUtil; +import com.jero.modules.system.vo.SysUserTemplate; import com.jero.modules.system.vo.SysUserVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -574,7 +575,7 @@ public class SysUserController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "用户导入模板文件"); - mv.addObject(NormalExcelConstants.CLASS, SysUser.class); + mv.addObject(NormalExcelConstants.CLASS, SysUserTemplate.class); mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户导入模板文件", "用户导入模板文件")); mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList()); return mv; @@ -620,19 +621,17 @@ public class SysUserController { String salt = oConvertUtils.randomGen(8); sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); + sysUserExcel.setPassword(passwordEncode); + sysUserExcel.setDelFlag(0); try { ValidUtil.validate(sysUserExcel); + //处理邮箱和手机号的加密 + UserUtil.encryptUser(sysUserExcel); + sysUserService.save(sysUserExcel); + successLines++; }catch (JeroBootException e) { errorLines++; errorMessage.add("第 " + lineNumber + " 行：" + e.getMessage()); - } - sysUserExcel.setPassword(passwordEncode); - //处理邮箱和手机号的加密 - UserUtil.encryptUser(sysUserExcel); - sysUserExcel.setDelFlag(0); - try { - sysUserService.save(sysUserExcel); - successLines++; } catch (Exception e) { errorLines++; String message = e.getMessage().toLowerCase(); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java new file mode 100644 index 00000000..ab1a4958 --- /dev/null +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java @@ -0,0 +1,47 @@ +package com.jero.modules.system.vo; + +import com.jero.common.aspect.annotation.Dict; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +/** + * @author liJiaRao + * @date 2021-08-30 19:20 + */ +@Data +public class SysUserTemplate { + /** + * 登录账号 + */ + @Excel(name = "用户账号", width = 15) + private String username; + + /** + * 真实姓名 + */ + @Excel(name = "用户姓名", width = 15) + private String realname; + + /** + * 电话 + */ + @Excel(name = "手机号", width = 15) + private String phone; + + /** + * 角色类型 + */ + @Excel(name="角色类型",width = 15) + private String roleIds; + + /** + * 组织机构 + */ + @Excel(name="组织机构",width = 15) + private String departIds; +} From 0928f7e649fb2117195c0715d4ca45b7ffd12f54 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 09:48:13 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/aspect/DictAspect.java | 2 +- .../common/PayProjectCommon.java | 2 +- .../PayCommonProjectController.java | 29 ++++++++++--------- .../controller/PayWorkingGroupController.java | 7 ++--- .../PayWorkingGroupSubitemController.java | 6 ++-- .../entity/PayCommonProject.java | 2 +- .../entity/PayWorkingGroup.java | 2 +- .../entity/PayWorkingGroupSubitem.java | 2 +- .../mapper/PayCommonProjectMapper.java | 4 +-- .../mapper/PayWorkingGroupMapper.java | 4 +-- .../mapper/PayWorkingGroupSubitemMapper.java | 4 +-- .../mapper/xml/PayCommonProjectMapper.xml | 4 +-- .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../xml/PayWorkingGroupSubitemMapper.xml | 2 +- .../service/IPayCommonProjectService.java | 4 +-- .../service/IPayWorkingGroupService.java | 4 +-- .../IPayWorkingGroupSubitemService.java | 4 +-- .../impl/PayCommonProjectServiceImpl.java | 8 ++--- .../impl/PayWorkingGroupServiceImpl.java | 8 ++--- .../PayWorkingGroupSubitemServiceImpl.java | 8 ++--- 20 files changed, 54 insertions(+), 54 deletions(-) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/common/PayProjectCommon.java (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/controller/PayCommonProjectController.java (90%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/controller/PayWorkingGroupController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/controller/PayWorkingGroupSubitemController.java (96%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/entity/PayCommonProject.java (99%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/entity/PayWorkingGroup.java (99%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/entity/PayWorkingGroupSubitem.java (99%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/PayCommonProjectMapper.java (89%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/PayWorkingGroupMapper.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/PayWorkingGroupSubitemMapper.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/xml/PayCommonProjectMapper.xml (94%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/xml/PayWorkingGroupMapper.xml (68%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/mapper/xml/PayWorkingGroupSubitemMapper.xml (66%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/IPayCommonProjectService.java (86%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/IPayWorkingGroupService.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/IPayWorkingGroupSubitemService.java (72%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/impl/PayCommonProjectServiceImpl.java (79%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/impl/PayWorkingGroupServiceImpl.java (62%) rename jero-boot-incoming-payment/src/main/java/com/jero/{project => commonProject}/service/impl/PayWorkingGroupSubitemServiceImpl.java (62%) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java index 938942c4..c8eef2cd 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java @@ -41,7 +41,7 @@ public class DictAspect { private CommonAPI commonAPI; // 定义切点Pointcut - @Pointcut("execution(public * com.jero.modules..*.*Controller.*(..))") + @Pointcut("execution(public * com.jero.modules..*.*Controller.*(..)) || execution(public * com.jero..*.*Controller.*(..))") public void excudeService() { } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java index a22b5825..ba21a0bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/common/PayProjectCommon.java @@ -1,4 +1,4 @@ -package com.jero.project.common; +package com.jero.commonProject.common; public class PayProjectCommon { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java similarity index 90% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java index a4755f5e..877c4714 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayCommonProjectController.java @@ -1,4 +1,4 @@ -package com.jero.project.controller; +package com.jero.commonProject.controller; import java.util.Arrays; import java.util.Objects; @@ -9,10 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.project.common.PayProjectCommon; -import com.jero.project.service.IPayCommonProjectService; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.common.PayProjectCommon; +import com.jero.commonProject.service.IPayCommonProjectService; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -50,21 +49,23 @@ public class PayCommonProjectController extends JeroController queryPageList(PayCommonProject payCommonProject, + public Result> queryPageList(PayCommonProject payCommonProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="paymentDate",required = false) String paymentDate, HttpServletRequest req) { - if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ - return Result.error("来款项目长度应小于100个字符"); - } - if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ - return Result.error("来款单位长度应小于50个字符"); - } - +// if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ +// return Result.error("来款项目长度应小于100个字符"); +// } +// if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ +// return Result.error("来款单位长度应小于50个字符"); +// } + Result> result = new Result<>(); Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); - return Result.OK(pageList); + result.setSuccess(true); + result.setResult(pageList); + return result; } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java index ec063a8e..9cdfb602 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupController.java @@ -1,15 +1,14 @@ -package com.jero.project.controller; +package com.jero.commonProject.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.service.IPayWorkingGroupService; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/controller/PayWorkingGroupSubitemController.java index 99bd8190..6cac126f 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/commonProject/controller/PayWorkingGroupSubitemController.java @@ -1,4 +1,4 @@ -package com.jero.project.controller; +package com.jero.commonProject.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; @@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.service.IPayWorkingGroupSubitemService; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.service.IPayWorkingGroupSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayCommonProject.java index 04d5e745..1321bb75 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/commonProject/entity/PayCommonProject.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import java.sql.Date; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java index 5d6fdb58..04760483 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroup.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; 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/commonProject/entity/PayWorkingGroupSubitem.java similarity index 99% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/entity/PayWorkingGroupSubitem.java index 3e5388ba..42e98c9f 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/commonProject/entity/PayWorkingGroupSubitem.java @@ -1,4 +1,4 @@ -package com.jero.project.entity; +package com.jero.commonProject.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java similarity index 89% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java index 5d5f817c..2482bbf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayCommonProjectMapper.java @@ -1,8 +1,8 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java index 2ddbf284..f86c6397 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupMapper.java @@ -1,6 +1,6 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java index a4c7667d..eb7fd37d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/PayWorkingGroupSubitemMapper.java @@ -1,6 +1,6 @@ -package com.jero.project.mapper; +package com.jero.commonProject.mapper; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml similarity index 94% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml index c1cafcc1..d229eb5b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayCommonProjectMapper.xml @@ -1,8 +1,8 @@ - + - SELECT pcp.id, pcp.charge_project AS chargeProject, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml similarity index 68% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml index 43808909..2308df1f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml similarity index 66% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml index e917253c..83700b14 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/mapper/xml/PayWorkingGroupSubitemMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java similarity index 86% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java index 6789d6cd..e15a743a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayCommonProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayCommonProjectService.java @@ -1,8 +1,8 @@ -package com.jero.project.service; +package com.jero.commonProject.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.entity.PayCommonProject; +import com.jero.commonProject.entity.PayCommonProject; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java index 5f66fab8..c07f4afb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupService.java @@ -1,6 +1,6 @@ -package com.jero.project.service; +package com.jero.commonProject.service; -import com.jero.project.entity.PayWorkingGroup; +import com.jero.commonProject.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java similarity index 72% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java index 98e8c4d7..7f2963cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/IPayWorkingGroupSubitemService.java @@ -1,6 +1,6 @@ -package com.jero.project.service; +package com.jero.commonProject.service; -import com.jero.project.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java similarity index 79% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java index 43cd1221..61359056 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayCommonProjectServiceImpl.java @@ -1,10 +1,10 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.project.service.IPayCommonProjectService; -import com.jero.project.entity.PayCommonProject; -import com.jero.project.mapper.PayCommonProjectMapper; +import com.jero.commonProject.service.IPayCommonProjectService; +import com.jero.commonProject.entity.PayCommonProject; +import com.jero.commonProject.mapper.PayCommonProjectMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java index 9b378ab7..bc000af2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; -import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.mapper.PayWorkingGroupMapper; +import com.jero.commonProject.service.IPayWorkingGroupService; +import com.jero.commonProject.entity.PayWorkingGroup; +import com.jero.commonProject.mapper.PayWorkingGroupMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java similarity index 62% rename from jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java index 7bfcd137..aeabf107 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/commonProject/service/impl/PayWorkingGroupSubitemServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.project.service.impl; +package com.jero.commonProject.service.impl; -import com.jero.project.service.IPayWorkingGroupSubitemService; -import com.jero.project.entity.PayWorkingGroupSubitem; -import com.jero.project.mapper.PayWorkingGroupSubitemMapper; +import com.jero.commonProject.service.IPayWorkingGroupSubitemService; +import com.jero.commonProject.entity.PayWorkingGroupSubitem; +import com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; From 192d6f5fbec6ce79ab4ce7fe2e0dd890b0ff2db1 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 10:50:52 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCommonProjectController.java | 33 ++++++++++++------- .../entity/PayCommonProject.java | 4 --- 2 files changed, 22 insertions(+), 15 deletions(-) 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 877c4714..f2125808 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 @@ -15,6 +15,8 @@ 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.IPayContactsManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +39,8 @@ import io.swagger.annotations.ApiOperation; public class PayCommonProjectController extends JeroController { @Autowired private IPayCommonProjectService payCommonProjectService; + @Autowired + private IPayContactsManagementService payContactsManagementService; /** * 分页列表查询 @@ -49,23 +53,20 @@ public class PayCommonProjectController extends JeroController> queryPageList(PayCommonProject payCommonProject, + public Result queryPageList(PayCommonProject payCommonProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="paymentDate",required = false) String paymentDate, HttpServletRequest req) { -// if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ -// return Result.error("来款项目长度应小于100个字符"); -// } -// if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ -// return Result.error("来款单位长度应小于50个字符"); -// } - Result> result = new Result<>(); + if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ + return Result.error("来款项目长度应小于100个字符"); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ + return Result.error("来款单位长度应小于50个字符"); + } Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); - result.setSuccess(true); - result.setResult(pageList); - return result; + return Result.OK(pageList); } /** @@ -94,6 +95,16 @@ public class PayCommonProjectController extends JeroController