院内外分包合同额

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcSubContract;
+import com.ruoyi.oa.domain.CmcSubContract;
 import com.ruoyi.oa.domain.CmcPartner;
 import com.ruoyi.oa.service.ICmcPartnerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,8 +86,12 @@ public class CmcSubContractController extends BaseController
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
+        JSONArray sourceArray = new JSONArray();
+        JSONObject sourceObject = new JSONObject();
         JSONArray amountArray = new JSONArray();
         JSONObject amountObject = new JSONObject();
+        JSONArray cwAmountArray = new JSONArray();
+        JSONObject cwAmountObject = new JSONObject();
         //每年合同数量及金额
         if (cmcSubContract.getSignDate() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
@@ -99,6 +104,7 @@ public class CmcSubContractController extends BaseController
                 }
                 amountObject.put(String.valueOf(i), amount);
             }
+            getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
         }
         else {
             //输入年份合同数量及金额
@@ -108,12 +114,16 @@ public class CmcSubContractController extends BaseController
                 amount = amount.add(subContract.getSubAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), amount);
-
+            getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
         }
         yearArray.add(yearObject);
+        sourceArray.add(sourceObject);
         amountArray.add(amountObject);
+        cwAmountArray.add(cwAmountObject);
         jsonObject.put("year", yearArray);
+        jsonObject.put("source", sourceArray);
         jsonObject.put("amount", amountArray);
+        jsonObject.put("cwAmount", cwAmountArray);
         return success(jsonObject);
     }
 
@@ -152,4 +162,26 @@ public class CmcSubContractController extends BaseController
     {
         return success(cmcSubContractService.deleteCmcSubContractBySubContractIds(subContractIds));
     }
+
+    //院内外项目数量及金额
+    public void getProjectSourceStatistic(CmcSubContract cmcSubContract, JSONObject sourceObject, JSONObject cwAmountObject) {
+        cmcSubContract.setProjectSource("1");
+        List<CmcSubContract> sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        BigDecimal cAmount = new BigDecimal(0);
+        BigDecimal wAmount = new BigDecimal(0);
+        for (CmcSubContract subContract : sourceList) {
+            wAmount = wAmount.add(subContract.getSubAmount());
+        }
+        sourceObject.put("院外", sourceList.size());
+        cwAmountObject.put("院外", wAmount);
+        cmcSubContract.setProjectSource("0");
+        sourceList = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        for (CmcSubContract subContract : sourceList) {
+            cAmount = cAmount.add(subContract.getSubAmount());
+        }
+        sourceObject.put("院内", sourceList.size());
+        cwAmountObject.put("院内", cAmount);
+        cmcSubContract.setProjectSource(null);
+    }
+
 }

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

@@ -30,6 +30,13 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分包合同金额")
     private BigDecimal subAmount;
 
+    /** 项目id */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private String projectSource;
+
     /** 承接单位id */
     @Excel(name = "承接单位")
     private String partnerName;
@@ -110,6 +117,8 @@ public class CmcSubContract extends BaseEntity
 
     private CmcPartner partner;
 
+    private CmcProject project;
+
     public void setSubContractId(String subContractId)
     {
         this.subContractId = subContractId;
@@ -128,6 +137,26 @@ public class CmcSubContract extends BaseEntity
     {
         return subContractName;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+    public void setProjectSource(String projectSource)
+    {
+        this.projectSource = projectSource;
+    }
+
+    public String getProjectSource()
+    {
+        return projectSource;
+    }
     public void setSubAmount(BigDecimal subAmount)
     {
         this.subAmount = subAmount;

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

@@ -68,8 +68,8 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select 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 as project_name,
-               p.project_source, c.party_a_id, pa.party_a_name, t.project_name as project_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, p.project_number, p.project_name,
+               p.project_source, c.party_a_id, pa.party_a_name, t.project_name as t_project_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
@@ -101,6 +101,7 @@
             <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
         </where>
+        group by c.contract_id
         order by c.draft_time desc
     </select>
 

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

@@ -25,10 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gmUserId"    column="gm_user_id"    />
         <result property="gmTime"    column="gm_time"    />
         <result property="gmComment"    column="gm_comment"    />
+        <result property="projectSource"    column="project_source"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="partner"    javaType="CmcPartner"         resultMap="CmcPartnerResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="DraftUserResult">
@@ -51,14 +53,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="partnerName"    column="partner_name"    />
     </resultMap>
 
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
     <sql id="selectCmcSubContractVo">
-        select sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, p.partner_name, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter, 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
+        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,
+               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
         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 p on p.partner_id = sc.partner_id
+        left join cmc_partner as pa on pa.partner_id = sc.partner_id
+        left join cmc_project_sub_contract as psc on psc.sub_contract_id = sc.sub_contract_id
+        left join cmc_project as p on psc.project_id = p.project_id
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
@@ -77,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>
         </where>
+        group by sc.sub_contract_id
         order by sc.draft_time desc
     </select>