报销调整

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

@@ -199,6 +199,10 @@ public class ReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getPaymentStatus())) {
             queryWrapper.like("a.payment_status", dto.getPaymentStatus());
         }
+        // 发票号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
+            queryWrapper.inSql("a.id","SELECT info_id FROM reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+        }
         //获取当前登录人信息
         /*UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色
@@ -224,6 +228,10 @@ public class ReimbursementInfoService {
             if (StringUtils.isNotBlank(item.getTaskId()) && StringUtils.isNotBlank(item.getType())) {
                 if ("2".equals(item.getType())) { // “审核中”的数据要获取数据审核人
                     item.setAuditUserIds(flowTaskService.getTaskAuditUsers(item.getTaskId()));  // 获取数据审核人
+                    String currentTaskName = flowTaskService.getCurrentTaskName(item.getProcInsId());
+                    if (item.getType().equals("2") && com.jeeplus.utils.StringUtils.isNotBlank(currentTaskName) && !currentTaskName.contains("综合管理部主任") && !currentTaskName.contains("部门主任")){
+                        item.setApplyFile(true);
+                    }
                 }
             }
 

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

@@ -66,4 +66,6 @@ public class QueryListDto extends BaseEntity {
      * 付款状态
      */
     private String paymentStatus;
+    //发票号
+    private String financeNumber;
 }

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

@@ -155,4 +155,6 @@ public class RetureListDto {
     private String procInsIdFile;
     private String taskIdFile;
     private List<String> auditFileUserIds;
+
+    private Boolean applyFile;//是否发起文件补充
 }

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

