BUG

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMFinancialReimbursementInfoVO.java

@@ -28,4 +28,10 @@ public class EMFinancialReimbursementInfoVO extends EMFinancialReimbursementInfo
     @ApiModelProperty(value = "是否是财务人员 1=是")
     private Integer isFinancialPersonnel;
 
+    @ApiModelProperty(value = "电子发票url地址名称")
+    private String frElectronicInvoiceUrlName;
+
+    @ApiModelProperty(value = "附件url地址名称")
+    private String frAttachmentUrlName;
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMInvoiceInfoVO.java

@@ -28,5 +28,7 @@ public class EMInvoiceInfoVO extends EMInvoiceInfo {
     @ApiModelProperty(value = "发票抬头")
     private String invoiceHead;
 
+    @ApiModelProperty(value = "发票pdf名称")
+    private String invoicePdfUrlName;
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/TaskPlanInfoVO.java

@@ -19,7 +19,7 @@ public class TaskPlanInfoVO implements Serializable {
     @ApiModelProperty(value = "计划任务所属项目")
     private String projectName;
 
-    @ApiModelProperty(value = "计划状态")
+    @ApiModelProperty(value = "计划状态名称")
     private String statusName;
 
     @ApiModelProperty(value = "计划状态")
@@ -28,6 +28,9 @@ public class TaskPlanInfoVO implements Serializable {
     @ApiModelProperty(value = "是否逾期 1=是")
     private Integer isOverdue;
 
+    @ApiModelProperty(value = "计划任务名称")
+    private String taskPlanName;
+
     @ApiModelProperty(value = "计划任务描述（任务内容）")
     private String taskDesc;
 

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AttendanceTripServiceImpl.java

@@ -43,7 +43,7 @@ public class AttendanceTripServiceImpl extends BaseServiceImpl<AttendanceTripMap
     public IPage<AttendanceTripInfoVO> tripPage(IPage<AttendanceTripInfo> page, AttendanceTripInfoDTO dto) {
         QueryWrapper<AttendanceTripInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(AttendanceTripInfo::getIsTemp, 1); //提交的数据
-        IPage<AttendanceTripInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, AttendanceTripInfo::getCreateTime));
+        IPage<AttendanceTripInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, AttendanceTripInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<ControlProjectInfo> projectInfoList = jdbcTemplate.query("select id,name from c_control_project_info", new BeanPropertyRowMapper<>(ControlProjectInfo.class));
         Map<Long, String> maps = projectInfoList.stream().collect(Collectors.toMap(ControlProjectInfo::getId, ControlProjectInfo::getName));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMFinancialReimbursementServiceImpl.java

@@ -21,6 +21,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.resource.entity.Attach;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
@@ -46,14 +47,14 @@ public class EMFinancialReimbursementServiceImpl extends BaseServiceImpl<ExMFina
     public IPage<EMFinancialReimbursementInfoVO> financialPage(IPage<EMFinancialReimbursementInfo> page, EMFinancialReimbursementInfoDTO dto) {
         QueryWrapper<EMFinancialReimbursementInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMFinancialReimbursementInfo::getIsTemp, 1); //提交的数据
-        IPage<EMFinancialReimbursementInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMFinancialReimbursementInfo::getCreateTime));
+        IPage<EMFinancialReimbursementInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMFinancialReimbursementInfo::getCreateTime));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'expense_fr_type'", new BeanPropertyRowMapper<>(DictInfo.class));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<ControlProjectInfo> controlProjectInfos = projectInfoServiceImpl.getBaseMapper().selectList(Wrappers.<ControlProjectInfo>lambdaQuery().select(ControlProjectInfo::getId, ControlProjectInfo::getName));
         return pages.convert(reimbursementInfo -> {
             EMFinancialReimbursementInfoVO vo = new EMFinancialReimbursementInfoVO();
             BeanUtils.copyProperties(reimbursementInfo, vo);
-            vo.setUserNameVesting(userMap.get(vo.getCreateUser()));
+            vo.setUserNameVesting(userMap.get(vo.getUserIdVesting()));
             vo.setCreateName(userMap.get(vo.getCreateUser()));
             vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
             vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
@@ -116,9 +117,21 @@ public class EMFinancialReimbursementServiceImpl extends BaseServiceImpl<ExMFina
     @Override
     public EMFinancialReimbursementInfoVO financialDetail(Long id) {
         EMFinancialReimbursementInfo obj = baseMapper.selectById(id);
-        EMFinancialReimbursementInfoVO vo = BeanUtil.copyProperties(obj, EMFinancialReimbursementInfoVO.class);
-        //TODO vo.set
-        return vo;
+        if (ObjectUtil.isNotEmpty(obj)) {
+            EMFinancialReimbursementInfoVO vo = BeanUtil.copyProperties(obj, EMFinancialReimbursementInfoVO.class);
+            if (vo != null) {
+                Attach file1 = jdbcTemplate.query("select original_name from blade_attach where link = '" + obj.getFrAttachmentUrl() + "'", new BeanPropertyRowMapper<>(Attach.class)).stream().findAny().orElse(null);
+                if (file1 != null) {
+                    vo.setFrAttachmentUrlName(file1.getOriginalName());
+                }
+                Attach file2 = jdbcTemplate.query("select original_name from blade_attach where link = '" + obj.getFrElectronicInvoiceUrl() + "'", new BeanPropertyRowMapper<>(Attach.class)).stream().findAny().orElse(null);
+                if (file2 != null) {
+                    vo.setFrElectronicInvoiceUrlName(file2.getOriginalName());
+                }
+            }
+            return vo;
+        }
+        return null;
     }
 
     @Override
@@ -252,6 +265,20 @@ public class EMFinancialReimbursementServiceImpl extends BaseServiceImpl<ExMFina
     public List<EMFinancialReimbursementInfoVO> financialDraftDetail(String eMDraftIds) {
         List<EMFinancialReimbursementInfo> emFinancialReimbursementInfos = baseMapper.selectBatchIds(Func.toStrList(eMDraftIds));
         List<EMFinancialReimbursementInfoVO> vos = BeanUtil.copyProperties(emFinancialReimbursementInfos, EMFinancialReimbursementInfoVO.class);
+        for (EMFinancialReimbursementInfoVO vo : vos) {
+            if (ObjectUtil.isNotEmpty(vo.getFrAttachmentUrl())) {
+                Attach file1 = jdbcTemplate.query("select original_name from blade_attach where link = '" + vo.getFrAttachmentUrl() + "'", new BeanPropertyRowMapper<>(Attach.class)).stream().findAny().orElse(null);
+                if (file1 != null) {
+                    vo.setFrAttachmentUrlName(file1.getOriginalName());
+                }
+            }
+            if (ObjectUtil.isNotEmpty(vo.getFrElectronicInvoiceUrl())) {
+                Attach file2 = jdbcTemplate.query("select original_name from blade_attach where link = '" + vo.getFrElectronicInvoiceUrl() + "'", new BeanPropertyRowMapper<>(Attach.class)).stream().findAny().orElse(null);
+                if (file2 != null) {
+                    vo.setFrElectronicInvoiceUrlName(file2.getOriginalName());
+                }
+            }
+        }
         return vos;
     }
 

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMInvoiceServiceImpl.java

@@ -44,7 +44,7 @@ public class EMInvoiceServiceImpl extends BaseServiceImpl<ExMInvoiceMapper, EMIn
     public IPage<EMInvoiceInfoVO> invoicePage(IPage<EMInvoiceInfo> page, EMInvoiceInfoDTO dto) {
         QueryWrapper<EMInvoiceInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMInvoiceInfo::getIsTemp, 1); //提交的数据
-        IPage<EMInvoiceInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMInvoiceInfo::getCreateTime));
+        IPage<EMInvoiceInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMInvoiceInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList1 = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'invoice_type'", new BeanPropertyRowMapper<>(DictInfo.class));
         List<ControlProjectInfo> controlProjectInfos = projectInfoServiceImpl.getBaseMapper().selectList(Wrappers.<ControlProjectInfo>lambdaQuery().select(ControlProjectInfo::getId, ControlProjectInfo::getName));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMLoanServiceImpl.java

