收付款合计查询

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

@@ -53,7 +53,7 @@ public class CmcContractController extends BaseController
     public TableDataInfo list(CmcContract cmcContract)
     {
         startPage();
-        List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
+        List<CmcContract> list = cmcContractService.selectCmcContractListP(cmcContract);
         return getDataTable(list);
     }
 

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

@@ -52,7 +52,7 @@ public class CmcSubContractController extends BaseController
     public TableDataInfo list(CmcSubContract cmcSubContract)
     {
         startPage();
-        List<CmcSubContract> list = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        List<CmcSubContract> list = cmcSubContractService.selectCmcSubContractListP(cmcSubContract);
         return getDataTable(list);
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTitleEval.java

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,8 +22,10 @@ public class CmcTitleEval extends BaseEntity
     private String titleEvalId;
 
     /** 申请人 */
-    @Excel(name = "申请人")
     private Long userId;
+    @Excel(name = "申请人")
+    private String applyUserName;
+    private SysUser applyUser;
 
     /** 评审年度 */
     @Excel(name = "评审年度")
@@ -79,8 +82,10 @@ public class CmcTitleEval extends BaseEntity
     private Date applyTime;
 
     /** 职称管理员 */
-    @Excel(name = "职称管理员")
     private Long titleUserId;
+    @Excel(name = "职称管理员")
+    private String  titleUserName;
+    private SysUser titleUser;
 
     /** 职称管理员审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -97,8 +102,10 @@ public class CmcTitleEval extends BaseEntity
     private Date materialUploadTime;
 
     /** 确认人 */
-    @Excel(name = "确认人")
     private Long confirmer;
+    @Excel(name = "确认人")
+    private String  confirmUserName;
+    private SysUser confirmUser;
 
     /** 确认时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -307,6 +314,36 @@ public class CmcTitleEval extends BaseEntity
     {
         return confirmStatus;
     }
+    public void setApplyUser(SysUser applyUser)
+    {
+        this.applyUser = applyUser;
+        this.applyUserName = applyUser == null ? "" : applyUser.getNickName();
+    }
+
+    public SysUser getApplyUser()
+    {
+        return applyUser;
+    }
+    public void setTitleUser(SysUser titleUser)
+    {
+        this.titleUser = titleUser;
+        this.titleUserName = titleUser == null ? "" : titleUser.getNickName();
+    }
+
+    public SysUser getTitleUser()
+    {
+        return titleUser;
+    }
+    public void setConfirmUser(SysUser confirmUser)
+    {
+        this.confirmUser = confirmUser;
+        this.confirmUserName = confirmUser == null ? "" : confirmUser.getNickName();
+    }
+
+    public SysUser getConfirmUser()
+    {
+        return confirmUser;
+    }
 
     @Override
     public String toString() {

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

@@ -116,25 +116,29 @@
     </select>
 
     <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,
+        select distinct t1.contract_id, t1.contract_code, t1.contract_name, t1.contract_number, t1.tender_id, t.project_name as t_project_name, t1.party_a_id, pa.party_a_name, t.a_person,
+        t.a_phone, t.agent, t.agent_person,t1.paid_amount, t1.paid_percentage, t2.invoice_amount, t2.invoice_percentage, p.project_number, p.project_name, p.project_source,
+        t.agent_phone, t1.amount, t1.deposit, t1.contract_document, t1.drafter, u.nick_name as 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, u1.nick_name as manager_nick_name, t1.manager_time, t1.gm_user_id, u2.nick_name as 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.party_a_id, c.tender_id,
         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,
-        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
+        c.amount, c.deposit, c.contract_document, c.drafter, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
+        c.comment_type, c.manager_comment, c.manager_user_id, c.manager_time, c.gm_user_id, c.gm_time, c.gm_comment from cmc_contract as c
         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
+        (select distinct c.contract_id,
+        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
+        from cmc_contract as c
+        left join cmc_contract_invoice as ci on ci.contract_id = c.contract_id
+        group by c.contract_id)
+        as t2 on t2.contract_id = t1.contract_id
+        left join sys_user as u on u.user_id = t1.drafter
+        left join sys_user as u1 on u1.user_id = t1.manager_user_id
+        left join sys_user as u2 on u2.user_id = t1.gm_user_id
+        left join cmc_tender as t on t.tender_id = t1.tender_id
+        left join cmc_party_a as pa on pa.party_a_id = t1.party_a_id
         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>

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

@@ -98,22 +98,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCmcSubContractListP" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
-        select distinct t1.sub_contract_id, t1.sub_contract_name, t1.sub_amount, t1.partner_id, t1.partner_name, t1.contact_person, t1.telephone, t1.contract_document, t1.drafter,
-        t1.paid_amount, t1.paid_percentage, t1.invoice_amount, t1.invoice_percentage, 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, p.project_number, p.project_name, p.project_source from
-        (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,
+        select distinct t1.sub_contract_id, t1.sub_contract_name, t1.sub_amount, t1.partner_id, pa.partner_name, t1.contact_person, t1.telephone, t1.contract_document, t1.drafter,
+        t1.paid_amount, t1.paid_percentage, t2.invoice_amount, t2.invoice_percentage, u.nick_name as 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, u1.nick_name as manager_nick_name, t1.manager_time, t1.gm_user_id, u2.nick_name as gm_nick_name, t1.gm_time, t1.gm_comment, p.project_number, p.project_name, p.project_source from
+        (select distinct sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter,
         sum(cp.paid_amount) as paid_amount, case sc.sub_amount when 0 then 0 else round(sum(cp.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,
-        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
-        left join sys_user as u1 on u1.user_id = sc.manager_user_id
-        left join sys_user as u2 on u2.user_id = sc.gm_user_id
-        left join cmc_partner as pa on pa.partner_id = sc.partner_id
+        sc.draft_time, sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment,
+        sc.manager_user_id, sc.manager_time, sc.gm_user_id, sc.gm_time, sc.gm_comment from cmc_sub_contract as sc
         left join cmc_contract_paid as cp on cp.contract_id = sc.sub_contract_id
-        left join cmc_contract_invoice as ci on ci.contract_id = sc.sub_contract_id
         group by sc.sub_contract_id)
         as t1
+        left join
+        (select distinct sc.sub_contract_id,
+        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
+        from cmc_sub_contract as sc
+        left join cmc_contract_invoice as ci on ci.contract_id = sc.sub_contract_id
+        group by sc.sub_contract_id)
+        as t2 on t2.sub_contract_id = t1.sub_contract_id
+        left join sys_user as u on u.user_id = t1.drafter
+        left join sys_user as u1 on u1.user_id = t1.manager_user_id
+        left join sys_user as u2 on u2.user_id = t1.gm_user_id
+        left join cmc_partner as pa on pa.partner_id = t1.partner_id
         left join cmc_project_sub_contract as psc on psc.sub_contract_id = t1.sub_contract_id
         left join cmc_project as p on psc.project_id = p.project_id
         <where>

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

@@ -27,36 +27,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirmer"    column="confirmer"    />
         <result property="confirmTime"    column="confirm_time"    />
         <result property="confirmStatus"    column="confirm_status"    />
+        <association property="applyUser"    javaType="SysUser"         resultMap="ApplyUserResult" />
+        <association property="titleUser"    javaType="SysUser"         resultMap="TitleUserResult" />
+        <association property="confirmUser"    javaType="SysUser"         resultMap="ConfirmUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplyUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="apply_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="TitleUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="title_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ConfirmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="confirm_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcTitleEvalVo">
-        select title_eval_id, user_id, annual, institude, type, level, title_profession, sheet, sheet_stamp, material, is_approved, publicity_file, scan_file, obtain_time, apply_time, title_user_id, title_time, title_comment, material_upload_time, confirmer, confirm_time, confirm_status from cmc_title_eval
+        select te.title_eval_id, te.user_id, u.nick_name as apply_nick_name, te.annual, te.institude, te.type, te.level, te.title_profession, te.sheet, te.sheet_stamp, te.material, te.is_approved, te.publicity_file, te.scan_file,
+               te.obtain_time, te.apply_time, te.title_user_id, u1.nick_name as title_nick_name, te.title_time, te.title_comment, te.material_upload_time, te.confirmer, u2.nick_name as confirm_nick_name, te.confirm_time,
+               te.confirm_status from cmc_title_eval as te
+        left join sys_user as u on u.user_id = te.user_id
+        left join sys_user as u1 on u1.user_id = te.title_user_id
+        left join sys_user as u2 on u2.user_id = te.confirmer
     </sql>
 
     <select id="selectCmcTitleEvalList" parameterType="CmcTitleEval" resultMap="CmcTitleEvalResult">
         <include refid="selectCmcTitleEvalVo"/>
         <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="annual != null  and annual != ''"> and annual = #{annual}</if>
-            <if test="institude != null  and institude != ''"> and institude = #{institude}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="level != null  and level != ''"> and level = #{level}</if>
-            <if test="titleProfession != null  and titleProfession != ''"> and title_profession = #{titleProfession}</if>
-            <if test="sheet != null  and sheet != ''"> and sheet = #{sheet}</if>
-            <if test="sheetStamp != null  and sheetStamp != ''"> and sheet_stamp = #{sheetStamp}</if>
-            <if test="material != null  and material != ''"> and material = #{material}</if>
-            <if test="isApproved != null  and isApproved != ''"> and is_approved = #{isApproved}</if>
-            <if test="publicityFile != null  and publicityFile != ''"> and publicity_file = #{publicityFile}</if>
-            <if test="scanFile != null  and scanFile != ''"> and scan_file = #{scanFile}</if>
-            <if test="obtainTime != null "> and obtain_time = #{obtainTime}</if>
-            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
-            <if test="titleUserId != null "> and title_user_id = #{titleUserId}</if>
-            <if test="titleTime != null "> and title_time = #{titleTime}</if>
-            <if test="titleComment != null  and titleComment != ''"> and title_comment = #{titleComment}</if>
-            <if test="materialUploadTime != null "> and material_upload_time = #{materialUploadTime}</if>
-            <if test="confirmer != null "> and confirmer = #{confirmer}</if>
-            <if test="confirmTime != null "> and confirm_time = #{confirmTime}</if>
-            <if test="confirmStatus != null  and confirmStatus != ''"> and confirm_status = #{confirmStatus}</if>
+            <if test="userId != null "> and te.user_id = #{userId}</if>
+            <if test="annual != null  and annual != ''"> and te.annual = #{annual}</if>
+            <if test="institude != null  and institude != ''"> and te.institude = #{institude}</if>
+            <if test="type != null  and type != ''"> and te.type = #{type}</if>
+            <if test="level != null  and level != ''"> and te.level = #{level}</if>
+            <if test="titleProfession != null  and titleProfession != ''"> and te.title_profession = #{titleProfession}</if>
+            <if test="sheet != null  and sheet != ''"> and te.sheet = #{sheet}</if>
+            <if test="sheetStamp != null  and sheetStamp != ''"> and te.sheet_stamp = #{sheetStamp}</if>
+            <if test="material != null  and material != ''"> and te.material = #{material}</if>
+            <if test="isApproved != null  and isApproved != ''"> and te.is_approved = #{isApproved}</if>
+            <if test="publicityFile != null  and publicityFile != ''"> and te.publicity_file = #{publicityFile}</if>
+            <if test="scanFile != null  and scanFile != ''"> and te.scan_file = #{scanFile}</if>
+            <if test="obtainTime != null "> and te.obtain_time = #{obtainTime}</if>
+            <if test="applyTime != null "> and te.apply_time = #{applyTime}</if>
+            <if test="titleUserId != null "> and te.title_user_id = #{titleUserId}</if>
+            <if test="titleTime != null "> and te.title_time = #{titleTime}</if>
+            <if test="titleComment != null  and titleComment != ''"> and te.title_comment = #{titleComment}</if>
+            <if test="materialUploadTime != null "> and te.material_upload_time = #{materialUploadTime}</if>
+            <if test="confirmer != null "> and te.confirmer = #{confirmer}</if>
+            <if test="confirmTime != null "> and te.confirm_time = #{confirmTime}</if>
+            <if test="confirmStatus != null  and confirmStatus != ''"> and te.confirm_status = #{confirmStatus}</if>
         </where>
     </select>