Compare commits
No commits in common. "2787535ef5495cd71ddb00965dd4c479ed85e6f1" and "a87456e66cdd9bcf6ffb3c6b22c676f2cb2caa35" have entirely different histories.
2787535ef5
...
a87456e66c
|
@ -3,7 +3,6 @@ package com.yanzhu.jh.flow.controller;
|
|||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.annotation.RateLimiter;
|
||||
import com.ruoyi.common.config.RuoYiConfig;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
@ -11,7 +10,6 @@ import com.ruoyi.common.core.text.Convert;
|
|||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.enums.LimitType;
|
||||
import com.ruoyi.common.enums.SysRoleEnum;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.system.service.ISysDeptService;
|
||||
import com.yanzhu.jh.flow.domain.FlowLabourInfo;
|
||||
|
@ -84,14 +82,6 @@ public class FlowLabourInfoController extends BaseController
|
|||
public void export(HttpServletResponse response, FlowLabourInfo flowLabourInfo)
|
||||
{
|
||||
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
|
||||
if(StringUtils.isNotEmpty(list)){
|
||||
for(FlowLabourInfo v:list){
|
||||
if(StringUtils.isNotEmpty(v.getFiles())){
|
||||
String path = v.getFiles().split(",")[0];
|
||||
v.setFiles(RuoYiConfig.getProjectUrl()+path);
|
||||
}
|
||||
}
|
||||
}
|
||||
ExcelUtil<FlowLabourInfo> util = new ExcelUtil<FlowLabourInfo>(FlowLabourInfo.class);
|
||||
util.exportExcel(response, list, "劳资投诉数据");
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
|||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.apache.poi.ss.usermodel.IndexedColors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
|
@ -22,6 +21,7 @@ public class FlowLabourInfo extends BaseEntity
|
|||
private Long id;
|
||||
|
||||
/** 所属项目 */
|
||||
@Excel(name = "所属项目")
|
||||
private Long projectId;
|
||||
|
||||
/** 项目名称 */
|
||||
|
@ -36,6 +36,7 @@ public class FlowLabourInfo extends BaseEntity
|
|||
private String deptName;
|
||||
|
||||
/** 分包单位 */
|
||||
@Excel(name = "分包单位")
|
||||
private Long subDeptId;
|
||||
|
||||
/** 分包单位名称 */
|
||||
|
@ -67,7 +68,7 @@ public class FlowLabourInfo extends BaseEntity
|
|||
private String laborReason;
|
||||
|
||||
/** 附件凭证 */
|
||||
@Excel(name = "附件凭证", isLink = true, color = IndexedColors.BLUE, linkText="查看图片")
|
||||
@Excel(name = "附件凭证")
|
||||
private String files;
|
||||
|
||||
/** 审核状态 */
|
||||
|
|
Loading…
Reference in New Issue