@@ -43,7 +43,7 @@ public class EMLoanServiceImpl extends BaseServiceImpl<ExMLoanMapper, EMLoanInfo
     public IPage<EMLoanInfoVO> loanPage(IPage<EMLoanInfo> page, EMLoanInfoDTO dto) {
         QueryWrapper<EMLoanInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMLoanInfo::getIsTemp, 1);
-        IPage<EMLoanInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMLoanInfo::getCreateTime));
+        IPage<EMLoanInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMLoanInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {
             EMLoanInfoVO vo = new EMLoanInfoVO();

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMOutsourcingPayServiceImpl.java

@@ -42,7 +42,7 @@ public class EMOutsourcingPayServiceImpl extends BaseServiceImpl<ExMOutsourcingP
     public IPage<EMOutsourcingPayInfoVO> outsourcingPage(IPage<EMOutsourcingPayInfo> page, EMOutsourcingPayInfoDTO dto) {
         QueryWrapper<EMOutsourcingPayInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMOutsourcingPayInfo::getIsTemp, 1);
-        IPage<EMOutsourcingPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMOutsourcingPayInfo::getCreateTime));
+        IPage<EMOutsourcingPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMOutsourcingPayInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'outsourcing_type'", new BeanPropertyRowMapper<>(DictInfo.class));
         List<ControlProjectInfo> controlProjectInfos = projectInfoServiceImpl.getBaseMapper().selectList(Wrappers.<ControlProjectInfo>lambdaQuery().select(ControlProjectInfo::getId, ControlProjectInfo::getName));

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPayServiceImpl.java

