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

add 企业管理员查询分标委

Browse Source
This commit is contained in:
lijiarao
2022-08-16 10:47:58 +08:00
parent 7b9da8227e
commit 6bfb4f7146
6 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+4 -4
View File
@@ -982,11 +982,11 @@ public class PayContactsManagementController extends JeroController<PayContactsM
public Result<?> baseInfo() {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//查出来人
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername());
PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement);
//LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
//queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername());
//PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement);
//查出来企业
PayCompanyManagement company = payCompanyManagementService.getById(contacts.getCompanyId());
PayCompanyManagement company = payCompanyManagementService.getById(sysUser.getCompanyId());
Map<String,Object> baseInfo = memberInfoService.baseInfo(company);
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName);
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
Page<FindByName> page = new Page<>(pageNo, pageSize);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThreeTwo(page,sysUser.getId(),fenBiaoWeiNames);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThreeTwo(page,sysUser,fenBiaoWeiNames);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+1
View File
@@ -34,5 +34,6 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitt
IPage<FindByName> listThreeTwo(Page<FindByName> page, @Param("id") String id, @Param("fenBiaoWeiName") String fenBiaoWeiName);
IPage<FindByName> listThreeTwoByCompany(Page<FindByName> page, @Param("companyId") String companyId, @Param("fenBiaoWeiName") String fenBiaoWeiName);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+19
View File
@@ -156,4 +156,23 @@
order by pm.create_time desc
</select>
<select id="listThreeTwoByCompany" resultMap="people">
SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,su.realname as principal
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join pay_company_management pcm on(pm.company_id=pcm.id)
left join sys_user su on(pe.create_by_id=su.id)
<where>
<if test="fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
<if test="companyId != null and companyId != ''">
AND pm.company_id = #{companyId}
</if>
</where>
group by pe.id
order by pe.create_time desc
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+2 -1
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.system.vo.LoginUser;
import com.jero.data.entity.*;
import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
@@ -31,6 +32,6 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
IPage<FindByName> listThreeTwo(Page<FindByName> page, String id, String fenBiaoWeiNames);
IPage<FindByName> listThreeTwo(Page<FindByName> page, LoginUser loginUser, String fenBiaoWeiNames);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+7 -2
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.vo.LoginUser;
import com.jero.data.entity.*;
import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
@@ -57,7 +58,11 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
}
@Override
public IPage<FindByName> listThreeTwo(Page<FindByName> page, String id, String fenBiaoWeiNames) {
return payCaseCommitteeSubitemMapper.listThreeTwo(page,id,fenBiaoWeiNames);
public IPage<FindByName> listThreeTwo(Page<FindByName> page, LoginUser loginUser, String fenBiaoWeiNames) {
if (loginUser.getIsCompanyManager()) {
return payCaseCommitteeSubitemMapper.listThreeTwoByCompany(page, loginUser.getCompanyId(),fenBiaoWeiNames);
}else{
return payCaseCommitteeSubitemMapper.listThreeTwo(page, loginUser.getId(),fenBiaoWeiNames);
}
}
}