Merge remote-tracking branch 'origin/main'

This commit is contained in:
yhy 2026-04-08 09:24:34 +08:00
commit 74a2461444

View File

@ -598,6 +598,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
,a.type as sendPoliceType,byd.dict_label as sendPoliceTypeName,DATE_FORMAT(a.actdate,'%Y-%m-%d %H:%i:%s')as actDate
,DATE_FORMAT(a.enddate,'%Y-%m-%d %H:%i:%s')as endDate,a.actdetail,dp.DEPT_NAME as unitName
,b.tasktype_id,b.tasktype_id2,tsk1.taskname as task1name,tsk2.taskname as task2name,e.dict_label as stateText
,c.remark
from JW_SendPolice a
left join JW_PoliceApply b on a.object_id=b.jw_policeapply_id
left join BASE_TASK tsk1 on tsk1.task_id=b.tasktype_id