合同额统计

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

 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.oa.domain.CmcPartyA;
 import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcPartyAService;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
     @Autowired
     private ICmcContractService cmcContractService;
 
-    @Autowired
-    private ICmcPartyAService cmcPartyAService;
-
     /**
      * 查询cmc合同评审列表
      */
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();
-        //每年合同数量
-        for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
-            cmcContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+        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 (cmcContract.getSignDate() == null) {
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                cmcContract.setSignDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
+                yearObject.put(String.valueOf(i), yearList.size());
+                BigDecimal amount = new BigDecimal(0);
+                for (CmcContract contract : yearList) {
+                    amount = amount.add(contract.getAmount());
+                }
+                amountObject.put(String.valueOf(i), amount);
+            }
+            cmcContract.setSignDate(null);
+            cmcContract.setProjectSource("1");
+            List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            BigDecimal cAmount = new BigDecimal(0);
+            BigDecimal wAmount = new BigDecimal(0);
+            for (CmcContract contract : sourceList) {
+                wAmount = wAmount.add(contract.getAmount());
+            }
+            sourceObject.put("市场", sourceList.size());
+            cwAmountObject.put("市场", wAmount);
+            cmcContract.setProjectSource("0");
+            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            for (CmcContract contract : sourceList) {
+                cAmount = cAmount.add(contract.getAmount());
+            }
+            sourceObject.put("院内", sourceList.size());
+            cwAmountObject.put("院内", cAmount);
+        }
+        else {
             List<CmcContract> yearList = cmcContractService.selectCmcContractList(cmcContract);
-            yearObject.put(String.valueOf(i), yearList.size());
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), yearList.size());
+            BigDecimal amount = new BigDecimal(0);
+            for (CmcContract contract : yearList) {
+                amount = amount.add(contract.getAmount());
+            }
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
+            cmcContract.setProjectSource("1");
+            List<CmcContract> sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            BigDecimal cAmount = new BigDecimal(0);
+            BigDecimal wAmount = new BigDecimal(0);
+            for (CmcContract contract : sourceList) {
+                wAmount = wAmount.add(contract.getAmount());
+            }
+            sourceObject.put("市场", sourceList.size());
+            cwAmountObject.put("市场", wAmount);
+            cmcContract.setProjectSource("0");
+            sourceList = cmcContractService.selectCmcContractList(cmcContract);
+            for (CmcContract contract : sourceList) {
+                cAmount = cAmount.add(contract.getAmount());
+            }
+            sourceObject.put("院内", sourceList.size());
+            cwAmountObject.put("院内", cAmount);
         }
         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);
     }
 

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

     private String tenderName;
     private Integer tenderId;
 
+    /** 项目id */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private String projectSource;
+
     /** 甲方单位 */
     @Excel(name = "甲方单位")
     private String partyAName;
 
     private CmcPartyA partyA;
 
+    private CmcProject project;
+
     public void setContractId(String contractId)
     {
         this.contractId = contractId;
     {
         return tender;
     }
+    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 setPartyAId(String partyAId)
     {
         this.partyAId = partyAId;

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

         <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="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
     <resultMap type="CmcTender" id="CmcTenderResult">
         <result property="tenderId"    column="tender_id"    />
-        <result property="projectName"    column="project_name"    />
-        <result property="partyAName"    column="party_a_name"    />
-        <result property="aPerson"    column="a_person"    />
-        <result property="aPhone"    column="a_phone"    />
-        <result property="agent"    column="agent"    />
-        <result property="agentPerson"    column="agent_person"    />
-        <result property="agentPhone"    column="agent_phone"    />
+        <result property="projectName"    column="t_project_name"    />
     </resultMap>
 
     <resultMap type="SysUser" id="DraftUserResult">
         <result property="partyAName"    column="party_a_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="selectCmcContractVo">
-        select c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, 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, 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
+        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,
+               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
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
             <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>
         </where>
         order by c.draft_time desc
     </select>

oa-ui/src/views/flowable/form/components/print/planPrint.vue

 <template>
   <div>
     <div id="printPlan">
-      <h2 class="text-center title">技术交底记录表</h2>
+      <h2 class="text-center title">技术方案记录表</h2>
       <table border="1">
         <tr>
           <td :colspan="1" class="fontbold">项目名称</td>
             签名：<span class="auditor">{{ getUserName(form.technicalAuditor) }}</span>
           </td>
           <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.techApprovalTime }}</td>
+        </tr>        
+        <tr>
+          <td :colspan="1" class="fontbold">技术质量与安全部审核意见</td>
+          <td :colspan="4">{{ form.techDeptComment }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.techDeptLeader) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.techDeptTime }}</td>
         </tr>
         <tr>
           <td :colspan="1" class="fontbold">总工程师审核意见</td>

oa-ui/src/views/flowable/form/projectProcess/planTab.vue

             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="修改技术方案" prop="reviseDocument">
+          <div v-if="form.reviseDocument">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.reviseDocument}`)">
+              {{ getFileName(form.reviseDocument) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.reviseDocument}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
+        </el-form-item>
+        <el-form-item label="技术质量与安全部审核意见" prop="techDeptComment">
+          <el-input type="textarea" v-model="form.techDeptComment" placeholder="请输入技术质量与安全部审核意见" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="technicalAuditor">
+              <span class="auditor"> {{ form.techDeptLeader ? form.techDeptLeader.nickName : '' }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ form.techDeptTime }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="最终技术方案" prop="finalDocument">
           <div v-if="form.finalDocument">
             <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">

oa-ui/src/views/flowable/form/technicalPlan.vue

             </el-col>
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
-                <span> {{ form.techDeptTime ? form.techDeptTime : techApprovalTime }} </span>
+                <span> {{ form.techDeptTime ? form.techDeptTime : techDeptTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
       technicalUploadTime: undefined,
       techApprovalTime: undefined,
       manageApprovalTime: undefined,
-      techApprovalTime:undefined,
+      techDeptTime:undefined,
       // 遮罩层
       loading: true,
       // 选中数组
     }
     if(this.taskName == '技术质量与安全部审核'){
       this.techUser = this.$store.getters.name;
-      this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.techDeptTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     this.getProjectById();
     this.getUserList();