比例返回数值

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

@@ -79,8 +79,8 @@
     <sql id="selectCmcContractVo">
         select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name, p.project_number, p.project_name,
         p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person,
-        sum(cp.paid_amount) as paid_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / c.amount * 100, 2), CHAR), '%') end as paid_percentage,
-        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / c.amount * 100, 2), CHAR), '%') end as invoice_percentage,
+        sum(cp.paid_amount) as paid_amount, case c.amount when 0 then 0 else round(sum(ci.paid_amount) / c.sub_amount * 100, 2) end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then 0 else round(sum(ci.invoice_amount) / c.sub_amount * 100, 2) end as invoice_percentage,
         t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
         c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter
@@ -123,8 +123,8 @@
     <select id="selectCmcContractListFuzzy" parameterType="CmcContract" resultMap="CmcContractResult">
         select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name, p.project_number, p.project_name,
         p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person,
-        sum(cp.paid_amount) as paid_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / c.amount * 100, 2), CHAR), '%') end as paid_percentage,
-        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / c.amount * 100, 2), CHAR), '%') end as invoice_percentage,
+        sum(cp.paid_amount) as paid_amount, case c.amount when 0 then 0 else round(sum(ci.paid_amount) / c.sub_amount * 100, 2) end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case c.amount when 0 then 0 else round(sum(ci.invoice_amount) / c.sub_amount * 100, 2) end as invoice_percentage,
         t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
         c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSubContractMapper.xml

@@ -65,8 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcSubContractVo">
         select distinct sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, pa.partner_name, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter,
-        sum(cp.paid_amount) as paid_amount, case sc.amount when 0 then '0.00%' else concat(convert(round(sum(cp.paid_amount) / sc.amount * 100, 2), CHAR), '%') end as paid_percentage,
-        sum(ci.invoice_amount) as invoice_amount, case sc.amount when 0 then '0.00%' else concat(convert(round(sum(ci.invoice_amount) / sc.amount * 100, 2), CHAR), '%') end as invoice_percentage,
+        sum(cp.paid_amount) as paid_amount, case sc.sub_amount when 0 then 0 else round(sum(ci.paid_amount) / sc.sub_amount * 100, 2) end as paid_percentage,
+        sum(ci.invoice_amount) as invoice_amount, case sc.sub_amount when 0 then 0 else round(sum(ci.invoice_amount) / sc.sub_amount * 100, 2) end as invoice_percentage,
         p.project_number, p.project_name, p.project_source,u.nick_name as draft_nick_name, sc.draft_time, sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment,
         sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time, sc.gm_user_id, u2.nick_name as gm_nick_name, sc.gm_time, sc.gm_comment from cmc_sub_contract as sc
         left join sys_user as u on u.user_id = sc.drafter