add 企业管理员查询工作组

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java

@@ -138,4 +138,6 @@ public class LoginUser {
 	 */
 	private Boolean isCompanyManager;
 
+	private String companyId;
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -171,68 +171,6 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(Objects.isNull(sysUser)){
 			 return Result.error("没有查到用户信息！");
 		 }
-		 List<String> listProjectIds = new ArrayList<>();
-
-		 // 工作组的企业联系人
-		 LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
-		 queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId());
-		 List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
-		 if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
-		 	 List<String> listProjectId = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getWorkingGroupSubId).collect(Collectors.toList());
-			 listProjectIds.addAll(listProjectId);
-		 }
-
-		 // 邮寄联系人
-		 LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
-		 queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
-		 List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
-		 if(!CollectionUtils.isEmpty(listPayMailBill)){
-			 List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
-			 LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-			 queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
-			 List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
-			 if(!CollectionUtils.isEmpty(listPayMailBillProject)){
-				 List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listProjectId);
-			 }
-		 }
-		 // 打包的企业联系人和打包联系人
-		 LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
-		 queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
-				 .eq(PayPackCompany::getPackContactId,sysUser.getId());
-		 List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
-		 if(!CollectionUtils.isEmpty(listPayPackCompany)){
-			 List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
-			 LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
-			 queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
-			 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE2);
-			 List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
-			 if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
-				 List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listId);
-			 }
-		 }
-		 // 关联合同的签订单位联系人
-		 LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
-		 queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
-		 List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
-		 if(!CollectionUtils.isEmpty(listPayIncomeContract)){
-			 List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
-			 LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
-			 queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
-			 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2);
-			 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
-			 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
-				 List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listProjectId);
-			 }
-		 }
-		 List<String> listProjectIdsNew = new ArrayList<>();
-		 if(!CollectionUtils.isEmpty(listProjectIds)){
-			 listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
-		 }else{
-			 listProjectIdsNew.add("");
-		 }
 		 Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
 		 List<Integer> listNeedInvoice = new ArrayList<>();
 		 if(!Objects.isNull(payWorkingGroupSubItem.getNeedInvoice())){
@@ -247,7 +185,78 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeProject())){
 			 payWorkingGroupSubItem.setChargeProject(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeProject()));
 		 }
-		 IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew);
+		 IPage<PayWorkingGroupSubItem> pageList;
+		 //非企业管理员
+		 if (!sysUser.getIsCompanyManager()) {
+			 List<String> listProjectIds = new ArrayList<>();
+
+			 // 工作组的企业联系人
+			 LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
+			 queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId());
+			 List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
+			 if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
+				 List<String> listProjectId = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getWorkingGroupSubId).collect(Collectors.toList());
+				 listProjectIds.addAll(listProjectId);
+			 }
+
+			 // 邮寄联系人
+			 LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
+			 queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
+			 List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
+			 if(!CollectionUtils.isEmpty(listPayMailBill)){
+				 List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
+				 queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
+				 List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
+				 if(!CollectionUtils.isEmpty(listPayMailBillProject)){
+					 List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listProjectId);
+				 }
+			 }
+			 // 打包的企业联系人和打包联系人
+			 LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
+			 queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
+					 .eq(PayPackCompany::getPackContactId,sysUser.getId());
+			 List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
+			 if(!CollectionUtils.isEmpty(listPayPackCompany)){
+				 List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
+				 queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
+				 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE2);
+				 List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
+				 if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
+					 List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listId);
+				 }
+			 }
+			 // 关联合同的签订单位联系人
+			 LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
+			 queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
+			 List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
+			 if(!CollectionUtils.isEmpty(listPayIncomeContract)){
+				 List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
+				 queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
+				 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2);
+				 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
+				 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
+					 List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listProjectId);
+				 }
+			 }
+			 List<String> listProjectIdsNew = new ArrayList<>();
+			 if(!CollectionUtils.isEmpty(listProjectIds)){
+				 listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
+			 }else{
+				 listProjectIdsNew.add("");
+			 }
+			 pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew);
+		 }else{
+			 pageList = payWorkingGroupSubItemService.queryCompanyPageListByCompanyManager(page, payWorkingGroupSubItem,listNeedInvoice,sysUser.getCompanyId());
+		 }
+
+
+
 		 if(!CollectionUtils.isEmpty(pageList.getRecords())){
 			 List<PayWorkingGroupSubItem> list = pageList.getRecords();
 			 List<String> listIds = list.stream().map(PayWorkingGroupSubItem::getWorkingGroupId).collect(Collectors.toList());

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java

@@ -49,6 +49,10 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
      */
     IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List<Integer> listNeedInvoice,@Param("listProjectIds") List<String> listProjectIds);
     IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listProjectIds") List<String> listProjectIds);
+    /**
+     * 企业端-管理员-我的工作组分页查询
+     */
+    IPage<PayWorkingGroupSubItem> queryCompanyPageListByCompanyManager(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List<Integer> listNeedInvoice,@Param("companyId") String companyId);
 
 
     List<PayWorkGroupSubletStatistics> importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id")  String id,@Param("selections") ArrayList<String> selections);

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -278,4 +278,32 @@
         </where>
         group by pwgs.id order by pwgs.create_time desc
     </select>
+
+    <select id="queryCompanyPageListByCompanyManager" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
+
+        select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs
+        left join pay_working_group pwg ON pwgs.working_group_id = pwg.id
+        <where>
+            <if test="payWorkingGroupSubItem.chargeProject != null and payWorkingGroupSubItem.chargeProject != ''">
+                AND pwg.working_group_project like concat('%',concat(#{payWorkingGroupSubItem.chargeProject},'%'))
+            </if>
+            <if test="payWorkingGroupSubItem.pack != null">
+                AND pwgs.pack = #{payWorkingGroupSubItem.pack}
+            </if>
+            <if test="payWorkingGroupSubItem.year != null and payWorkingGroupSubItem.year != ''">
+                AND pwg.year = #{payWorkingGroupSubItem.year}
+            </if>
+            <if test="listNeedInvoice != null and listNeedInvoice.size() > 0">
+                AND pwgs.need_invoice in
+                <foreach collection="listNeedInvoice" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="companyId != null and companyId != ''">
+                and pwgs.charge_company_id = #{companyId}
+            </if>
+        </where>
+        group by pwgs.id order by pwgs.create_time desc
+
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java

@@ -99,6 +99,11 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
     */
     IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,PayWorkingGroupSubItem payWorkingGroupSubItem,List<Integer> listNeedInvoice,List<String> listProjectIds);
 
+    /**
+     * 企业端-管理员-我的工作组分页查询
+     */
+    IPage<PayWorkingGroupSubItem> queryCompanyPageListByCompanyManager(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubItem, List<Integer> listNeedInvoice, String companyId);
+
     List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections);
     /**
      * @Description 设置收费通知
@@ -112,4 +117,5 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
 
     AllMoney queryPageList233(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id);
 
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -897,6 +897,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem,listNeedInvoice, listProjectIds);
     }
 
+    @Override
+    public IPage<PayWorkingGroupSubItem> queryCompanyPageListByCompanyManager(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubItem, List<Integer> listNeedInvoice,String companyId) {
+        return payWorkingGroupSubItemMapper.queryCompanyPageListByCompanyManager( page, payWorkingGroupSubItem,listNeedInvoice,companyId);
+    }
+
     @Override
     public List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections) {
         return payWorkingGroupSubItemMapper.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections);