合同开票、回款计算修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -373,7 +373,7 @@ public class CmcContractController extends BaseController
         cmcContract.setProjectSource("1");
         List<CmcContract> sourceList;
         if (beginTime.equals(""))
-            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            sourceList = cmcContractService.selectCmcContractListP(cmcContract);
         else {
             Map<String, Object> params = new HashMap<>();
             params.put("beginTime", beginTime + " 00:00:00");
@@ -402,7 +402,7 @@ public class CmcContractController extends BaseController
         paidSourceAmountObject.put("院外项目回款金额", paidWAmount);
         cmcContract.setProjectSource("0");
         if (beginTime.equals(""))
-            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            sourceList = cmcContractService.selectCmcContractListP(cmcContract);
         else {
             Map<String, Object> params = new HashMap<>();
             params.put("beginTime", beginTime + " 00:00:00");

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcContractMapper.java

@@ -37,6 +37,14 @@ public interface CmcContractMapper
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     * 关联项目查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListP(CmcContract cmcContract);
+
     /**
      * 模糊查询cmc合同评审列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcContractService.java

@@ -38,6 +38,14 @@ public interface ICmcContractService
      */
     public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
 
+    /**
+     * 关联项目查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractListP(CmcContract cmcContract);
+
     /**
      *模糊查询cmc合同评审列表
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractServiceImpl.java

@@ -57,6 +57,18 @@ public class CmcContractServiceImpl implements ICmcContractService
         return cmcContractMapper.selectCmcContractList(cmcContract);
     }
 
+    /**
+     * 关联项目查询cmc合同评审列表
+     *
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审
+     */
+    @Override
+    public List<CmcContract> selectCmcContractListP(CmcContract cmcContract)
+    {
+        return cmcContractMapper.selectCmcContractListP(cmcContract);
+    }
+
     /**
      * 模糊查询cmc合同评审列表
      *

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

@@ -77,8 +77,8 @@
     </resultMap>
 
     <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,
+        select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name,
+        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 else round(sum(cp.paid_amount) / c.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.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,
@@ -88,8 +88,6 @@
         left join sys_user as u2 on u2.user_id = c.gm_user_id
         left join cmc_tender as t on t.tender_id = c.tender_id
         left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
-        left join cmc_project_contract as pc on pc.contract_id = c.contract_id
-        left join cmc_project as p on pc.project_id = p.project_id
         left join cmc_contract_paid as cp on cp.contract_id = c.contract_id
         left join cmc_contract_invoice as ci on ci.contract_id = c.contract_id
     </sql>
@@ -120,21 +118,62 @@
         order by c.draft_time desc
     </select>
 
-    <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,
+    <select id="selectCmcContractListP" parameterType="CmcContract" resultMap="CmcContractResult">
+        select distinct t1.contract_id, t1.contract_code, t1.contract_name, t1.contract_number, t1.tender_id, t1.t_project_name,t1.party_a_id, t1.party_a_name, t1.a_person,
+        t1.a_phone, t1.agent, t1.agent_person,t1.paid_amount, t1.paid_percentage, t1.invoice_amount, t1.invoice_percentage, p.project_number, p.project_name, p.project_source,
+        t1.agent_phone, t1.amount, t1.deposit, t1.contract_document, t1.drafter, t1.draft_nick_name, t1.draft_time, t1.remark, t1.sign_date, t1.sign_remark, t1.sign_scan,
+        t1.comment_type, t1.manager_comment, t1.manager_user_id, t1.manager_nick_name, t1.manager_time, t1.gm_user_id, t1.gm_nick_name, t1.gm_time, t1.gm_comment from
+        (select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name,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, t.agent_phone as agent_phone,
         sum(cp.paid_amount) as paid_amount, case c.amount when 0 then 0 else round(sum(cp.paid_amount) / c.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.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.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
         left join sys_user as u1 on u1.user_id = c.manager_user_id
         left join sys_user as u2 on u2.user_id = c.gm_user_id
         left join cmc_tender as t on t.tender_id = c.tender_id
         left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
-        left join cmc_project_contract as pc on pc.contract_id = c.contract_id
-        left join cmc_project as p on pc.project_id = p.project_id
         left join cmc_contract_paid as cp on cp.contract_id = c.contract_id
+        left join cmc_contract_invoice as ci on ci.contract_id = c.contract_id
+        group by c.contract_id)
+        as t1
+        left join cmc_project_contract as pc on pc.contract_id = t1.contract_id
+        left join cmc_project as p on pc.project_id = p.project_id
+        <where>
+            <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="contractName!= null  and contractName != ''"> and c.contract_name like concat('%', #{contractName}, '%')</if>
+            <if test="contractCode!= null  and contractCode != ''"> and c.contract_code like concat('%', #{contractCode}, '%')</if>
+            <if test="tenderId != null  and tenderId != ''"> and c.tender_id = #{tenderId}</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
+            <if test="partyAId != null  and partyAId != ''"> and c.party_a_id = #{partyAId}</if>
+            <if test="amount != null "> and c.amount = #{amount}</if>
+            <if test="deposit != null "> and c.deposit = #{deposit}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and c.contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and c.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and c.draft_time = #{draftTime}</if>
+            <if test="signDate != null "> and YEAR(c.sign_date) = YEAR(#{signDate})</if>
+            <if test="signRemark != null  and signRemark != ''"> and c.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
+            <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
+        </where>
+        group by t1.contract_id
+        order by t1.draft_time desc
+    </select>
+
+    <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,
+        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,
+        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
+        left join sys_user as u1 on u1.user_id = c.manager_user_id
+        left join sys_user as u2 on u2.user_id = c.gm_user_id
+        left join cmc_tender as t on t.tender_id = c.tender_id
+        left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
         left join cmc_contract_work as cw on cw.contract_id = c.contract_id
         <where>
             cw.content like concat('%', #{queryString}, '%')
@@ -162,7 +201,21 @@
     </select>
 
     <select id="selectCmcContractListByRange" parameterType="CmcContract" resultMap="CmcContractResult">
-        <include refid="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 else round(sum(cp.paid_amount) / c.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.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
+        left join sys_user as u1 on u1.user_id = c.manager_user_id
+        left join sys_user as u2 on u2.user_id = c.gm_user_id
+        left join cmc_tender as t on t.tender_id = c.tender_id
+        left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
+        left join cmc_project_contract as pc on pc.contract_id = c.contract_id
+        left join cmc_project as p on pc.project_id = p.project_id
+        left join cmc_contract_paid as cp on cp.contract_id = c.contract_id
+        left join cmc_contract_invoice as ci on ci.contract_id = c.contract_id
         <where>
             <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
             <if test="contractName!= null  and contractName != ''"> and c.contract_name like concat('%', #{contractName}, '%')</if>