LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业端，消息，个人信息修改

Browse Source
This commit is contained in:
梁琦涛
2021-09-29 13:55:26 +08:00
parent 5fe1befb5d
commit 664e085c45
15 changed files with 235 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+57 -3
View File
@@ -60,11 +60,11 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping("/company/payCompanyManagement")
@Slf4j
public class PayCompanyManagementController extends JeroController<PayCompanyManagement, IPayCompanyManagementService> {
@Autowired
@Resource
private IPayCompanyManagementService payCompanyManagementService;
@Autowired
@Resource
private Environment env;
@Autowired
@Resource
private ProjectCountService projectCountService;
@Resource
@@ -299,6 +299,60 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
}
return Result.OK("添加成功！",payCompanyManagement);
}
/**
* 企业端-编辑
*
* @param payCompanyManagement 企业管理
* @return
*/
@AutoLog(value = "企业管理-企业端-编辑")
@ApiOperation(value="企业管理-企业端-编辑", notes="企业管理-企业端-编辑")
@PostMapping(value = "/companyEdit")
public Result<?> companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) {
StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId());
if(Objects.isNull(payCompanyManagementOld)){
return Result.error("企业不存在!");
}
if(Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
return Result.error("企业名称不可修改!");
}
payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
try {
// 编辑保存企业前再次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
// 企业名称存在，并且编辑id与查询不同，则校验不通过
if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) {
return Result.error("企业名称已存在！");
}
}catch (Exception e){
log.info("企业管理-编辑异常",e);
return Result.error("企业名称已存在！");
}
if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
try {
payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()));
}catch (Exception e){
log.error("公司电话加密异常！",e);
}
}
payCompanyManagementService.updateById(payCompanyManagement);
return Result.OK("编辑成功!");
}
/**
* 编辑
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+78 -4
View File
@@ -260,6 +260,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
return Result.error("企业不存在！");
}
payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
PayContactsManagement payContactsManagementOld = payContactsManagementService.getById(payContactsManagement.getId());
if(Objects.isNull(payContactsManagementOld)){
return Result.error("联系人不存在！");
}
try {
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
// 编辑保存联系人前再次校验手机号是否存在
@@ -301,6 +305,77 @@ public class PayContactsManagementController extends JeroController<PayContactsM
payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!");
}
/**
* 企业端-编辑
*
* @param payContactsManagement
* @return
*/
@AutoLog(value = "联系人管理-企业端-编辑")
@ApiOperation(value="联系人管理-企业端-编辑", notes="联系人管理-编辑")
@PostMapping(value = "/companyEdit")
public Result<?> companyEdit(@RequestBody PayContactsManagement payContactsManagement) {
StringBuilder msg = ValidUtil.validateAll(payContactsManagement);
if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString());
}
PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(payContactsManagement.getCompanyId());
if(Objects.isNull(payCompanyManagement)){
return Result.error("企业不存在！");
}
payContactsManagement.setCompanyName(payCompanyManagement.getCompanyName());
PayContactsManagement payContactsManagementOld = payContactsManagementService.getById(payContactsManagement.getId());
if(Objects.isNull(payContactsManagementOld)){
return Result.error("联系人不存在！");
}
if(Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
return Result.error("姓名不可修改！");
}
if(Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){
return Result.error("手机号不可修改！");
}
try {
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
// 编辑保存联系人前再次校验手机号是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getPhone,phone);
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
// 手机号存在，并且编辑id与查询不同，则校验不通过
if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
return Result.error("手机号已存在！");
}
}catch (Exception e){
log.info("联系人管理-编辑异常",e);
return Result.error("手机号已存在！");
}
try {
// 新增联系人前校验同企业下联系人是否存在
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName());
queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper);
// 姓名存在，并且编辑id与查询不同，则校验不通过
if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) {
return Result.error("联系人姓名已存在！");
}
}catch (Exception e){
log.info("联系人管理-编辑异常",e);
return Result.error("联系人姓名已存在！");
}
try {
if (!StringUtils.isBlank(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())){
payContactsManagement.setEmail(PasswordUtil.encrypt(payContactsManagement.getEmail()));
}
}catch (Exception e){
log.error("手机号、邮箱加密异常！",e);
}
payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
@@ -352,7 +427,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
* @param phone 手机号
* @return
*/
@AutoLog(value = "联系人管理-通过手机号查询")
// @AutoLog(value = "联系人管理-通过手机号查询")
@ApiOperation(value="联系人管理-通过手机号查询", notes="联系人管理-通过手机号查询")
@GetMapping(value = "/queryByCompanyName")
public Result<?> queryByCompanyName(@RequestParam(name="phone") String phone) {
@@ -385,7 +460,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
* @param name 联系人姓名
* @return
*/
@AutoLog(value = "联系人管理-通过联系人姓名查询")
// @AutoLog(value = "联系人管理-通过联系人姓名查询")
@ApiOperation(value="联系人管理-通过联系人姓名查询", notes="联系人管理-通过联系人姓名查询")
@GetMapping(value = "/queryByName")
public Result<?> queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) {
@@ -441,7 +516,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
* @param id
* @return
*/
@AutoLog(value = "联系人管理-查询详情")
// @AutoLog(value = "联系人管理-查询详情")
@ApiOperation(value="联系人管理-通过id查询", notes="联系人管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -489,7 +564,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
* @param companyId 企业id
* @return
*/
@AutoLog(value = "联系人管理-通过企业id查询用户")
@ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
@GetMapping(value = "/queryByCompany")
public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId) {