管理端企业管理修改

This commit is contained in:
梁琦涛
2021-10-11 12:22:51 +08:00
parent 4f423668e7
commit 1a565c19f2
@@ -49,7 +49,7 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
/** /**
* @Description: 企业管理 * @Description: 企业管理
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2021-08-25 * @Date: 2021-08-25
@@ -71,7 +71,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
private ISysUserService sysUserService; private ISysUserService sysUserService;
@Resource @Resource
private SendMessageService sendMessageService; private SendMessageService sendMessageService;
/** /**
* 分页列表查询 * 分页列表查询
* (管理端查询dataSource = 1的数据;报名查询全部的数据) * (管理端查询dataSource = 1的数据;报名查询全部的数据)
@@ -102,6 +102,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if (!StringUtils.isBlank(p.getCompanyPhone())){ if (!StringUtils.isBlank(p.getCompanyPhone())){
p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
} }
// if(!Objects.equals(p.getStatus(),PayCompanyManagementCommon.STATUS1)){
// p.setCompanyName(p.getCompanyName() + PayCompanyManagementCommon.COMPANY_STATUS);
// }
}); });
pageList.setRecords(listPayCompanyManagement); pageList.setRecords(listPayCompanyManagement);
}catch (Exception e){ }catch (Exception e){
@@ -111,114 +114,117 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 分页列表查询 - 会议对外开放接口 * 分页列表查询 - 会议对外开放接口
* (管理端查询dataSource = 1的数据;报名查询全部的数据) * (管理端查询dataSource = 1的数据;报名查询全部的数据)
* @param payCompanyManagement 企业管理 * @param payCompanyManagement 企业管理
* @param pageNo 页数 * @param pageNo 页数
* @param pageSize 条数 * @param pageSize 条数
* @param req * @param req
* @return * @return
*/ */
@ApiOperation(value="企业管理-分页列表查询-会议对外开放接口", notes="企业管理-分页列表查询-会议对外开放接口") @ApiOperation(value="企业管理-分页列表查询-会议对外开放接口", notes="企业管理-分页列表查询-会议对外开放接口")
@GetMapping(value = "/listMeeting") @GetMapping(value = "/listMeeting")
public Result<?> queryPageListMeeting(PayCompanyManagement payCompanyManagement, public Result<?> queryPageListMeeting(PayCompanyManagement payCompanyManagement,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
return Result.error("企业名称长度不能大于50个字符!"); return Result.error("企业名称长度不能大于50个字符!");
} }
QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());
Page<PayCompanyManagement> page = new Page<PayCompanyManagement>(pageNo, pageSize); Page<PayCompanyManagement> page = new Page<PayCompanyManagement>(pageNo, pageSize);
IPage<PayCompanyManagement> pageList = payCompanyManagementService.page(page, queryWrapper); IPage<PayCompanyManagement> pageList = payCompanyManagementService.page(page, queryWrapper);
List<PayCompanyManagement> listPayCompanyManagement = pageList.getRecords(); List<PayCompanyManagement> listPayCompanyManagement = pageList.getRecords();
if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ if(!CollectionUtils.isEmpty(listPayCompanyManagement)){
try { try {
listPayCompanyManagement.forEach(p->{ listPayCompanyManagement.forEach(p->{
if (!StringUtils.isBlank(p.getCompanyPhone())){ if (!StringUtils.isBlank(p.getCompanyPhone())){
p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
} }
}); });
pageList.setRecords(listPayCompanyManagement); pageList.setRecords(listPayCompanyManagement);
}catch (Exception e){ }catch (Exception e){
log.error("公司电话解密异常!",e); log.error("公司电话解密异常!",e);
} }
} }
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 添加-会议对外开放接口 * 添加-会议对外开放接口
* *
* @param payCompanyManagement 企业管理 * @param payCompanyManagement 企业管理
* @return * @return
*/ */
@AutoLog(value = "企业管理-添加",operateType = 2) @AutoLog(value = "企业管理-添加",operateType = 2)
@ApiOperation(value="企业管理-添加-会议对外开放接口", notes="企业管理-添加-会议对外开放接口") @ApiOperation(value="企业管理-添加-会议对外开放接口", notes="企业管理-添加-会议对外开放接口")
@PostMapping(value = "/addMeeting") @PostMapping(value = "/addMeeting")
public Result<?> addMeeting(@RequestBody PayCompanyManagement payCompanyManagement) { public Result<?> addMeeting(@RequestBody PayCompanyManagement payCompanyManagement) {
StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
if(!StringUtils.isBlank(msg)){ if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString()); return Result.error(msg.toString());
} }
try { try {
// 新增企业前在次校验企业名称是否存在 // 新增企业前在次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
// 存在数据 // 存在数据
if(!Objects.isNull(payCompanyManagementNew)){ if(!Objects.isNull(payCompanyManagementNew)){
return Result.error("该企业名称已存在!"); return Result.error("该企业名称已存在!");
} }
}catch (Exception e){ }catch (Exception e){
log.info("企业管理-添加异常",e); log.info("企业管理-添加异常",e);
return Result.error("该企业名称已存在!"); return Result.error("该企业名称已存在!");
} }
try { try {
// 新增企业前在次校验信用代码是否存在 // 新增企业前在次校验信用代码是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode()); queryWrapper.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode());
PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
// 存在数据 // 存在数据
if(!Objects.isNull(payCompanyManagementNew)){ if(!Objects.isNull(payCompanyManagementNew)){
return Result.error("该信用代码已存在!"); return Result.error("该信用代码已存在!");
} }
}catch (Exception e){ }catch (Exception e){
log.info("企业管理-添加异常",e); log.info("企业管理-添加异常",e);
return Result.error("该信用代码已存在!"); return Result.error("该信用代码已存在!");
} }
if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
try { try {
payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()));
}catch (Exception e){ }catch (Exception e){
log.error("公司电话加密异常!",e); log.error("公司电话加密异常!",e);
} }
} }
payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE2); payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE2);
payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2); payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2);
payCompanyManagementService.save(payCompanyManagement); payCompanyManagementService.save(payCompanyManagement);
// 获取项目负责人,发送消息 // 获取项目负责人,发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY)); List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY));
if(!CollectionUtils.isEmpty(list)){ if(!CollectionUtils.isEmpty(list)){
list.forEach(item->{ list.forEach(item->{
// 发送消息 // 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO(); SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(item.getEmail())){ if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
} }
HashMap<String,String> map = new HashMap<>(); if(!StringUtils.isEmpty(item.getPhone())){
sendMessageDTO.setFromUser("admin"); sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
sendMessageDTO.setToUser(item.getUsername()); }
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode()); HashMap<String,String> map = new HashMap<>();
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setFromUser("admin");
sendMessageDTO.setBusType("M_OPEN_TYPE9"); sendMessageDTO.setToUser(item.getUsername());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode());
}); sendMessageDTO.setTemplateParam(map);
} sendMessageDTO.setBusType("M_OPEN_TYPE9");
return Result.OK("添加成功!",payCompanyManagement); sendMessageService.SendMessageService(sendMessageDTO);
} });
}
return Result.OK("添加成功!",payCompanyManagement);
}
/** /**
* 添加 * 添加
* *
@@ -238,7 +244,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
// 查看角色是否为财务人员 // 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2; int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1; dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1; status = PayCompanyManagementCommon.STATUS1;
} }
@@ -288,6 +294,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!StringUtils.isBlank(item.getEmail())){ if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
} }
if(!StringUtils.isEmpty(item.getPhone())){
sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
}
HashMap<String,String> map = new HashMap<>(); HashMap<String,String> map = new HashMap<>();
sendMessageDTO.setFromUser(sysUser.getUsername()); sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setToUser(item.getUsername()); sendMessageDTO.setToUser(item.getUsername());
@@ -301,60 +310,60 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK("添加成功!",payCompanyManagement); return Result.OK("添加成功!",payCompanyManagement);
} }
/** /**
* 企业端-编辑 * 企业端-编辑
* *
* @param payCompanyManagement 企业管理 * @param payCompanyManagement 企业管理
* @return * @return
*/ */
@AutoLog(value = "企业管理-修改",operateType = 3) @AutoLog(value = "企业管理-修改",operateType = 3)
@ApiOperation(value="企业管理-企业端-编辑", notes="企业管理-企业端-编辑") @ApiOperation(value="企业管理-企业端-编辑", notes="企业管理-企业端-编辑")
@PostMapping(value = "/companyEdit") @PostMapping(value = "/companyEdit")
public Result<?> companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) { public Result<?> companyEdit(@RequestBody PayCompanyManagement payCompanyManagement) {
StringBuilder msg = ValidUtil.validateAll(payCompanyManagement); StringBuilder msg = ValidUtil.validateAll(payCompanyManagement);
if(!StringUtils.isBlank(msg)){ if(!StringUtils.isBlank(msg)){
return Result.error(msg.toString()); return Result.error(msg.toString());
} }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核,其他人都需要审核 // 只有财务人员操作不需要重新审核,其他人都需要审核
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
status = PayCompanyManagementCommon.STATUS1; status = PayCompanyManagementCommon.STATUS1;
} }
payCompanyManagement.setStatus(status); payCompanyManagement.setStatus(status);
PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId()); PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId());
if(Objects.isNull(payCompanyManagementOld)){ if(Objects.isNull(payCompanyManagementOld)){
return Result.error("企业不存在!"); return Result.error("企业不存在!");
} }
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
return Result.error("企业名称不可修改!"); return Result.error("企业名称不可修改!");
} }
payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource()); payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
try { try {
// 编辑保存企业前再次校验企业名称是否存在 // 编辑保存企业前再次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); queryWrapper.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper); PayCompanyManagement payCompanyManagementNew = payCompanyManagementService.getOne(queryWrapper);
// 企业名称存在,并且编辑id与查询不同,则校验不通过 // 企业名称存在,并且编辑id与查询不同,则校验不通过
if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) { if(!Objects.isNull(payCompanyManagementNew) && !Objects.equals(payCompanyManagementNew.getId(),payCompanyManagement.getId())) {
return Result.error("企业名称已存在!"); return Result.error("企业名称已存在!");
} }
}catch (Exception e){ }catch (Exception e){
log.info("企业管理-编辑异常",e); log.info("企业管理-编辑异常",e);
return Result.error("企业名称已存在!"); return Result.error("企业名称已存在!");
} }
if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
try { try {
payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone())); payCompanyManagement.setCompanyPhone(PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()));
}catch (Exception e){ }catch (Exception e){
log.error("公司电话加密异常!",e); log.error("公司电话加密异常!",e);
} }
} }
payCompanyManagementService.updateById(payCompanyManagement); payCompanyManagementService.updateById(payCompanyManagement);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* 编辑 * 编辑
* *
@@ -373,7 +382,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核,其他人都需要审核 // 只有财务人员操作不需要重新审核,其他人都需要审核
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
status = PayCompanyManagementCommon.STATUS1; status = PayCompanyManagementCommon.STATUS1;
} }
payCompanyManagement.setStatus(status); payCompanyManagement.setStatus(status);
@@ -401,29 +410,29 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
payCompanyManagementService.updateById(payCompanyManagement); payCompanyManagementService.updateById(payCompanyManagement);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* 确认 * 确认
* *
* @param id 企业管理id * @param id 企业管理id
* @return * @return
*/ */
@AutoLog(value = "企业管理-确认",operateType = 3) @AutoLog(value = "企业管理-确认",operateType = 3)
@RequiresPermissions("company:confirm") @RequiresPermissions("company:confirm")
@ApiOperation(value="企业管理-确认", notes="企业管理-确认") @ApiOperation(value="企业管理-确认", notes="企业管理-确认")
@GetMapping(value = "/audit") @GetMapping(value = "/audit")
public Result<?> audit(@RequestParam(name="id") String id) { public Result<?> audit(@RequestParam(name="id") String id) {
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("id不能为空!"); return Result.error("id不能为空!");
} }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaUpdateWrapper<PayCompanyManagement> updatePayCompanyManagement = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PayCompanyManagement> updatePayCompanyManagement = new LambdaUpdateWrapper<>();
updatePayCompanyManagement.eq(PayCompanyManagement::getId,id); updatePayCompanyManagement.eq(PayCompanyManagement::getId,id);
updatePayCompanyManagement.set(PayCompanyManagement::getStatus,PayCompanyManagementCommon.STATUS1); updatePayCompanyManagement.set(PayCompanyManagement::getStatus,PayCompanyManagementCommon.STATUS1);
updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername()); updatePayCompanyManagement.set(PayCompanyManagement::getUpdateBy,sysUser.getUsername());
updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date()); updatePayCompanyManagement.set(PayCompanyManagement::getUpdateTime,new Date());
payCompanyManagementService.update(updatePayCompanyManagement); payCompanyManagementService.update(updatePayCompanyManagement);
return Result.OK("确认成功!"); return Result.OK("确认成功!");
} }
/** /**
* 通过id删除 * 通过id删除
* *
@@ -442,7 +451,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
payCompanyManagementService.removePayCompanyManagementById(id); payCompanyManagementService.removePayCompanyManagementById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* 批量删除 * 批量删除
* *
@@ -454,6 +463,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除") @ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
@GetMapping(value = "/deleteBatch") @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) { public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)) {
return Result.error("非财务人员不可操作!");
}
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("id不能为空!"); return Result.error("id不能为空!");
} }
@@ -468,42 +481,42 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* 通过信用代码查询 * 通过信用代码查询
* *
* @param dutyCode 信用代码 * @param dutyCode 信用代码
* @return * @return
*/ */
@ApiOperation(value="企业管理-通过信用代码查询", notes="企业管理-通过信用代码查询") @ApiOperation(value="企业管理-通过信用代码查询", notes="企业管理-通过信用代码查询")
@GetMapping(value = "/queryByDutyCode") @GetMapping(value = "/queryByDutyCode")
public Result<?> queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) { public Result<?> queryByDutyCode(@RequestParam(name="dutyCode") String dutyCode) {
if(StringUtils.isBlank(dutyCode)){ if(StringUtils.isBlank(dutyCode)){
return Result.error("信用代码不能为空!"); return Result.error("信用代码不能为空!");
}else{ }else{
if(dutyCode.length() > 50){ if(dutyCode.length() > 50){
return Result.error("信用代码长度应小于50字符!"); return Result.error("信用代码长度应小于50字符!");
} }
} }
try { try {
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCompanyManagement::getDutyCode,dutyCode); queryWrapper.eq(PayCompanyManagement::getDutyCode,dutyCode);
PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper); PayCompanyManagement payCompanyManagement = payCompanyManagementService.getOne(queryWrapper);
if(Objects.isNull(payCompanyManagement)) { if(Objects.isNull(payCompanyManagement)) {
return Result.OK("没有该信用代码!"); return Result.OK("没有该信用代码!");
} }
}catch (Exception e){ }catch (Exception e){
log.info("企业管理-通过信用代码查询",e); log.info("企业管理-通过信用代码查询",e);
return Result.error("该信用代码已存在!"); return Result.error("该信用代码已存在!");
} }
return Result.error("该信用代码已存在!"); return Result.error("该信用代码已存在!");
} }
/** /**
* 通过企业名称查询 * 通过企业名称查询
* *
* @param companyName 企业名称 * @param companyName 企业名称
* @return * @return
*/ */
@ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询") @ApiOperation(value="企业管理-通过企业名称查询", notes="企业管理-通过企业名称查询")
@GetMapping(value = "/queryByCompanyName") @GetMapping(value = "/queryByCompanyName")
public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) { public Result<?> queryByCompanyName(@RequestParam(name="companyName") String companyName) {
@@ -527,7 +540,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
} }
return Result.error("该企业名称已存在!"); return Result.error("该企业名称已存在!");
} }
/** /**
* 通过id查询 * 通过id查询
* *
@@ -544,17 +557,17 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK(payCompanyManagement); return Result.OK(payCompanyManagement);
} }
/** /**
* 导出excel * 导出excel
* *
* @param request * @param request
* @param payCompanyManagement 企业管理 * @param payCompanyManagement 企业管理
*/ */
@AutoLog(value = "企业管理-导出excel",operateType = 6) @AutoLog(value = "企业管理-导出excel",operateType = 6)
@RequiresPermissions("company:export") @RequiresPermissions("company:export")
@ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel") @ApiOperation(value="企业管理-导出excel", notes="企业管理-导出excel")
@GetMapping(value = "/exportXls") @GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagement payCompanyManagement) { public ModelAndView exportXls(HttpServletRequest request, PayCompanyManagement payCompanyManagement) {
// Step.1 组装查询条件 // Step.1 组装查询条件
QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, request.getParameterMap()); QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, request.getParameterMap());
@@ -588,36 +601,36 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
mv.addObject(NormalExcelConstants.PARAMS,exportParams); mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList); mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
return mv; return mv;
} }
/** /**
* 模板下载 * 模板下载
* *
* @return * @return
*/ */
@RequiresPermissions("company:downTemplate") @RequiresPermissions("company:downTemplate")
@ApiOperation(value="企业管理-模板下载", notes="企业管理-模板下载") @ApiOperation(value="企业管理-模板下载", notes="企业管理-模板下载")
@GetMapping(value = "/downloadExcelModel") @GetMapping(value = "/downloadExcelModel")
public ModelAndView downloadExcelModel() { public ModelAndView downloadExcelModel() {
return super.exportTemplate(PayCompanyManagement.class,"企业信息导入模板"); return super.exportTemplate(PayCompanyManagement.class,"企业信息导入模板");
} }
/** /**
* 通过excel导入数据 * 通过excel导入数据
* *
* @param request * @param request
* @return * @return
*/ */
@AutoLog(value = "企业管理-excel导入数据",operateType = 5) @AutoLog(value = "企业管理-excel导入数据",operateType = 5)
@RequiresPermissions("company:import") @RequiresPermissions("company:import")
@ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据") @ApiOperation(value="企业管理-excel导入数据", notes="企业管理-excel导入数据")
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request) { public Result<?> importExcel(HttpServletRequest request) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 查看角色是否为财务人员 // 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2; int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){ if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1; dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1; status = PayCompanyManagementCommon.STATUS1;
} }
@@ -707,5 +720,5 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
} }
} }
return Result.OK("文件导入成功!"); return Result.OK("文件导入成功!");
} }
} }