归档数修改，结算统计

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

@@ -11,6 +11,8 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.file.domain.FilesAchievement;
+import com.ruoyi.file.service.IFilesAchievementService;
 import com.ruoyi.oa.domain.CmcArchive;
 import com.ruoyi.oa.domain.CmcManageDept;
 import com.ruoyi.oa.domain.CmcSettle;
@@ -62,6 +64,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcSettleService cmcSettleService;
 
+    @Autowired
+    private IFilesAchievementService filesAchievementService;
+
     /**
      * 查询cmc项目列表
      */
@@ -177,11 +182,21 @@ public class CmcProjectController extends BaseController
                 completeObject.put(cmcProject.getProjectNumber(), completeList.size());
                 cmcProject.setIsComplete(null);
                 //已归档
+                List<String> projectNumberList = new ArrayList<>();
                 CmcArchive cmcArchive = new CmcArchive();
                 cmcArchive.setProjectNumber(String.valueOf(i));
                 cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
                 List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
-                archiveObject.put(String.valueOf(i), archiveList.size());
+                for (CmcArchive archive : archiveList) {
+                    projectNumberList.add(archive.getProjectNumber());
+                }
+                FilesAchievement filesAchievement = new FilesAchievement();
+                filesAchievement.setProjectNumber(String.valueOf(i));
+                List<FilesAchievement> achievementList = filesAchievementService.selectProjectAchievementList(filesAchievement);
+                for (FilesAchievement achievement : achievementList) {
+                    projectNumberList.add(achievement.getProjectNumber());
+                }
+                archiveObject.put(String.valueOf(i), projectNumberList.stream().distinct().count());
                 //已结算
                 CmcSettle cmcSettle = new CmcSettle();
                 cmcSettle.setProjectNumber(String.valueOf(i));
@@ -204,11 +219,21 @@ public class CmcProjectController extends BaseController
             completeObject.put(cmcProject.getProjectNumber(), completeList.size());
             cmcProject.setIsComplete(null);
             //已归档
+            List<String> projectNumberList = new ArrayList<>();
             CmcArchive cmcArchive = new CmcArchive();
             cmcArchive.setProjectNumber(cmcProject.getProjectNumber());
             cmcArchive.setArchiveTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcArchive> archiveList = cmcArchiveService.selectCmcArchiveList(cmcArchive);
-            archiveObject.put(cmcProject.getProjectNumber(), archiveList.size());
+            for (CmcArchive archive : archiveList) {
+                projectNumberList.add(archive.getProjectNumber());
+            }
+            FilesAchievement filesAchievement = new FilesAchievement();
+            filesAchievement.setProjectNumber(cmcProject.getProjectNumber());
+            List<FilesAchievement> achievementList = filesAchievementService.selectProjectAchievementList(filesAchievement);
+            for (FilesAchievement achievement : achievementList) {
+                projectNumberList.add(achievement.getProjectNumber());
+            }
+            archiveObject.put(cmcProject.getProjectNumber(), projectNumberList.stream().distinct().count());
             //已结算
             CmcSettle cmcSettle = new CmcSettle();
             cmcSettle.setProjectNumber(cmcProject.getProjectNumber());

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

@@ -1,7 +1,17 @@
 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.List;
 import javax.servlet.http.HttpServletResponse;
+
+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;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +25,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcSettle;
 import com.ruoyi.oa.service.ICmcSettleService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -33,6 +42,9 @@ public class CmcSettleController extends BaseController
     @Autowired
     private ICmcSettleService cmcSettleService;
 
+    @Autowired
+    private ICmcSettleSummaryService cmcSettleSummaryService;
+
     /**
      * 查询cmc结算审批列表
      */
@@ -65,6 +77,61 @@ public class CmcSettleController extends BaseController
         return success(cmcSettleService.selectCmcSettleBySettleId(settleId));
     }
 
