浏览代码

Merge remote-tracking branch 'origin/master' into master

yangyj 1 年之前
父节点
当前提交
8d5fafa917

+ 2 - 1
blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterPeriod.java

@@ -99,5 +99,6 @@ public class MeterPeriod extends BaseEntity {
     @ApiModelProperty(value = "审批状态,0未上报,1待审批,2已审批")
     private Integer approveStatus;
 
-
+    @ApiModelProperty(value = "封面日期")
+    private LocalDate coverDate;
 }

+ 4 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1151,7 +1151,10 @@ public class TaskController extends BladeController {
                 /*电签状态(始终只获取自己的电签任务状态信息)*/
                 TaskParallel taskParallel = taskParallelList.stream().filter(f -> ObjectUtil.isNotEmpty(f.getTaskUser()) && f.getTaskUser().equals(SecureUtil.getUserId().toString())).findAny().orElse(null);
                 if (taskParallel != null) {
-                    vo.setEVisaStatus(taskParallel.getEVisaContent() != null ? taskParallel.getEVisaContent() : "");
+//                    vo.setEVisaStatus((taskParallel.getEVisaContent() != null && !"null".equals(taskParallel.getEVisaContent())) ? taskParallel.getEVisaContent() : "");
+                    if (taskParallel.getEVisaStatus() != null){
+                        vo.setEVisaStatus(taskParallel.getEVisaStatus() == 1 ? "电签成功":(StringUtils.isBlank(taskParallel.getEVisaContent()) || "null".equals(taskParallel.getEVisaContent()))?"电签失败":taskParallel.getEVisaContent());
+                    }
                 }
                 if (vo.getTaskStatusName().equals("已废除")) {
                     vo.setEVisaStatus("废除成功");