资料下载bug

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

@@ -129,26 +129,42 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 	 @AutoLog(value = "资料下载记录-导出")
 	 @ApiOperation(value="资料下载记录-导出", notes="资料下载记录-导出")
 	 @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
-	 public ModelAndView customExportXlsList(@RequestParam(name="ids",required = true) String ids) {
+	 public ModelAndView customExportXlsList(@RequestParam(name="ids",required = false) String ids) {
-		 ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
+	 	if(StringUtils.isBlank(ids)){
-		 ArrayList<PayFileDownloadRecord> list = new ArrayList<>();
+			QueryWrapper<PayFileDownloadRecord> queryWrapper = Wrappers.query();
-		 for(String id:strings) {
+			List<PayFileDownloadRecord> list = payFileDownloadRecordService.list(queryWrapper);
-			 LambdaQueryWrapper<PayFileDownloadRecord> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-			 objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayFileDownloadRecord::getId, id);
+			mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下
-			 PayFileDownloadRecord one = payFileDownloadRecordService.getOne(objectLambdaQueryWrapper,false);
+			mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.class);
-			 // Step.3 AutoPoi 导出Excelaw
+			//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-			 list.add(one);
+			ExportParams exportParams=new ExportParams("资料下载记录", "资料下载记录");
-		 }
+			exportParams.setImageBasePath(upLoadPath);
-		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+			//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-		 mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下
+			mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-		 mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.class);
+			mv.addObject(NormalExcelConstants.DATA_LIST, list);
-		 //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+			return mv;
-		 ExportParams exportParams=new ExportParams("资料下载记录", "资料下载记录");
+		}else {
-		 exportParams.setImageBasePath(upLoadPath);
+			ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
-		 //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+			ArrayList<PayFileDownloadRecord> list = new ArrayList<>();
-		 mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+			for (String id : strings) {
-		 mv.addObject(NormalExcelConstants.DATA_LIST, list);
+				LambdaQueryWrapper<PayFileDownloadRecord> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		 return mv;
+				objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayFileDownloadRecord::getId, id);
+				PayFileDownloadRecord one = payFileDownloadRecordService.getOne(objectLambdaQueryWrapper, false);
+				// Step.3 AutoPoi 导出Excelaw
+				list.add(one);
+			}
+			ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+			mv.addObject(NormalExcelConstants.FILE_NAME, "资料下载记录"); //此处设置的filename无效 ,前端会重更新设置一下
+			mv.addObject(NormalExcelConstants.CLASS, PayFileDownloadRecord.class);
+			//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+			ExportParams exportParams=new ExportParams("资料下载记录", "资料下载记录");
+			exportParams.setImageBasePath(upLoadPath);
+			//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+			mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+			mv.addObject(NormalExcelConstants.DATA_LIST, list);
+			return mv;
+		}
+
 	 }
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayFileDownloadRecord.java

@@ -39,8 +39,8 @@ public class PayFileDownloadRecord implements Serializable {
     @ApiModelProperty(value = "文件名称")
     private java.lang.String fileName;
 	/**文件目录*/
-	@Excel(name = "文件目录", width = 15)
+	@Excel(name = "目录层级", width = 15)
-    @ApiModelProperty(value = "文件目录")
+    @ApiModelProperty(value = "目录层级")
     private java.lang.String filePath;
 	/**企业名称*/
 	@Excel(name = "企业名称", width = 15)

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java

@@ -3,15 +3,28 @@ package com.jero.project.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author zql
  * @date 2021/9/13 10:45
  */
+@Data
 public class PayWorkingGroupStatistics {
-    /**主键*/
+
-    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
 
+    @ApiModelProperty(value = "工作组")
+    private String workGroup;
+
+    @ApiModelProperty(value = "应收总金额")
+    private String allMoney;
+
+    @ApiModelProperty(value = "实收总金额")
+    private String comeAllMoney;
+
+    @ApiModelProperty(value = "完收完成率")
+    private String moneyRate;
+
 }

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

@@ -101,4 +101,22 @@
         FROM pay_working_group
         WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId})
     </select>
+    <select id="queryPageListForStatistics" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
+        SELECT
+        id,
+        working_group_project AS workGroup
+        FROM pay_working_group
+        <where>
+            <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
+                AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
+            </if>
+            <if test="payWorkingGroup.principalIdA != null and payWorkingGroup.principalIdA != ''">
+                AND principal_id_a = #{payWorkingGroup.principalIdA}
+            </if>
+            <if test="payWorkingGroup.year != null and payWorkingGroup.year != ''">
+                AND year = #{payWorkingGroup.year}
+            </if>
+        </where>
+        ORDER BY create_time DESC
+    </select>
 </mapper>