server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -1,6 +1,5 @@ package com.doumee.cloud.admin; import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.api.BaseController; import com.doumee.config.DataSyncConfig; import com.doumee.config.annotation.CloudRequiredPermission; @@ -123,6 +122,12 @@ public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ return ApiResponse.success(companyService.findList(company)); } @ApiOperation("新建合同所属公司筛选") @PostMapping("/listForConstract") @CloudRequiredPermission("business:company:query") public ApiResponse<List<Company>> listForConstract (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ return ApiResponse.success(companyService.listForConstract(company)); }
@@ -129,4 +129,6 @@ Integer createFinanceCompany(Company company); Integer updateFinanceCompany(Company company); List<Company> listForConstract(Company company); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -432,6 +432,17 @@ } @Override public List<Company> listForConstract(Company company) { MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Company.class); queryWrapper.like(company.getName() != null,Company::getName, company.getName()); queryWrapper.eq(Company::getType, Constants.TWO); queryWrapper.eq(Company::getIsdeleted, Constants.ZERO); queryWrapper.exists("select b.id from yw_account b where b.isdeleted=0 and b.company_id=t.id and b.status=0"); queryWrapper.orderByDesc(Company::getCreateDate); return companyMapper.selectList(queryWrapper); } @Override public List<Company> findList(Company company) { MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>(); if (company.getId() != null) { server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -10,16 +10,18 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.erp.ErpConstants; import com.doumee.core.erp.ErpTool; import com.doumee.core.erp.model.openapi.request.erp.*; import com.doumee.core.erp.model.openapi.request.*; import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest; import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest; import com.doumee.core.erp.model.openapi.request.erp.UserListRequest; import com.doumee.core.erp.model.openapi.response.*; import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse; import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse; import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse; import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.erp.model.openapi.request.*; import com.doumee.core.erp.model.openapi.response.*; import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse; import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; import com.doumee.core.utils.DateUtil; @@ -31,8 +33,8 @@ import com.doumee.dao.business.join.DeviceEventJoinMapper; import com.doumee.dao.business.join.VisitEventJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.InterfaceLogService; import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.impl.MemberServiceImpl; import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper;
