借款、结算统计

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

     }
 
     //各用途借款次数
-    public void getBorrowUsageStatistic(CmcBorrow cmcBorrow, JSONObject usageObject, JSONObject usageAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) {
+    public void getBorrowUsageStatistic(CmcBorrow cmcBorrow, JSONObject usageObject, JSONObject usageAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) throws ParseException {
         cmcBorrow.setBorrowUsage("0");
+        if (cmcBorrow.getLendTime() == null)
+            cmcBorrow.setLendTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
         List<CmcBorrow> usageList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
         usageObject.put("项目借款", usageList.size());
         BigDecimal pAmount = new BigDecimal(0);

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

 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.oa.domain.CmcSettle;
-import com.ruoyi.oa.domain.CmcSettleSummary;
 import com.ruoyi.oa.service.ICmcSettleSummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
         if (cmcSettle.getGmTime() == null) {
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
-                List<CmcSettle> yearList = cmcSettleService.selectCmcSettleList(cmcSettle);
-                yearObject.put(String.valueOf(i), yearList.size());
+                yearObject.put(String.valueOf(i), cmcSettleService.selectCmcSettleList(cmcSettle).size());
                 BigDecimal amount = new BigDecimal(0);
-                for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
+                for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
                     if (settle.getAmount() != null)
                         amount = amount.add(settle.getAmount());
                 }
         else {
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), cmcSettleService.selectCmcSettleList(cmcSettle).size());
             BigDecimal amount = new BigDecimal(0);
-            for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
+            for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
                 if (settle.getAmount() != null)
                     amount = amount.add(settle.getAmount());
             }
     }
 
     //各用途结算次数
-    public void getSettleTypeStatistic(CmcSettle cmcSettle, JSONObject typeObject, JSONObject typeAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) {
+    public void getSettleTypeStatistic(CmcSettle cmcSettle, JSONObject typeObject, JSONObject typeAmountObject, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) throws ParseException {
         cmcSettle.setXmName(" ");
-        List<CmcSettle> typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
-        typeObject.put("项目结算", typeList.size());
+        if (cmcSettle.getGmTime() == null)
+            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+        typeObject.put("项目结算", cmcSettleService.selectCmcSettleList(cmcSettle).size());
         BigDecimal pAmount = new BigDecimal(0);
-        for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
+        for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
             if (settle.getAmount() != null)
                 pAmount = pAmount.add(settle.getAmount());
         }
         for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
             BigDecimal pyAmount = new BigDecimal(0);
             int count = 0;
-            for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
+            for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
                 if (settle.getAmount() != null && settle.getProjectNumber() != null && settle.getProjectNumber().contains(String.valueOf(i))) {
                     pyAmount = pyAmount.add(settle.getAmount());
                     count ++;
         }
         cmcSettle.setXmName(null);
         cmcSettle.setProjectId("0");
-        typeList = cmcSettleService.selectCmcSettleList(cmcSettle);
-        typeObject.put("其他结算", typeList.size());
+        typeObject.put("其他结算", cmcSettleService.selectCmcSettleList(cmcSettle).size());
         BigDecimal oAmount = new BigDecimal(0);
-        for (CmcSettle settle : cmcSettleService.selectCmcSettleStatisticList(cmcSettle)) {
+        for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
             if (settle.getAmount() != null)
                 oAmount = oAmount.add(settle.getAmount());
         }

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

      */
     public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
 
-    /**
-     * 查询cmc结算统计列表
-     *
-     * @param cmcSettle cmc结算审批
-     * @return cmc结算审批集合
-     */
-    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle);
-
     /**
      * 新增cmc结算审批
      * 

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

      */
     public List<CmcSettle> selectCmcSettleList(CmcSettle cmcSettle);
 
-    /**
-     * 查询cmc结算统计列表
-     *
-     * @param cmcSettle cmc结算审批
-     * @return cmc结算审批集合
-     */
-    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle);
-
     /**
      * 新增cmc结算审批
      * 

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

         return cmcSettleMapper.selectCmcSettleList(cmcSettle);
     }
 
-    /**
-     * 查询cmc结算统计列表
-     *
-     * @param cmcSettle cmc结算审批
-     * @return cmc结算审批集合
-     */
-    public List<CmcSettle> selectCmcSettleStatisticList(CmcSettle cmcSettle)
-    {
-        return cmcSettleMapper.selectCmcSettleStatisticList(cmcSettle);
-    }
-
     /**
      * 新增cmc结算审批
      * 

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

             <if test="managerTime != null "> and b.manager_time = #{managerTime}</if>
             <if test="zjlTime != null "> and b.zjl_time = #{zjlTime}</if>
             <if test="dszTime != null "> and b.dsz_time = #{dszTime}</if>
-            <if test="lendTime != null "> and YEAR(b.lend_time) = YEAR(#{lendTime})</if>
+            <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) == '2000' "> and b.lend_time is not null</if>
+            <if test="lendTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', lendTime) != '2000' "> and YEAR(b.lend_time) = YEAR(#{lendTime})</if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
         order by b.apply_date desc

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

 
     <sql id="selectCmcSettleVo">
         select distinct s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
-               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment,
-               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment,
+               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, ss.amount,
+               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment, ss.content,
                s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document, s.report_dept, d.dept_name from cmc_settle as s
         left join sys_user as u on u.user_id = s.reporter
         left join sys_user as u1 on u1.user_id = s.zh_user_id
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
+            ss.content = '实际结算总金额'
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
         order by s.report_time desc
     </select>
 
-    <select id="selectCmcSettleStatisticList" parameterType="CmcSettle" resultMap="CmcSettleResult">
-        select t0.settle_id, t0.project_id, t0.project_number, t0.project_name, t0.xm_name, t0.gm_time, (t2.amount - t0.amount) as amount from
-        (select distinct s.settle_id, s.project_id, p.project_number, p.project_name, s.xm_name, ss.table_number, s.gm_time, sum(ss.amount) as amount from cmc_settle as s
-        left join cmc_project as p on p.project_id = s.project_id
-        left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
-        where ss.table_number = '0' group by s.settle_id) as t0 left join
-        (select distinct s.settle_id, sum(ss.amount) as amount from cmc_settle as s
-        left join cmc_project as p on p.project_id = s.project_id
-        left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
-        where ss.table_number = '2' group by s.settle_id) as t2 on t0.settle_id = t2.settle_id
-        <where>
-            <if test="projectId != null"> and t0.project_id = #{projectId}</if>
-            <if test="projectNumber != null  and projectNumber != ''"> and t0.project_number like concat('%', #{projectNumber}, '%')</if>
-            <if test="xmName != null"> and t0.xm_name = #{xmName}</if>
-            <if test="gmTime != null"> and YEAR(t0.gm_time) = YEAR(#{gmTime})</if>
-        </where>
-    </select>
-
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         where s.settle_id = #{settleId}