报销-文件补充调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -253,7 +253,7 @@ public class ReimbursementInfoService {
             }
             //文件补充
             if (StringUtils.isNotBlank(item.getTaskIdFile()) && StringUtils.isNotBlank(item.getFileStatus())) {
-                if ("2".equals(item.getFileStatus())) { // “审核中”的数据要获取数据审核人
+                if ("2".equals(item.getFileStatus()) || "4".equals(item.getFileStatus())) { // “审核中”的数据要获取数据审核人
                     item.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(item.getTaskIdFile()));  // 获取数据审核人
                 }
             }
@@ -1709,6 +1709,7 @@ public class ReimbursementInfoService {
         ReimbursementInfo info = infoMapper.selectById(reimId);
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
+            dto.setUserId(info.getCreateById());
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/controller/CcpmReimbursementInfoController.java

@@ -77,7 +77,7 @@ public class CcpmReimbursementInfoController {
             }
             //文件补充
             if (org.apache.commons.lang3.StringUtils.isNotBlank(i.getTaskIdFile()) && org.apache.commons.lang3.StringUtils.isNotBlank(i.getFileStatus())) {
-                if ("2".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
+                if ("2".equals(i.getFileStatus()) || "4".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
                     i.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(i.getTaskIdFile()));  // 获取数据审核人
                 }
             }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -1185,6 +1185,7 @@ public class CcpmReimbursementInfoService {
         CcpmReimbursementInfo info = infoMapper.selectById(reimId);
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
+            dto.setUserId(info.getCreateById());
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -76,7 +76,7 @@ public class ZsReimbursementInfoController {
 
             //文件补充
             if (org.apache.commons.lang3.StringUtils.isNotBlank(i.getTaskIdFile()) && org.apache.commons.lang3.StringUtils.isNotBlank(i.getFileStatus())) {
-                if ("2".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
+                if ("2".equals(i.getFileStatus()) || "4".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
                     i.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(i.getTaskIdFile()));  // 获取数据审核人
                 }
             }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -1216,6 +1216,7 @@ public class ZsReimbursementInfoService {
         ZsReimbursementInfo info = infoMapper.selectById(reimId);
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
+            dto.setUserId(info.getCreateById());
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/controller/ConsultancyReimbursementInfoController.java

@@ -77,7 +77,7 @@ public class ConsultancyReimbursementInfoController {
             }
             //文件补充
             if (StringUtils.isNotBlank(i.getTaskIdFile()) && org.apache.commons.lang3.StringUtils.isNotBlank(i.getFileStatus())) {
-                if ("2".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
+                if ("2".equals(i.getFileStatus()) || "4".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
                     i.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(i.getTaskIdFile()));  // 获取数据审核人
                 }
             }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -1167,6 +1167,7 @@ public class ConsultancyReimbursementInfoService {
         ConsultancyReimbursementInfo info = infoMapper.selectById(reimId);
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
+            dto.setUserId(info.getCreateById());
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -82,7 +82,7 @@ public class CwReimbursementInfoController {
             }
             //文件补充
             if (StringUtils.isNotBlank(i.getTaskIdFile()) && StringUtils.isNotBlank(i.getFileStatus())) {
-                if ("2".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
+                if ("2".equals(i.getFileStatus()) || "4".equals(i.getFileStatus())) { // “审核中”的数据要获取数据审核人
                     i.setAuditFileUserIds(flowTaskService.getTaskAuditUsers(i.getTaskIdFile()));  // 获取数据审核人
                 }
             }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -1575,6 +1575,7 @@ public class CwReimbursementInfoService {
         CwReimbursementInfo info = infoMapper.selectById(reimId);
         if (ObjectUtil.isNotEmpty(info)){
             BeanUtils.copyProperties(info, dto);
+            dto.setUserId(info.getCreateById());
             if(StringUtils.isNotBlank(info.getDepartment())) {
                 OfficeDTO byId = SpringUtil.getBean ( IOfficeApi.class ).getOfficeById(info.getDepartment());
                 if (ObjectUtil.isNotEmpty(byId)) {