|
|
@@ -207,7 +207,8 @@ public class ReportController {
|
|
|
Double[] overtimeHours, //加班时长
|
|
|
String[] customText,
|
|
|
Integer[] basecostId, //成本基线项的id
|
|
|
- String[] auditorSettingArray
|
|
|
+ String[] auditorSettingArray,
|
|
|
+ String[] picStr //图片的文件名，不含后缀的，多个用@分隔，如：["3UlRmLbTnqLPM0-xjja2dS2VAg5OFERPUZz0HRqjb8BXLq8ewaFH6NmlFm1pnVza0"@"338EniZDtXtKGSnavdgvebGGyRgoieGv2aobIq6k5jboa_DsZNIvLmzHjW69kDG6x"]
|
|
|
) {
|
|
|
List<Report> reportList = new ArrayList<>();
|
|
|
String token = request.getHeader("Token");
|
|
|
@@ -568,6 +569,7 @@ public class ReportController {
|
|
|
report.setState(draft==0?0:3);
|
|
|
report.setCompanyId(user.getCompanyId());
|
|
|
report.setPicAdd(pics!=null?pics[i]:null);
|
|
|
+ report.setPicStr(picStr!=null?picStr[i]:null);
|
|
|
report.setStage(stage[i]);
|
|
|
report.setCreateDate(localStartDate);
|
|
|
report.setCreatorId(token);
|
|
|
@@ -630,6 +632,7 @@ public class ReportController {
|
|
|
.setState(1)//代填，直接是审核通过状态
|
|
|
.setCompanyId(user.getCompanyId())
|
|
|
.setPicAdd(pics!=null?pics[i]:null)
|
|
|
+ .setPicStr(picStr!=null?picStr[i]:null)
|
|
|
.setCreateDate(localStartDate)
|
|
|
.setCreatorId(subsUser.getId())
|
|
|
.setDeptId(subsUser.getDepartmentId())
|
|
|
@@ -693,6 +696,7 @@ public class ReportController {
|
|
|
report.setState(draft==0?0:3);
|
|
|
report.setCompanyId(user.getCompanyId());
|
|
|
report.setPicAdd(pics!=null && pics.length>0?pics[i]:null);
|
|
|
+ report.setPicStr(picStr!=null?picStr[i]:null);
|
|
|
report.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
|
|
report.setCreatorId(token);
|
|
|
report.setDeptId(user.getDepartmentId());
|
|
|
@@ -760,6 +764,7 @@ public class ReportController {
|
|
|
// .setState(auditWorkflowList.size() == 0?1:0)//代填的如果没有自定义审核流程就直接审核通过了
|
|
|
.setCompanyId(user.getCompanyId())
|
|
|
.setPicAdd(pics!=null?pics[i]:null)
|
|
|
+ .setPicStr(picStr!=null?picStr[i]:null)
|
|
|
.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
|
|
.setCreatorId(subsUser.getId())
|
|
|
.setDeptId(subsUser.getDepartmentId())
|
Min