文件补充调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -361,6 +361,7 @@ public class ReimbursementInfoController {
         return ResponseUtil.newInstance().add("businessTable", "reimbursement_file_supplement")
                 .add("businessId", s.getId())
                 .add("no", s.getNo())
+                .add("name",s.getName())
                 .ok ("操作成功");
     }
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementFileSupplement.java

@@ -28,5 +28,7 @@ public class ReimbursementFileSupplement extends BaseEntity {
     private String no; //报销编号
     @TableField(exist = false)
     private String taskIdFile;
+    @TableField(exist = false)
+    private String name;//报销人名称
 
 }

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

@@ -1468,6 +1468,7 @@ public class ReimbursementInfoService {
         // 获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ReimbursementInfo info = infoMapper.selectById(dto.getId());
+        UserDTO user = SpringUtil.getBean(IUserApi.class).getById(info.getCreateById());
         if (StringUtils.isNotEmpty(dto.getFileSuppleId())) {
             // 修改专用发票信息列表
             // 删除原有数据
@@ -1545,8 +1546,15 @@ public class ReimbursementInfoService {
             reimbursementFileSupplementMapper.updateById(fileSupplement);
 
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         } else {
+            //修改报销基本信息
+            ReimbursementInfo reimbursementInfo = new ReimbursementInfo();
+            reimbursementInfo.setReimbursementType(dto.getReimbursementType());
+            reimbursementInfo.setId(dto.getId());
+            reimbursementInfo.setUpdateTime(new Date());
+            infoMapper.updateById(reimbursementInfo);
             // 生成id
             String id = UUID.randomUUID().toString().replace("-", "");
             ReimbursementFileSupplement fileSupplement = new ReimbursementFileSupplement();
@@ -1560,6 +1568,7 @@ public class ReimbursementInfoService {
             fileSupplement.setReimbursementId(dto.getId());
             reimbursementFileSupplementMapper.insert(fileSupplement);
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         }
     }

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

@@ -381,6 +381,7 @@ public class CcpmReimbursementInfoController {
         return ResponseUtil.newInstance().add("businessTable", "ccpm_reimbursement_file_supplement")
                 .add("businessId", s.getId())
                 .add("no", s.getNo())
+                .add("name",s.getName())
                 .ok ("操作成功");
     }
 

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementFileSupplement.java

@@ -28,5 +28,7 @@ public class CcpmReimbursementFileSupplement extends BaseEntity {
     private String no; //报销编号
     @TableField(exist = false)
     private String taskIdFile;
+    @TableField(exist = false)
+    private String name;//报销人名称
 
 }

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

@@ -992,6 +992,7 @@ public class CcpmReimbursementInfoService {
         // 获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         CcpmReimbursementInfo info = infoMapper.selectById(dto.getId());
+        UserDTO user = SpringUtil.getBean(IUserApi.class).getById(info.getCreateById());
         if (StringUtils.isNotEmpty(dto.getFileSuppleId())) {
             // 修改专用发票信息列表
             // 删除原有数据
@@ -1068,8 +1069,15 @@ public class CcpmReimbursementInfoService {
             ccpmReimbursementFileSupplementMapper.updateById(fileSupplement);
 
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         } else {
+            //修改报销基本信息
+            CcpmReimbursementInfo reimbursementInfo = new CcpmReimbursementInfo();
+            reimbursementInfo.setReimbursementType(dto.getReimbursementType());
+            reimbursementInfo.setId(dto.getId());
+            reimbursementInfo.setUpdateTime(new Date());
+            infoMapper.updateById(reimbursementInfo);
             // 生成id
             String id = UUID.randomUUID().toString().replace("-", "");
             CcpmReimbursementFileSupplement fileSupplement = new CcpmReimbursementFileSupplement();
@@ -1083,6 +1091,7 @@ public class CcpmReimbursementInfoService {
             fileSupplement.setReimbursementId(dto.getId());
             ccpmReimbursementFileSupplementMapper.insert(fileSupplement);
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         }
     }

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

@@ -378,6 +378,7 @@ public class ZsReimbursementInfoController {
         return ResponseUtil.newInstance().add("businessTable", "zs_reimbursement_file_supplement")
                 .add("businessId", s.getId())
                 .add("no", s.getNo())
+                .add("name",s.getName())
                 .ok ("操作成功");
     }
 

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementFileSupplement.java

@@ -28,5 +28,7 @@ public class ZsReimbursementFileSupplement extends BaseEntity {
     private String no; //报销编号
     @TableField(exist = false)
     private String taskIdFile;
+    @TableField(exist = false)
+    private String name;//报销人名称
 
 }

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

@@ -993,6 +993,7 @@ public class ZsReimbursementInfoService {
         // 获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ZsReimbursementInfo info = infoMapper.selectById(dto.getId());
+        UserDTO user = SpringUtil.getBean(IUserApi.class).getById(info.getCreateById());
         if (StringUtils.isNotEmpty(dto.getFileSuppleId())) {
             // 修改专用发票信息列表
             // 删除原有数据
@@ -1069,8 +1070,15 @@ public class ZsReimbursementInfoService {
             zsReimbursementFileSupplementMapper.updateById(fileSupplement);
 
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         } else {
+            //修改报销基本信息
+            ZsReimbursementInfo reimbursementInfo = new ZsReimbursementInfo();
+            reimbursementInfo.setReimbursementType(dto.getReimbursementType());
+            reimbursementInfo.setId(dto.getId());
+            reimbursementInfo.setUpdateTime(new Date());
+            infoMapper.updateById(reimbursementInfo);
             // 生成id
             String id = UUID.randomUUID().toString().replace("-", "");
             ZsReimbursementFileSupplement fileSupplement = new ZsReimbursementFileSupplement();
@@ -1084,6 +1092,7 @@ public class ZsReimbursementInfoService {
             fileSupplement.setReimbursementId(dto.getId());
             zsReimbursementFileSupplementMapper.insert(fileSupplement);
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         }
     }

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

@@ -380,6 +380,7 @@ public class ConsultancyReimbursementInfoController {
         return ResponseUtil.newInstance().add("businessTable", "consultancy_reimbursement_file_supplement")
                 .add("businessId", s.getId())
                 .add("no", s.getNo())
+                .add("name",s.getName())
                 .ok ("操作成功");
     }
 

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementFileSupplement.java

@@ -28,5 +28,7 @@ public class ConsultancyReimbursementFileSupplement extends BaseEntity {
     private String no; //报销编号
     @TableField(exist = false)
     private String taskIdFile;
+    @TableField(exist = false)
+    private String name;//报销人名称
 
 }

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

@@ -998,6 +998,7 @@ public class ConsultancyReimbursementInfoService {
         // 获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         ConsultancyReimbursementInfo info = infoMapper.selectById(dto.getId());
+        UserDTO user = SpringUtil.getBean(IUserApi.class).getById(info.getCreateById());
         if (StringUtils.isNotEmpty(dto.getFileSuppleId())) {
             // 修改专用发票信息列表
             // 删除原有数据
@@ -1074,8 +1075,15 @@ public class ConsultancyReimbursementInfoService {
             consultancyReimbursementFileSupplementMapper.updateById(fileSupplement);
 
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         } else {
+            //修改报销基本信息
+            ConsultancyReimbursementInfo reimbursementInfo = new ConsultancyReimbursementInfo();
+            reimbursementInfo.setReimbursementType(dto.getReimbursementType());
+            reimbursementInfo.setId(dto.getId());
+            reimbursementInfo.setUpdateTime(new Date());
+            infoMapper.updateById(reimbursementInfo);
             // 生成id
             String id = UUID.randomUUID().toString().replace("-", "");
             ConsultancyReimbursementFileSupplement fileSupplement = new ConsultancyReimbursementFileSupplement();
@@ -1089,6 +1097,7 @@ public class ConsultancyReimbursementInfoService {
             fileSupplement.setReimbursementId(dto.getId());
             consultancyReimbursementFileSupplementMapper.insert(fileSupplement);
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(user.getName());
             return fileSupplement;
         }
     }

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

@@ -496,6 +496,7 @@ public class CwReimbursementInfoController {
         return ResponseUtil.newInstance().add("businessTable", "cw_reimbursement_file_supplement")
                 .add("businessId", s.getId())
                 .add("no", s.getNo())
+                .add("name",s.getName())
                 .ok ("操作成功");
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementFileSupplement.java

@@ -27,6 +27,8 @@ public class CwReimbursementFileSupplement extends BaseEntity {
     @TableField(exist = false)
     private String no; //报销编号
     @TableField(exist = false)
+    private String name;//报销人名称
+    @TableField(exist = false)
     private String taskIdFile;
 
 }

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

@@ -1433,6 +1433,7 @@ public class CwReimbursementInfoService {
         // 获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         CwReimbursementInfo info = infoMapper.getById(dto.getId());
+        String name = infoMapper.findUserById(info.getCreateById());
         if (StringUtils.isNotEmpty(dto.getFileSuppleId())) {
             // 修改专用发票信息列表
             // 删除原有数据
@@ -1509,8 +1510,15 @@ public class CwReimbursementInfoService {
             cwReimbursementFileSupplementMapper.updateById(fileSupplement);
 
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(name);
             return fileSupplement;
         } else {
+            //修改报销基本信息
+            CwReimbursementInfo reimbursementInfo = new CwReimbursementInfo();
+            reimbursementInfo.setReimbursementType(dto.getReimbursementType());
+            reimbursementInfo.setId(dto.getId());
+            reimbursementInfo.setUpdateTime(new Date());
+            infoMapper.updateById(reimbursementInfo);
             // 生成id
             String id = UUID.randomUUID().toString().replace("-", "");
             CwReimbursementFileSupplement fileSupplement = new CwReimbursementFileSupplement();
@@ -1524,6 +1532,7 @@ public class CwReimbursementInfoService {
             fileSupplement.setReimbursementId(dto.getId());
             cwReimbursementFileSupplementMapper.insert(fileSupplement);
             fileSupplement.setNo(info.getNo());
+            fileSupplement.setName(name);
             return fileSupplement;
         }
     }