|
@@ -21,6 +21,7 @@ import com.jzg.commons.entity.vo.AmountAuditVo;
|
|
|
import com.jzg.commons.exception.SystemException;
|
|
import com.jzg.commons.exception.SystemException;
|
|
|
import com.jzg.commons.util.AssertionUtils;
|
|
import com.jzg.commons.util.AssertionUtils;
|
|
|
import com.jzg.commons.util.BigDecimalUtil;
|
|
import com.jzg.commons.util.BigDecimalUtil;
|
|
|
|
|
+import com.jzg.commons.util.DateTimeUtils;
|
|
|
import com.jzg.commons.util.StringUtils;
|
|
import com.jzg.commons.util.StringUtils;
|
|
|
import com.jzg.organization.mapper.SysAmountAuditingMapper;
|
|
import com.jzg.organization.mapper.SysAmountAuditingMapper;
|
|
|
import com.jzg.organization.service.*;
|
|
import com.jzg.organization.service.*;
|
|
@@ -442,7 +443,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
|
|
|
* 导出业务员收入支出明显
|
|
* 导出业务员收入支出明显
|
|
|
*
|
|
*
|
|
|
* param ywyIOParam 导出条件, 包含开始日期,结束日期
|
|
* param ywyIOParam 导出条件, 包含开始日期,结束日期
|
|
|
- * @return String
|
|
|
|
|
|
|
+ * @return String 要导出文件在minio上面的地址
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public String exportYwyIORecs(YwyIOParam ywyIOParam) {
|
|
public String exportYwyIORecs(YwyIOParam ywyIOParam) {
|
|
@@ -453,7 +454,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
|
|
|
SysUserAccountChangeLog sysUserAccountChangeLog = changeLogs.get(0);
|
|
SysUserAccountChangeLog sysUserAccountChangeLog = changeLogs.get(0);
|
|
|
userName = sysUserAccountChangeLog.getUserName();
|
|
userName = sysUserAccountChangeLog.getUserName();
|
|
|
}
|
|
}
|
|
|
- String suffix = String.join("-",Objects.toString(userName,""),Objects.toString(ywyIOParam.getBeginDate(),null) , Objects.toString(ywyIOParam.getEndDate(),null));
|
|
|
|
|
|
|
+ String suffix = String.join("-",Objects.toString(userName,""), DateTimeUtils.fmtDate(ywyIOParam.getBeginDate()),DateTimeUtils.fmtDate(ywyIOParam.getEndDate()));
|
|
|
// 调用动态导出
|
|
// 调用动态导出
|
|
|
return exportBaseService.upLoadFile(
|
|
return exportBaseService.upLoadFile(
|
|
|
SysUserAccountChangeLog.class,
|
|
SysUserAccountChangeLog.class,
|