报销功能修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.domain.Office;
+import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
@@ -70,6 +72,9 @@ public class CwReimbursementInfoService {
     @Resource
     private MaterialBasicMapper materialBasicMapper;
 
+    @Resource
+    private OfficeService officeService;
+
     /**
      * 报告号查询
      */
@@ -428,6 +433,15 @@ public class CwReimbursementInfoService {
         // 查询基础信息表
         CwReimbursementInfo info = infoMapper.selectById(id);
         BeanUtils.copyProperties(info, dto);
+        if (ObjectUtil.isNotEmpty(info)){
+            if(StringUtils.isNotBlank(info.getDepartment())) {
+                Office byId = officeService.getById(info.getDepartment());
+                if (ObjectUtil.isNotEmpty(byId)) {
+                    dto.setDepartmentName(byId.getName());
+                }
+            }
+        }
+
         // 查询详情列表
 //        LambdaQueryWrapper<CwReimbursementDetailInfo> detailInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        detailInfoLambdaQueryWrapper.eq(CwReimbursementDetailInfo::getInfoId, id);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalInfo/service/dto/SaveInfoDto.java

@@ -87,4 +87,6 @@ public class SaveInfoDto extends BaseEntity {
 
     private String purchaseId;
 
+    private String departmentName;
+
 }