diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index 93ef64ba..707381f3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -305,8 +305,8 @@ public class SpecialDiseaseNode extends BaseEntity { * 节点审核时间 */ @ApiModelProperty(value = "节点审核时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "节点审核时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "节点审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private LocalDateTime routeCheckDate; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java index 65cc8bff..0da12319 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java @@ -20,4 +20,6 @@ public class SpecialDiseaseNodeVO extends SpecialDiseaseNode { private String taskTypeName; private String taskSubdivisionName; + + private String taskStatusName; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index 2516a64a..6f0a737a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -81,8 +81,6 @@ - - @@ -117,6 +115,9 @@ + + + @@ -753,7 +754,7 @@ \ No newline at end of file