@@ -42,7 +42,7 @@ public class EMPayServiceImpl extends BaseServiceImpl<ExMPayMapper, EMPayInfo> i
     public IPage<EMPayInfoVO> payPage(IPage<EMPayInfo> page, EMPayInfoDTO dto) {
         QueryWrapper<EMPayInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMPayInfo::getIsTemp, 1);
-        IPage<EMPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMPayInfo::getCreateTime));
+        IPage<EMPayInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMPayInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         return pages.convert(obj -> {
             EMPayInfoVO vo = new EMPayInfoVO();

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPurchaseServiceImpl.java

@@ -43,7 +43,7 @@ public class EMPurchaseServiceImpl extends BaseServiceImpl<ExMPurchaseMapper, EM
     public IPage<EMPurchaseInfoVO> purchasePage(IPage<EMPurchaseInfo> page, EMPurchaseInfoDTO dto) {
         QueryWrapper<EMPurchaseInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMPurchaseInfo::getIsTemp, 1);
-        IPage<EMPurchaseInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMPurchaseInfo::getCreateTime));
+        IPage<EMPurchaseInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMPurchaseInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<DictInfo> dictInfoList = jdbcTemplate.query("select dict_name,dict_value from c_dict_info where code = 'purchase_type'", new BeanPropertyRowMapper<>(DictInfo.class));
         return pages.convert(obj -> {

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMUseCarServiceImpl.java

@@ -48,7 +48,7 @@ public class EMUseCarServiceImpl extends BaseServiceImpl<ExMUseCarMapper, EMUseC
         }
         QueryWrapper<EMUseCarInfo> queryWrapper = Condition.getQueryWrapper(dto);
         queryWrapper.lambda().eq(EMUseCarInfo::getIsTemp, 1);
-        IPage<EMUseCarInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMUseCarInfo::getCreateTime));
+        IPage<EMUseCarInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, false, EMUseCarInfo::getCreateTime));
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
         List<Dept> deptList = jdbcTemplate.query("select id,dept_name from blade_dept where tenant_id = " + SecureUtil.getUser().getTenantId() + " and dept_type = 2", new BeanPropertyRowMapper<>(Dept.class));
         return pages.convert(obj -> {

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -41,6 +41,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
@@ -550,6 +551,8 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
         //构造page参数
         List<ProjectCostBudget> records = pages.getRecords();
         List<String> taskIds = records.stream().map(ProjectCostBudget::getId).map(String::valueOf).collect(Collectors.toList());
+        List<String> deptIds = records.stream().map(ProjectCostBudget::getDeptId).filter(ObjectUtil::isNotEmpty).map(String::valueOf).collect(Collectors.toList());
+        List<DepartmentMonthPlan> departmentMonthPlans = jdbcTemplate.query("select * from c_department_month_plan where dept_id in(" + StringUtils.join(deptIds, ",") + ")", new BeanPropertyRowMapper<>(DepartmentMonthPlan.class));
 
         //获取所有审批任务与计划任务关系
         Map<String, ExpenseTaskRecord> taskRecordMaps = new LinkedHashMap<>();
@@ -599,6 +602,26 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                 String planEndTimeStr = planEndTime.format(formatter);
                 vo.setStartAndEndDate(planStartTimeStr + "~" + planEndTimeStr);
             }
+
+            if (ObjectUtil.isNotEmpty(obj.getDeptId()) && ObjectUtil.isNotEmpty(obj.getPlanStartTime()) && ObjectUtil.isNotEmpty(obj.getPlanEndTime())) {
+                for (DepartmentMonthPlan departmentMonthPlan : departmentMonthPlans) {
+                    SimpleDateFormat smp = new SimpleDateFormat("yyyy-MM");
+                    ZoneId zoneId = ZoneId.systemDefault();
+
+                    LocalDate strLocalDate = obj.getPlanStartTime();
+                    LocalDate endLocalDate = obj.getPlanEndTime();
+                    Date stDate = Date.from(strLocalDate.atStartOfDay(zoneId).toInstant());
+                    Date edDate = Date.from(endLocalDate.atStartOfDay(zoneId).toInstant());
+                    String st = smp.format(stDate);
+                    String ed = smp.format(edDate);
+
+                    String planDate = departmentMonthPlan.getPlanDate();
+                    if (departmentMonthPlan.getDeptId().equals(obj.getDeptId()) && st.equals(ed) && st.equals(planDate)) {
+                        vo.setTaskPlanName(departmentMonthPlan.getPlanName());
+                        break;
+                    }
+                }
+            }
             vos.add(vo);
         }
         vosPage.setRecords(vos);