专病路径任务类型

This commit is contained in:
zhangheng 2024-04-18 09:57:21 +08:00
parent 02aec986f2
commit d313256409
3 changed files with 18 additions and 9 deletions

View File

@ -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;
/**

View File

@ -20,4 +20,6 @@ public class SpecialDiseaseNodeVO extends SpecialDiseaseNode {
private String taskTypeName;
private String taskSubdivisionName;
private String taskStatusName;
}

View File

@ -81,8 +81,6 @@
<result property="routeNodeDay" column="route_node_day"/>
<result property="taskType" column="task_type"/>
<result property="taskSubdivision" column="task_subdivision"/>
<result property="taskType" column="taskSubdivisionName"/>
<result property="taskSubdivision" column="taskSubdivisionName"/>
<result property="taskStatus" column="task_status"/>
<result property="secondClassifyDescribe" column="second_classify_describe"/>
<result property="executionTime" column="execution_time"/>
@ -117,6 +115,9 @@
<result property="routeCheckPerson" column="route_check_person"/>
<result property="routeCheckDate" column="route_check_date"/>
<result property="routeCheckRemark" column="route_check_remark"/>
<result property="taskTypeName" column="taskTypeName"/>
<result property="taskSubdivisionName" column="taskSubdivisionName"/>
<result property="taskStatusName" column="taskStatusName"/>
<result property="nodeContent" column="node_content"/>
</resultMap>
@ -753,7 +754,7 @@
<select id="selectSpecialDiseaseByRouteId"
resultType="com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO"
resultMap="SpecialDiseaseRouteResult">
select sdr.id specialDiseaseRouteId,
select sdr.id specialDiseaseRouteId,
sdr.department_id,
sdr.department_name,
sdr.disease_type_id,
@ -764,15 +765,15 @@
sdr.route_classify,
sdr.release_status,
sdr.suit_range,
sdn.id as specialDiseaseNodeId,
sdn.id as specialDiseaseNodeId,
sdn.route_id,
sdn.route_name,
sdn.route_node_name,
sdn.route_node_day,
sdn.task_type,
sdn.task_subdivision,
sdn.task_type taskTypeName,
sdn.task_subdivision taskSubdivisionName,
sdn.task_type,
sdn.task_subdivision,
sdn.task_status,
sdn.second_classify_describe,
sdn.execution_time,
@ -814,9 +815,15 @@
(select COUNT(1)
from special_disease_node
where route_id = specialDiseaseRouteId
and route_check_status = 'AGREE') agreeNumber
and route_check_status = 'AGREE') agreeNumber,
ttd.task_type_name taskTypeName,
tpd.task_partition_name taskSubdivisionName,
tsd.task_status_name taskStatusName
from special_disease_route sdr
left join special_disease_node sdn ON sdn.route_id = sdr.id
left join task_type_dict ttd ON ttd.task_type_code = sdn.task_type
LEFT JOIN task_status_dict tsd on tsd.task_status_code = sdn.task_status
left join task_partition_dict tpd on tpd.task_partition_code = sdn.task_subdivision
where sdr.id = #{specialDiseaseRouteId}
</select>
</mapper>