@@ -70,6 +70,10 @@ public class CcpmReimbursementInfoController {
         iPage.getRecords().stream().forEach(i -> {
             if (StringUtils.isNotBlank(i.getProcInsId()) && StringUtils.isNotBlank(i.getTaskId())) {
                 i.setAuditUserIds(flowTaskService.getTaskAuditUsers(i.getTaskId()));  // 获取数据审核人
+                String currentTaskName = flowTaskService.getCurrentTaskName(i.getProcInsId());
+                if (i.getType().equals("2") && StringUtils.isNotBlank(currentTaskName) && !currentTaskName.contains("综合管理部主任") && !currentTaskName.contains("部门主任")){
+                    i.setApplyFile(true);
+                }
             }
             //文件补充
             if (org.apache.commons.lang3.StringUtils.isNotBlank(i.getTaskIdFile()) && org.apache.commons.lang3.StringUtils.isNotBlank(i.getFileStatus())) {

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

@@ -213,6 +213,10 @@ public class CcpmReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getPaymentStatus())) {
             queryWrapper.like("a.payment_status", dto.getPaymentStatus());
         }
+        // 发票号
+        if (StringUtils.isNotEmpty(dto.getFinanceNumber())) {
+            queryWrapper.inSql("a.id","SELECT info_id FROM ccpm_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+        }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色

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

@@ -79,4 +79,6 @@ public class CcpmQueryListDto extends BaseEntity {
      * 付款状态  0:未付款  1:已付款
      */
     private String paymentStatus;
+    //发票号
+    private String financeNumber;
 }

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

@@ -155,4 +155,6 @@ public class CcpmRetureListDto {
     private String procInsIdFile;
     private String taskIdFile;
     private List<String> auditFileUserIds;
+
+    private Boolean applyFile;//是否发起文件补充
 }

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

@@ -68,6 +68,10 @@ public class ZsReimbursementInfoController {
         iPage.getRecords().stream().forEach(i -> {
             if (StringUtils.isNotBlank(i.getProcInsId()) && StringUtils.isNotBlank(i.getTaskId())) {
                 i.setAuditUserIds(flowTaskService.getTaskAuditUsers(i.getTaskId()));  // 获取数据审核人
+                String currentTaskName = flowTaskService.getCurrentTaskName(i.getProcInsId());
+                if (i.getType().equals("2") && StringUtils.isNotBlank(currentTaskName) && !currentTaskName.contains("综合管理部主任") && !currentTaskName.contains("部门主任")){
+                    i.setApplyFile(true);
+                }
             }
 
             //文件补充

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

@@ -212,6 +212,10 @@ public class ZsReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getPaymentStatus())) {
             queryWrapper.like("a.payment_status", dto.getPaymentStatus());
         }
+        // 发票号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
+            queryWrapper.inSql("a.id","SELECT info_id FROM zs_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+        }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色

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

@@ -68,4 +68,7 @@ public class ZsQueryListDto extends BaseEntity {
      * 付款状态
      */
     private String paymentStatus;
+
+    //发票号
+    private String financeNumber;
 }

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

@@ -169,4 +169,6 @@ public class ZsRetureListDto {
     private String procInsIdFile;
     private String taskIdFile;
     private List<String> auditFileUserIds;
+
+    private Boolean applyFile;//是否发起文件补充
 }

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

@@ -70,6 +70,10 @@ public class ConsultancyReimbursementInfoController {
         iPage.getRecords().stream().forEach(i -> {
             if (StringUtils.isNotBlank(i.getProcInsId()) && StringUtils.isNotBlank(i.getTaskId())) {
                 i.setAuditUserIds(flowTaskService.getTaskAuditUsers(i.getTaskId()));  // 获取数据审核人
+                String currentTaskName = flowTaskService.getCurrentTaskName(i.getProcInsId());
+                if (i.getType().equals("2") && StringUtils.isNotBlank(currentTaskName) && !currentTaskName.contains("综合管理部主任") && !currentTaskName.contains("部门主任")){
+                    i.setApplyFile(true);
+                }
             }
             //文件补充
             if (StringUtils.isNotBlank(i.getTaskIdFile()) && org.apache.commons.lang3.StringUtils.isNotBlank(i.getFileStatus())) {

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

@@ -211,7 +211,10 @@ public class ConsultancyReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getPaymentStatus())) {
             queryWrapper.like("a.payment_status", dto.getPaymentStatus());
         }
-
+        // 发票号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
+            queryWrapper.inSql("a.id","SELECT info_id FROM consultancy_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+        }
         /*//获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         //获取当前登录人所属角色

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

@@ -80,4 +80,7 @@ public class ConsultancyQueryListDto extends BaseEntity {
      * 付款状态  0:未付款  1:已付款
      */
     private String paymentStatus;
+
+    //发票号
+    private String financeNumber;
 }

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

@@ -156,4 +156,6 @@ public class ConsultancyRetureListDto {
     private String procInsIdFile;
     private String taskIdFile;
     private List<String> auditFileUserIds;
+
+    private Boolean applyFile;//是否发起文件补充
 }

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

@@ -74,6 +74,10 @@ public class CwReimbursementInfoController {
             if (StringUtils.isNotBlank(i.getTaskId()) && StringUtils.isNotBlank(i.getType())) {
                 if ("2".equals(i.getType())) { // “审核中”的数据要获取数据审核人
                     i.setAuditUserIds(flowTaskService.getTaskAuditUsers(i.getTaskId()));  // 获取数据审核人
+                    String currentTaskName = flowTaskService.getCurrentTaskName(i.getProcInsId());
+                    if (com.jeeplus.utils.StringUtils.isNotBlank(currentTaskName) && !currentTaskName.contains("综合管理部主任") && !currentTaskName.contains("部门主任")){
+                        i.setApplyFile(true);
+                    }
                 }
             }
             //文件补充

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

@@ -225,6 +225,10 @@ public class CwReimbursementInfoService {
         if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getPaymentStatus())) {
             queryWrapper.like("a.payment_status", dto.getPaymentStatus());
         }
+        // 发票号
+        if (com.jeeplus.utils.StringUtils.isNotEmpty(dto.getFinanceNumber())) {
+            queryWrapper.inSql("a.id","SELECT info_id FROM cw_reimbursement_amount_info WHERE number ="+ dto.getFinanceNumber() +"AND del_flag = 0");
+        }
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();

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

@@ -66,4 +66,7 @@ public class QueryListDto extends BaseEntity {
      * 付款状态
      */
     private String paymentStatus;
+
+    //发票号
+    private String financeNumber;
 }

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

@@ -167,4 +167,6 @@ public class RetureListDto {
     private String taskIdFile;
     private List<String> auditFileUserIds;
 
+    private Boolean applyFile;//是否发起文件补充
+
 }