diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml index 59dab8a..f70448b 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml @@ -1,7 +1,6 @@ - SELECT - p.id, - p.project_no, - p.project_name, - c.customer_name, - p.customer_contact_name, - p.project_leader_name, - p.plan_end_date, - p.project_node + p.id, + p.project_no, + p.project_name, + c.customer_name, + p.customer_contact_name, + p.project_leader_name, + p.plan_end_date, + p.project_node FROM eval_project p LEFT JOIN eval_customer c - ON c.id = p.customer_id - AND c.delete_enum = 'false' + ON c.id = p.customer_id + AND c.delete_enum = 'false' WHERE p.delete_enum = 'false' - - AND p.org_id = #{query.orgId} - + AND p.org_id = #{query.orgId} AND p.project_name LIKE CONCAT('%', #{query.projectName}, '%') @@ -52,15 +49,15 @@ select count(id) from eval_project where - id in - - #{id} - - and - JSON_CONTAINS(project_node, JSON_OBJECT('type', #{val},'state', 0)) + id in + + #{id} + + and + JSON_CONTAINS(project_node, JSON_OBJECT('type', #{val},'state', 0)) SELECT - p.id, - p.org_id, - p.project_no, - p.project_name, - o.unit_name AS org_name + p.id, + p.org_id, + p.project_no, + p.project_name, + o.unit_name AS org_name FROM eval_project p LEFT JOIN org_info o - ON o.id = p.org_id - AND o.delete_enum = 'false' + ON o.id = p.org_id + AND o.delete_enum = 'false' WHERE p.delete_enum = 'false' - AND p.is_statutory = 1 + AND p.is_statutory = 1 AND (p.project_name LIKE CONCAT('%', #{query.projectNameOrNo}, '%') - OR p.project_no LIKE CONCAT('%', #{query.projectNameOrNo}, '%')) + OR p.project_no LIKE CONCAT('%', #{query.projectNameOrNo}, '%')) AND p.org_id = #{query.orgId} @@ -204,16 +201,17 @@ @@ -221,14 +219,15 @@ @@ -236,21 +235,21 @@ -