+    /**
+     * 获取cmc结算审批详细信息
+     */
+    @GetMapping("/statistic")
+    public AjaxResult getSettleStatistic(CmcSettle cmcSettle) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
+        JSONArray amountArray = new JSONArray();
+        JSONObject amountObject = new JSONObject();
+        //每年结算金额
+        if (cmcSettle.getProjectNumber() == null) {
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                cmcSettle.setProjectNumber(String.valueOf(i));
+                cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                List<CmcSettle> yearList = cmcSettleService.selectCmcSettleList(cmcSettle);
+                yearObject.put(String.valueOf(i), yearList.size());
+                BigDecimal amount = new BigDecimal(0);
+                for (CmcSettle settle : yearList) {
+                    CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
+                    cmcSettleSummary.setSettleId(settle.getSettleId());
+                    cmcSettleSummary.setContent("实际结算总金额");
+                    if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
+                        CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
+                        if (settleSummary.getAmount() != null)
+                            amount = amount.add(settleSummary.getAmount());
+                    }
+                }
+                amountObject.put(String.valueOf(i), amount);
+            }
+            cmcSettle.setGmTime(null);
+        }
+        else {
+            cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+            yearObject.put(cmcSettle.getProjectNumber(), cmcSettleService.selectCmcSettleList(cmcSettle).size());
+            BigDecimal amount = new BigDecimal(0);
+            for (CmcSettle settle : cmcSettleService.selectCmcSettleList(cmcSettle)) {
+                CmcSettleSummary cmcSettleSummary = new CmcSettleSummary();
+                cmcSettleSummary.setSettleId(settle.getSettleId());
+                cmcSettleSummary.setContent("实际结算总金额");
+                if (cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).size() > 0) {
+                    CmcSettleSummary settleSummary = cmcSettleSummaryService.selectCmcSettleSummaryList(cmcSettleSummary).get(0);
+                    if (settleSummary.getAmount() != null)
+                        amount = amount.add(settleSummary.getAmount());
+                }
+            }
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcSettle.getGmTime()), amount);
+        }
+        yearArray.add(yearObject);
+        amountArray.add(amountObject);
+        jsonObject.put("year", yearArray);
+        jsonObject.put("amount", amountArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc结算审批
      */

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

@@ -28,6 +28,14 @@ public interface FilesAchievementMapper
      */
     public List<FilesAchievement> selectFilesAchievementList(FilesAchievement filesAchievement);
 
+    /**
+     * 查询项目成果列表
+     *
+     * @param filesAchievement 成果表
+     * @return 成果表集合
+     */
+    public List<FilesAchievement> selectProjectAchievementList(FilesAchievement filesAchievement);
+
     /**
      * 新增成果表
      * 

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

@@ -28,6 +28,14 @@ public interface IFilesAchievementService
      */
     public List<FilesAchievement> selectFilesAchievementList(FilesAchievement filesAchievement);
 
+    /**
+     * 查询成果表列表
+     *
+     * @param filesAchievement 成果表
+     * @return 成果表集合
+     */
+    public List<FilesAchievement> selectProjectAchievementList(FilesAchievement filesAchievement);
+
     /**
      * 新增成果表
      * 

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

@@ -44,6 +44,18 @@ public class FilesAchievementServiceImpl implements IFilesAchievementService
         return filesAchievementMapper.selectFilesAchievementList(filesAchievement);
     }
 
+    /**
+     * 查询项目成果列表
+     *
+     * @param filesAchievement 成果表
+     * @return 成果表
+     */
+    @Override
+    public List<FilesAchievement> selectProjectAchievementList(FilesAchievement filesAchievement)
+    {
+        return filesAchievementMapper.selectProjectAchievementList(filesAchievement);
+    }
+
     /**
      * 新增成果表
      * 

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

@@ -70,7 +70,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by p.project_number desc
     </select>
-    
+
+    <select id="selectProjectAchievementList" parameterType="FilesAchievement" resultMap="FilesAchievementResult">
+        select distinct p.project_number from files_achievement as f LEFT JOIN cmc_project as p on f.project_id = p.project_id
+        <where>
+            (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
+        </where>
+        group by p.project_number
+    </select>
+
     <select id="selectFilesAchievementById" parameterType="String" resultMap="FilesAchievementResult">
         <include refid="selectFilesAchievementAllVo"/>
         where a.id = #{id}