全所统计

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java

@@ -151,7 +151,13 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 //		ids为空表示搜索导出
 		if (StringUtils.isBlank(ids)) {
 			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName);
-			return getModelAndView(list);
+			ArrayList<ChooseExcelWorkingGroup> objects = new ArrayList<>();
+			for(ChooseExcelWorkingGroup c:list){
+				if(StringUtils.isNotBlank(c.getCompanyName())){
+					objects.add(c);
+				}
+			}
+			return getModelAndView(objects);
 		} else {
 			ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
 			List<ChooseExcelWorkingGroup> list= payCaseCommitteeSubitemService.chooseExcel(idList);

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -29,6 +29,7 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
+        group by pe.id
         order by pe.create_time desc
     </select>
     <select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
@@ -66,7 +67,7 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
-
+        order by pe.create_time desc
 
     </select>
 

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -82,7 +82,6 @@ public class PayMailBill implements Serializable {
     @ApiModelProperty(value = "快递公司")
     private java.lang.Integer sendMethod;
 	/**快递单号*/
-	@Excel(name = "快递单号", width = 15)
     @ApiModelProperty(value = "快递单号")
     private java.lang.String postNo;
 

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

@@ -154,12 +154,12 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
     IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page,@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,@Param("idList") List<String> idList );
 
     /**
-     * 企业来款详情
+     * 企业来款详情导出
      * @param
      * @param companyComeMoneyDetailSearch
      * @return
      */
-    List<CompanyComeMoneyDetail> queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
+    List<CompanyComeMoneyDetail> queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,@Param("idList") List<String> idList);
 
 
     List<PrincipalPeopleList> queryPageListForPrincipalFirstPage();

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

@@ -164,7 +164,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      * @param companyComeMoneyDetailSearch
      * @return
      */
-    List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
+    List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,List<String> idList);
 
     /**
      * 企业来款统计导出

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

@@ -293,8 +293,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
      * @return
      */
     @Override
-    public List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
-        return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch);
+    public List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch,idList);
     }
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java

@@ -228,8 +228,31 @@ public class CompanyComeMoneyStatisticsController {
             String year = String.valueOf(calendar.get(Calendar.YEAR));
             companyComeMoneyDetailSearch.setYear(year);
         }
-        List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch);
-
+        //根据不同角色加载不同列表的参数
+        List<String> idList = new ArrayList<>();
+        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String roleCode = sysUser.getRoleCode();
+        List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+        //科长
+        if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
+            String orgCode = sysUser.getOrgCode();
+            List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
+            idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+            //所领导或者超级管理员
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
+            idList=null;
+            //企业职员项目负责人
+        }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
+            String userId = sysUser.getId();
+            idList.add(userId);
+        }
+        List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch,idList);
+        for(CompanyComeMoneyDetail s: pageList){
+            String key = String.valueOf(s.getChargeUse());
+            String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+            s.setChargeUse_text(payment_charge_use);
+        }
         return AmountUtil.exportListXls(pageList, CompanyComeMoneyDetail.class, "企业来款详情统计");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java

@@ -99,7 +99,7 @@ public class PrincipalPeopleStatisticsController {
                  sum2 = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
             }
         //处理为空数据为0
-        for(PrincipalPeopleList s: pageList.getRecords()) {
+        for(PrincipalPeopleList s: Objects.requireNonNull(pageList.getRecords())) {
             if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
                 s.setAllMoney("0.00");
             }
@@ -110,8 +110,6 @@ public class PrincipalPeopleStatisticsController {
                 s.setFinishRate("0.00%");
             }
         }
-
-
             DecimalFormat df = new DecimalFormat("#.00");
             hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
             hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java

@@ -22,10 +22,10 @@ public class CompanyComeMoneyDetail {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收金额")
     private String comeAllMoney;
-    @Excel(name = "来款用途", width = 15,dicCode = "charge_use")
+
     @ApiModelProperty(value = "来款用途编码")
     private String chargeUse;
-
+    @Excel(name = "来款用途")
     @ApiModelProperty(value = "来款用途")
     private String chargeUse_text;
 }