diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java index 96f57de1..82d73090 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java @@ -18,7 +18,7 @@ public class PayCompanyManagementCommon { */ public final static Integer STATUS2 = 2; /** - * 财务角色 + * 企业状态 */ - public final static String ROLE_CODE = "cwry"; + public final static String COMPANY_STATUS = "(未通过)"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index bb80733f..8dd4cb9d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.aspect.annotation.CompanyNameTranslate; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.common.RoleCommon; @@ -25,7 +24,9 @@ import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; +import com.jero.company.service.IPayContactsManagementService; import com.jero.company.service.ProjectCountService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -40,7 +41,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.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -66,14 +66,15 @@ public class PayCompanyManagementController extends JeroController queryCompanyPageList(PayCompanyManagement payCompanyManagement, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ + return Result.error("企业名称长度不能大于50个字符!"); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payCompanyManagementService.page(page, queryWrapper); + List listPayCompanyManagement = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ + try { + listPayCompanyManagement.forEach(p->{ + if (!StringUtils.isBlank(p.getCompanyPhone())){ + p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); + } + }); + pageList.setRecords(listPayCompanyManagement); + }catch (Exception e){ + log.error("公司电话解密异常!",e); + } + } + return Result.OK(pageList); + } + + /** + * 其他功能调用企业管理-分页列表查询 + * (管理端查询dataSource = 1的数据;报名查询全部的数据) + * @param payCompanyManagement 企业管理 + * @param pageNo 页数 + * @param pageSize 条数 + * @param req + * @return + */ +// @CompanyNameTranslate(fieldId = "id") + @RequiresPermissions("company:search") + @ApiOperation(value="其他功能调用企业管理-分页列表查询", notes="其他功能调用企业管理-分页列表查询") @GetMapping(value = "/list") public Result queryPageList(PayCompanyManagement payCompanyManagement, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -544,6 +584,21 @@ public class PayCompanyManagementController extends JeroController queryCompanyByIdFindContacts(@RequestParam(name="id") String id) { + LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); + queryPayContactsManagement.eq(PayContactsManagement::getCompanyId,id); + List listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement); + return Result.OK(listPayContactsManagement); + } + /** * 通过id查询 *