科研任务导入+合同收款数据导入更改相关功能

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/IndexMapper.java

@@ -13,26 +13,26 @@ import java.util.List;
 @Mapper
 public interface IndexMapper {
     /**所长根据实际完成时间查询任务号 当年*/
-    @Select("select taskno from ky_task_info where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW()")
+    @Select("select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW()")
     public List<String> getTaskNoBySjCurrYear();
     /**所长根据实际完成时间查询任务号  上一年*/
-    @Select("select taskno from ky_task_info where DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)")
+    @Select("select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)")
     public List<String> getTaskNoBySjLastYear();
     /**所长根据实际完成时间查询任务号  当月*/
-    @Select("select taskno from ky_task_info where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW()")
+    @Select("select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW()")
     public List<String> getTaskNoBySjCurrMonth();
     /**所长根据实际完成时间查询任务号  上个月*/
-    @Select("select taskno from ky_task_info where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH)")
+    @Select("select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH)")
     public List<String> getTaskNoBySjLastMonth();
     /**所长根据实际完成时间查询任务号  去年同期月份*/
-    @Select("select taskno from ky_task_info where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)")
+    @Select("select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)")
     public List<String> getTaskNoBySjTqMonth();
 
     /**所长根据实际完成时间查询任务号  某年*/
-    @Select("select taskno from ky_task_info where YEAR(sjwcsj)=#{year}")
+    @Select("select taskno from ky_task_info_new where YEAR(sjwcsj)=#{year}")
     List<String> getKyTaskNoAllByYear(String year);
     /**所长根据实际完成时间查询任务号  某月*/
-    @Select("select taskno from ky_task_info where DATE_FORMAT(sjwcsj,'%Y-%m')=#{ym}")
+    @Select("select taskno from ky_task_info_new where DATE_FORMAT(sjwcsj,'%Y-%m')=#{ym}")
     List<String> getKyTaskNoAllByMonth(String ym);
 
 

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/xml/IndexKpiMapper.xml

@@ -65,7 +65,7 @@
         com_contract_info_exchange c
         INNER JOIN
         (
-        SELECT taskno, jycs FROM ky_task_info WHERE jycs IN
+        SELECT taskno, jycs FROM ky_task_info_new WHERE jycs IN
         <foreach item='item' index='index' collection='departList' open='(' separator=',' close=')'>
             #{item}
         </foreach>
@@ -101,7 +101,7 @@
         com_contract_info_exchange c
         INNER JOIN
         (
-        SELECT taskno, jycs FROM ky_task_info WHERE jycs IN
+        SELECT taskno, jycs FROM ky_task_info_new WHERE jycs IN
         <foreach item='item' index='index' collection='departList' open='(' separator=',' close=')'>
             #{item}
         </foreach>

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/xml/IndexMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.Index.mapper.IndexMapper">
     <!--部门领导根据部门名称和实际完成时间查询任务号 当年 -->
     <select id="getTaskNoByDepSjCurrYear" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW())
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -16,7 +16,7 @@
     </select>
     <!--部门领导根据部门名称和实际完成时间查询任务号 上一年 -->
     <select id="getTaskNoByDepSjLastYear" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -29,7 +29,7 @@
     </select>
     <!--部门领导根据部门名称和实际完成时间查询任务号 当月 -->
     <select id="getTaskNoByDepSjCurrMonth" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW())
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -42,7 +42,7 @@
     </select>
     <!--部门领导根据部门名称和实际完成时间查询任务号 上个月 -->
     <select id="getTaskNoByDepSjLastMonth" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH))
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -55,7 +55,7 @@
     </select>
     <!--部门领导根据部门名称和实际完成时间查询任务号 去年同期月份 -->
     <select id="getTaskNoByDepSjTqMonth" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -69,7 +69,7 @@
 
     <!--部门领导根据部门名称和实际完成时间查询任务号 某年 -->
     <select id="getKyTaskNoAllByDepYear" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (YEAR(sjwcsj)=#{year})
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -82,7 +82,7 @@
     </select>
     <!--部门领导根据部门名称和实际完成时间查询任务号 某月 -->
     <select id="getKyTaskNoAllByDepMonth" resultType="String">
-        select taskno from ky_task_info
+        select taskno from ky_task_info_new
         where (DATE_FORMAT(sjwcsj,'%Y-%m')=#{ym})
         and (zrbm in
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
@@ -107,12 +107,12 @@
 
     <!-- 所长按年分组查询某年的利润额 -->
     <select id="getTasknoByGroupYear" resultType="org.jeecg.modules.Index.entity.pojo.LreInfoByDate">
-        select year(a.sjwcsj) as date,sum(c.lre) as lre from ky_task_info a,kzks_project_cost c
+        select year(a.sjwcsj) as date,sum(c.lre) as lre from ky_task_info_new a,kzks_project_cost c
         where YEAR(a.sjwcsj) BETWEEN #{beginDate} and #{endDate} and a.taskno=c.taskno and c.status='0' group by year(a.sjwcsj)
     </select>
     <!-- 所长按月分组查询某月的利润额 -->
     <select id="getTasknoByGroupMonth" resultType="org.jeecg.modules.Index.entity.pojo.LreInfoByDate">
-        select CONCAT(year(a.sjwcsj), "-", LPAD(month(a.sjwcsj), 2, "0" )) as date,sum(c.lre) as lre from ky_task_info a,kzks_project_cost c
+        select CONCAT(year(a.sjwcsj), "-", LPAD(month(a.sjwcsj), 2, "0" )) as date,sum(c.lre) as lre from ky_task_info_new a,kzks_project_cost c
         where CONCAT(YEAR (a.sjwcsj), "-", LPAD( MONTH (a.sjwcsj), 2, "0" )) <![CDATA[ <= ]]> #{endDate}
         and CONCAT(YEAR (a.sjwcsj), "-", LPAD( MONTH (a.sjwcsj), 2, "0" )) <![CDATA[ >= ]]> #{beginDate}
         and a.taskno=c.taskno and c.status='0' group by year(a.sjwcsj), month(a.sjwcsj)

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexServiceImpl.java

@@ -23,8 +23,10 @@ import org.jeecg.modules.Index.entity.pojo.ContractAmount;
 import org.jeecg.modules.Index.entity.vo.*;
 import org.jeecg.modules.Index.service.IndexService;
 import org.jeecg.modules.Index.util.CommonMethod;
+import org.jeecg.modules.comContractInfoExchangeNew.mapper.ComContractInfoExchangeNewMapper;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
 import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.jeecg.modules.kyTaskInfoNew.service.IKyTaskInfoNewService;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.mapper.ProjectCostMapper;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
@@ -109,6 +111,20 @@ public class IndexServiceImpl implements IndexService {
     private IKyTaskInfoService kyTaskInfoService;
 
     /**
+     * 导入的科研任务信息表
+     */
+    @Autowired
+    @SuppressWarnings("all")
+    private IKyTaskInfoNewService kyTaskInfoNewService;
+
+    /**
+     * 导入的合同收款基础数据表
+     */
+    @Autowired
+    @SuppressWarnings("all")
+    private ComContractInfoExchangeNewMapper exchangeNewMapper;
+
+    /**
      * 项目成本信息表
      */
     @Autowired
@@ -194,9 +210,15 @@ public class IndexServiceImpl implements IndexService {
             //根据年份和当前部门对应的任务号查询，部门当前年的年收入
             BigDecimal currentYearTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                currentYearTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 采集的合同信息表 */
+                //currentYearTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 导入的合同信息表 */
+                currentYearTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                currentYearTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 采集的合同信息表 */
+                //currentYearTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 导入的合同信息表 */
+                currentYearTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
             }
             if (ObjectUtils.isEmpty(currentYearTotal)) currentYearTotal = BigDecimal.valueOf(0);
             return currentYearTotal;
@@ -216,9 +238,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastYearTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastYearTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastYearTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                lastYearTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastYearTqTotal)) lastYearTqTotal = BigDecimal.valueOf(0);
             return lastYearTqTotal;
@@ -235,9 +263,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> currentMonthTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal currentMonthTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                currentMonthTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 采集的合同信息表 */
+                //currentMonthTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 导入的合同信息表 */
+                currentMonthTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                currentMonthTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 采集的合同信息表 */
+                //currentMonthTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 导入的合同信息表 */
+                currentMonthTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
             }
             if (ObjectUtils.isEmpty(currentMonthTotal)) currentMonthTotal = BigDecimal.valueOf(0);
             return currentMonthTotal;
@@ -254,9 +288,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastMothTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastMothTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastMothTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 采集的合同信息表 */
+                //lastMothTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 导入的合同信息表 */
+                lastMothTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                lastMothTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 采集的合同信息表 */
+                //lastMothTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 导入的合同信息表 */
+                lastMothTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastMothTqTotal)) lastMothTqTotal = BigDecimal.valueOf(0);
             return lastMothTqTotal;
@@ -274,9 +314,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastYearMonthTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastYearMonthTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastYearMonthTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearMonthTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearMonthTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                lastYearMonthTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearMonthTqTotal = exchangeMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearMonthTqTotal = exchangeNewMapper.getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastYearMonthTqTotal)) lastYearMonthTqTotal = BigDecimal.valueOf(0);
             return lastYearMonthTqTotal;
@@ -378,13 +424,19 @@ public class IndexServiceImpl implements IndexService {
             tasknoList.addAll(ZrbmTasknoList);
             tasknoList.addAll(XdbmTasknoList);
             if (tasknoList.isEmpty()) return comContractInfoExchangeList;
-            comContractInfoExchangeList = exchangeMapper.getIncomeDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 采集的合同信息表 */
+            //comContractInfoExchangeList = exchangeMapper.getIncomeDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 导入的合同信息表 */
+            comContractInfoExchangeList = exchangeNewMapper.getIncomeDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
 
         }
 
         if (depart == null) {
             depart = "Boss";
-            comContractInfoExchangeList = exchangeMapper.getIncomeDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 采集的合同信息表 */
+            //comContractInfoExchangeList = exchangeMapper.getIncomeDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 导入的合同信息表 */
+            comContractInfoExchangeList = exchangeNewMapper.getIncomeDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
         }
         return comContractInfoExchangeList;
     }
@@ -463,9 +515,15 @@ public class IndexServiceImpl implements IndexService {
 
             BigDecimal currentYearTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                currentYearTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 采集的合同信息表 */
+                //currentYearTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 导入的合同信息表 */
+                currentYearTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentYearBeginDate, currentYearEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                currentYearTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 采集的合同信息表 */
+                //currentYearTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
+                /** 导入的合同信息表 */
+                currentYearTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentYearBeginDate, currentYearEndDate);
             }
             if (ObjectUtils.isEmpty(currentYearTotal)) currentYearTotal = BigDecimal.valueOf(0);
             return currentYearTotal;
@@ -484,9 +542,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastYearTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastYearTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastYearTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastYearBeginDate, LastTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                lastYearTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastYearBeginDate, LastTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastYearTqTotal)) lastYearTqTotal = BigDecimal.valueOf(0);
             return lastYearTqTotal;
@@ -502,9 +566,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> currentMonthTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal currentMonthTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                currentMonthTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 采集的合同信息表 */
+                //currentMonthTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 导入的合同信息表 */
+                currentMonthTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, currentMothBginDate, currentMothEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
-                currentMonthTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 采集的合同信息表 */
+                //currentMonthTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
+                /** 导入的合同信息表 */
+                currentMonthTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, currentMothBginDate, currentMothEndDate);
             }
             if (ObjectUtils.isEmpty(currentMonthTotal)) currentMonthTotal = BigDecimal.valueOf(0);
             return currentMonthTotal;
@@ -521,9 +591,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastMothTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastMothTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastMothTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 采集的合同信息表 */
+                //lastMothTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 导入的合同信息表 */
+                lastMothTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
+                /** 采集的合同信息表 */
                 lastMothTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
+                /** 导入的合同信息表 */
+                lastMothTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, LastMothTqBeginDate, LastMothTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastMothTqTotal)) lastMothTqTotal = BigDecimal.valueOf(0);
             return lastMothTqTotal;
@@ -541,9 +617,15 @@ public class IndexServiceImpl implements IndexService {
         CompletableFuture<BigDecimal> lastYearMonthTqTotalFuture = CompletableFuture.supplyAsync(() -> {
             BigDecimal lastYearMonthTqTotal = null;
             if (AuthMark.DEPT_LEADER.equals(finalRole)) {
-                lastYearMonthTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 采集的合同信息表 */
+                //lastYearMonthTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearMonthTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRange(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
             } else if (AuthMark.BOSS.equals(finalRole)) {
+                /** 采集的合同信息表 */
                 lastYearMonthTqTotal = exchangeMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
+                /** 导入的合同信息表 */
+                lastYearMonthTqTotal = exchangeNewMapper.getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(tasknoList, lastYearMonthTqBeginDate, lastYearMonthTqEndDate);
             }
             if (ObjectUtils.isEmpty(lastYearMonthTqTotal)) lastYearMonthTqTotal = BigDecimal.valueOf(0);
             return lastYearMonthTqTotal;
@@ -648,12 +730,18 @@ public class IndexServiceImpl implements IndexService {
             tasknoList.addAll(XdbmTasknoList);
             if (tasknoList.isEmpty()) return comContractInfoExchangeList;
 
-            comContractInfoExchangeList = exchangeMapper.getReceivedDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 采集的合同信息表 */
+            //comContractInfoExchangeList = exchangeMapper.getReceivedDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 导入的合同信息表 */
+            comContractInfoExchangeList = exchangeNewMapper.getReceivedDetailByTasknoListAndByQsrqRange(page, tasknoList, currentMothBginDate, currentMothEndDate);
 
         }
         if (depart == null) {
             depart = "Boss";
-            comContractInfoExchangeList = exchangeMapper.getReceivedDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 采集的合同信息表 */
+            //comContractInfoExchangeList = exchangeMapper.getReceivedDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
+            /** 导入的合同信息表 */
+            comContractInfoExchangeList = exchangeNewMapper.getReceivedDetailByTasknoListAndByQsrqRangeIfBoss(page, tasknoList, currentMothBginDate, currentMothEndDate);
         }
         return comContractInfoExchangeList;
     }
@@ -786,15 +874,27 @@ public class IndexServiceImpl implements IndexService {
         List<ContractAmount> contractAmountList;
         if (YEAR.equals(Time)) {
             if (AuthMark.DEPT_LEADER.equals(role)) {
-                contractAmountList = exchangeMapper.getContractAmountandNumByYear(tasknoList, beginDate, endDate);
+                /** 采集的合同信息表 */
+                //contractAmountList = exchangeMapper.getContractAmountandNumByYear(tasknoList, beginDate, endDate);
+                /** 导入的合同信息表 */
+                contractAmountList = exchangeNewMapper.getContractAmountandNumByYear(tasknoList, beginDate, endDate);
             } else {
-                contractAmountList = exchangeMapper.getContractAmountandNumByYearIfBoss(tasknoList, beginDate, endDate);
+                /** 采集的合同信息表 */
+                //contractAmountList = exchangeMapper.getContractAmountandNumByYearIfBoss(tasknoList, beginDate, endDate);
+                /** 导入的合同信息表 */
+                contractAmountList = exchangeNewMapper.getContractAmountandNumByYearIfBoss(tasknoList, beginDate, endDate);
             }
         } else {
             if (AuthMark.DEPT_LEADER.equals(role)) {
-                contractAmountList = exchangeMapper.getContractAmountandNumByMonth(tasknoList, beginDate, endDate);
+                /** 采集的合同信息表 */
+                //contractAmountList = exchangeMapper.getContractAmountandNumByMonth(tasknoList, beginDate, endDate);
+                /** 导入的合同信息表 */
+                contractAmountList = exchangeNewMapper.getContractAmountandNumByMonth(tasknoList, beginDate, endDate);
             } else {
-                contractAmountList = exchangeMapper.getContractAmountandNumByMonthIfBoss(tasknoList, beginDate, endDate);
+                /** 采集的合同信息表 */
+                //contractAmountList = exchangeMapper.getContractAmountandNumByMonthIfBoss(tasknoList, beginDate, endDate);
+                /** 导入的合同信息表 */
+                contractAmountList = exchangeNewMapper.getContractAmountandNumByMonthIfBoss(tasknoList, beginDate, endDate);
             }
         }
         ContractChartInfoVo newResVo = new ContractChartInfoVo();
@@ -985,19 +1085,24 @@ public class IndexServiceImpl implements IndexService {
             List<String> taskNoList1 = new ArrayList<>();
             switch (timeStatus) {
                 case "0"://当年的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByNameCurrYear(sysDepartName);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByNameCurrYear(sysDepartName);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByNameCurrYear(sysDepartName);
                     break;
                 case "1"://上一年的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByNameLastYear(sysDepartName);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByNameLastYear(sysDepartName);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByNameLastYear(sysDepartName);
                     break;
                 case "2"://当月的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByNameCurrMonth(sysDepartName);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByNameCurrMonth(sysDepartName);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByNameCurrMonth(sysDepartName);
                     break;
                 case "3"://上个月的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByNameLastMonth(sysDepartName);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByNameLastMonth(sysDepartName);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByNameLastMonth(sysDepartName);
                     break;
                 case "4"://上一年同月的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByNameTqMonth(sysDepartName);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByNameTqMonth(sysDepartName);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByNameTqMonth(sysDepartName);
                     break;
                 default:
                     System.out.println("默认没有任务");
@@ -1033,19 +1138,24 @@ public class IndexServiceImpl implements IndexService {
         List<String> taskNoList = new ArrayList<>();
         switch (timeStatus) {
             case "0"://当年的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByCurrYear();
+                //taskNoList = kyTaskInfoService.getKyTaskNoByCurrYear();
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByCurrYear();
                 break;
             case "1"://上一年的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByLastYear();
+                //taskNoList = kyTaskInfoService.getKyTaskNoByLastYear();
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByLastYear();
                 break;
             case "2"://当月的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByCurrMonth();
+                //taskNoList = kyTaskInfoService.getKyTaskNoByCurrMonth();
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByCurrMonth();
                 break;
             case "3"://上个月的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByLastMonth();
+                //taskNoList = kyTaskInfoService.getKyTaskNoByLastMonth();
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByLastMonth();
                 break;
             case "4"://上一年同月的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByTqMonth();
+                //taskNoList = kyTaskInfoService.getKyTaskNoByTqMonth();
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByTqMonth();
                 break;
             default:
                 System.out.println("默认没有任务");
@@ -1074,10 +1184,12 @@ public class IndexServiceImpl implements IndexService {
             List<String> taskNoList1 = new ArrayList<>();
             switch (timeType) {
                 case "year"://某年的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByYear(sysDepartName, timeRange);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByYear(sysDepartName, timeRange);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByYear(sysDepartName, timeRange);
                     break;
                 case "month"://某月的所有任务
-                    taskNoList1 = kyTaskInfoService.getKyTaskNoByMonth(sysDepartName, timeRange);
+                    //taskNoList1 = kyTaskInfoService.getKyTaskNoByMonth(sysDepartName, timeRange);
+                    taskNoList1 = kyTaskInfoNewService.getKyTaskNoByMonth(sysDepartName, timeRange);
                     break;
                 default:
                     System.out.println("默认没有任务");
@@ -1109,10 +1221,12 @@ public class IndexServiceImpl implements IndexService {
         List<String> taskNoList = new ArrayList<>();
         switch (timeType) {
             case "year"://某年的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByYear2(timeRange);
+                //taskNoList = kyTaskInfoService.getKyTaskNoByYear2(timeRange);
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByYear2(timeRange);
                 break;
             case "month"://某月的所有任务
-                taskNoList = kyTaskInfoService.getKyTaskNoByMonth2(timeRange);
+                //taskNoList = kyTaskInfoService.getKyTaskNoByMonth2(timeRange);
+                taskNoList = kyTaskInfoNewService.getKyTaskNoByMonth2(timeRange);
                 break;
             default:
                 System.out.println("默认没有任务");
@@ -1449,13 +1563,19 @@ public class IndexServiceImpl implements IndexService {
         for (String timeRange2 : timeRangeList) {
             //根据日期和当前部门对应的任务号查询，部门某年或某月的年收入
             if (timeType.equals("year")) {
-                BigDecimal yearTotal = exchangeMapper.getReceivedByYear(tasknoList, timeRange2);
+                /** 采集的合同信息表 */
+                //BigDecimal yearTotal = exchangeMapper.getReceivedByYear(tasknoList, timeRange2);
+                /** 导入的合同信息表 */
+                BigDecimal yearTotal = exchangeNewMapper.getReceivedByYear(tasknoList, timeRange2);
                 if (yearTotal == null) {
                     yearTotal = initValue;
                 }
                 seriesDataList2.add(yearTotal);
             } else if (timeType.equals("month")) {
-                BigDecimal yearTotal = exchangeMapper.getReceivedByYMonth(tasknoList, timeRange2);
+                /** 采集的合同信息表 */
+                //BigDecimal yearTotal = exchangeMapper.getReceivedByYMonth(tasknoList, timeRange2);
+                /** 导入的合同信息表 */
+                BigDecimal yearTotal = exchangeNewMapper.getReceivedByYMonth(tasknoList, timeRange2);
                 if (yearTotal == null) {
                     yearTotal = initValue;
                 }
@@ -1521,13 +1641,19 @@ public class IndexServiceImpl implements IndexService {
         for (String timeRange2 : timeRangeList) {
             //根据日期和当前部门对应的任务号查询，部门某年或某月的年收入
             if (timeType.equals("year")) {
-                BigDecimal yearTotal = exchangeMapper.getReceivedByYear(tasknoList, timeRange2);
+                /** 采集的合同信息表 */
+                //BigDecimal yearTotal = exchangeMapper.getReceivedByYear(tasknoList, timeRange2);
+                /** 导入的合同信息表 */
+                BigDecimal yearTotal = exchangeNewMapper.getReceivedByYear(tasknoList, timeRange2);
                 if (yearTotal == null) {
                     yearTotal = initValue;
                 }
                 seriesDataList2.add(yearTotal);
             } else if (timeType.equals("month")) {
-                BigDecimal yearTotal = exchangeMapper.getReceivedByYMonth(tasknoList, timeRange2);
+                /** 采集的合同信息表 */
+                //BigDecimal yearTotal = exchangeMapper.getReceivedByYMonth(tasknoList, timeRange2);
+                /** 导入的合同信息表 */
+                BigDecimal yearTotal = exchangeNewMapper.getReceivedByYMonth(tasknoList, timeRange2);
                 if (yearTotal == null) {
                     yearTotal = initValue;
                 }
@@ -2266,7 +2392,10 @@ public class IndexServiceImpl implements IndexService {
         //4.计算该时间列表中某年或某月对应的总收款
         List<ReceivedByDate> receivedByDates = new ArrayList<>();
         if (timeType.equals("year")) {
-            receivedByDates = exchangeMapper.getReceivedAllByYear(startString, endString);
+            /** 采集的合同信息表 */
+            //receivedByDates = exchangeMapper.getReceivedAllByYear(startString, endString);
+            /** 导入的合同信息表 */
+            receivedByDates = exchangeNewMapper.getReceivedAllByYear(startString, endString);
 //            System.out.println("已收款二层按年查询结果：");
 //            for(ReceivedByDate receivedByDate:receivedByDates){
 //                System.out.println(receivedByDate.getDate());
@@ -2275,7 +2404,10 @@ public class IndexServiceImpl implements IndexService {
 //            System.out.println(receivedByDates);
 
         } else if (timeType.equals("month")) {
-            receivedByDates = exchangeMapper.getReceivedAllByYMonth(startString, endString);
+            /** 采集的合同信息表 */
+            //receivedByDates = exchangeMapper.getReceivedAllByYMonth(startString, endString);
+            /** 导入的合同信息表 */
+            receivedByDates = exchangeNewMapper.getReceivedAllByYMonth(startString, endString);
 //            System.out.println("已收款二层按月查询结果：");
 //            for(ReceivedByDate receivedByDate:receivedByDates){
 //                System.out.println(receivedByDate.getDate());
@@ -2423,7 +2555,10 @@ public class IndexServiceImpl implements IndexService {
         //4.计算该时间列表中某年或某月对应的总收款
         List<ReceivedByDate> receivedByDates = new ArrayList<>();
         if (timeType.equals("year")) {
-            receivedByDates = exchangeMapper.getReceivedByYear2(sysDepartNames, startString, endString);
+            /** 采集的合同信息表 */
+            //receivedByDates = exchangeMapper.getReceivedByYear2(sysDepartNames, startString, endString);
+            /** 导入的合同信息表 */
+            receivedByDates = exchangeNewMapper.getReceivedByYear2(sysDepartNames, startString, endString);
             System.out.println("部门领导已收款二层按年查询结果：");
             for (ReceivedByDate receivedByDate : receivedByDates) {
                 System.out.println(receivedByDate.getDate());
@@ -2432,7 +2567,10 @@ public class IndexServiceImpl implements IndexService {
             System.out.println(receivedByDates);
 
         } else if (timeType.equals("month")) {
-            receivedByDates = exchangeMapper.getReceivedByYMonth2(sysDepartNames, startString, endString);
+            /** 采集的合同信息表 */
+            //receivedByDates = exchangeMapper.getReceivedByYMonth2(sysDepartNames, startString, endString);
+            /** 导入的合同信息表 */
+            receivedByDates = exchangeNewMapper.getReceivedByYMonth2(sysDepartNames, startString, endString);
             System.out.println("部门领导已收款二层按月查询结果：");
             for (ReceivedByDate receivedByDate : receivedByDates) {
                 System.out.println(receivedByDate.getDate());

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/controller/ComContractInfoExchangeNewController.java

@@ -13,6 +13,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
 import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +22,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -174,4 +178,56 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
         return super.importExcel(request, response, ComContractInfoExchangeNew.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 导出合同明细
+    *   date: 2024/4/12
+    */
+	@ApiOperation(value="项目成本——导出合同额的详情excel")
+	@RequestMapping(value = "/exportNewHteDetail")
+	public ModelAndView exportNewHteDetail(String taskno) {
+		List<ComContractInfoExchangeNewHTEVO>  list = comContractInfoExchangeNewService.getCrmHteDetail(taskno);
+		return comContractInfoExchangeNewService.exportHteDetail(list,ComContractInfoExchangeNewHTEVO.class, "合同额详情");
+	}
+
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 合同额的详情
+    *   date: 2024/4/12
+    */
+	 @ApiOperation(value="项目成本——合同额的详情列表", notes="项目成本——合同额的详情列表")
+	 @GetMapping(value = "/getNewCrmHteDetail")
+	 public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetail(String taskno){
+		 List<ComContractInfoExchangeNewHTEVO> crmHteDetail = comContractInfoExchangeNewService.getCrmHteDetail(taskno);
+		 return crmHteDetail;
+	 }
+
+	 /**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: 导出已收款明细
+	 *   date: 2024/4/12
+	 */
+	 @ApiOperation(value="项目成本——导出已收款的详情excel")
+	 @RequestMapping(value = "/exportNewYskDetail")
+	 public ModelAndView exportNewYskDetail(String taskno) {
+		 List<ComContractInfoExchangeNewYSKVO> list = comContractInfoExchangeNewService.getCrmYskDetail(taskno);
+		 return comContractInfoExchangeNewService.exportYskDetail(list,ComContractInfoExchangeNewYSKVO.class, "已收款详情");
+	 }
+
+	 /**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: 已收款详情
+	 *   date: 2024/4/12
+	 */
+	 @ApiOperation(value="项目成本——已收款的详情列表", notes="项目成本——已收款的详情列表")
+	 @GetMapping(value = "/getNewCrmYskDetail")
+	 public List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetail(String taskno){
+		 return comContractInfoExchangeNewService.getCrmYskDetail(taskno);
+	 }
+
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/entity/ComContractInfoExchangeNew.java

@@ -277,6 +277,11 @@ public class ComContractInfoExchangeNew implements Serializable {
     @ExcelProperty(value = "数量")
     @ApiModelProperty(value = "数量")
     private java.lang.Integer sl;
+    /**部门*/
+//	@Excel(name = "研制部门", width = 15)
+    @ExcelProperty(value = "部门")
+    @ApiModelProperty(value = "部门")
+    private java.lang.String bm;
     /**收款总金额*/
 //	@Excel(name = "收款总金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 14)

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/entity/ComContractInfoExchangeNewHTEVO.java

@@ -0,0 +1,197 @@
+package org.jeecg.modules.comContractInfoExchangeNew.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.date.DateStringConverter;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dzc
+ * @date 2024/4/12 14:44
+ * @package org.jeecg.modules.comContractInfoExchangeNew.entity
+ * @project yecai_server
+ * @des 合同额实体
+ */
+@Data
+public class ComContractInfoExchangeNewHTEVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ExcelIgnore
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+
+    /**序号*/
+//	@Excel(name = "序号", width = 15)
+//    @ExcelProperty(value = "序号")
+    @ApiModelProperty(value = "序号")
+    private java.lang.String serialno;
+    /**ID*/
+//	@Excel(name = "ID", width = 15)
+//    @ExcelProperty(value = "ID")
+    @ApiModelProperty(value = "ID")
+    private java.lang.String htid;
+    /**主合同编号*/
+	@Excel(name = "主合同编号", width = 15)
+    //@ExcelProperty(value = "主合同编号")
+    @ApiModelProperty(value = "主合同编号")
+    private java.lang.String zhtbh;
+    /**合同编号*/
+	@Excel(name = "合同编号", width = 15)
+    //@ExcelProperty(value = "合同编号")
+    @ApiModelProperty(value = "合同编号")
+    private java.lang.String htbh;
+    /**合同名称*/
+    @Excel(name = "合同名称", width = 15)
+    //@ExcelProperty(value = "合同名称")
+    @ApiModelProperty(value = "合同名称")
+    private java.lang.String htname;
+    /**签署日期*/
+    @Excel(name = "签署日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    //@ExcelProperty(value = "签署日期", converter = DateStringConverter.class)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "签署日期")
+    private java.util.Date qsrq;
+    /**甲方（付款方）*/
+    @Excel(name = "甲方（付款方）", width = 15)
+    //@ExcelProperty(value = "甲方（付款方）")
+    @ApiModelProperty(value = "甲方（付款方）")
+    private java.lang.String jf;
+    /**甲方简称*/
+    @Excel(name = "甲方简称", width = 15)
+    //@ExcelProperty(value = "甲方简称")
+    @ApiModelProperty(value = "甲方简称")
+    private java.lang.String jfjc;
+    /**合同金额*/
+	@Excel(name = "合同金额", width = 15)    //单元格常规格式用这个
+//    @ExcelProperty(converter = BigDecimalStringConverter.class)   //单元格文本格式用这个
+//    @ExcelProperty(converter = BigDecimalNumberConverter.class)  //单元格数值格式用这个
+//    @ExcelProperty(value = "合同金额")
+    @ApiModelProperty(value = "合同金额")
+    private java.math.BigDecimal htje;
+    /**自筹*/
+    @Excel(name = "自筹", width = 15)
+    //@ExcelProperty(value = "自筹")
+    @ApiModelProperty(value = "自筹")
+    private java.math.BigDecimal zc;
+    /**合同到款*/
+    @Excel(name = "合同到款", width = 15)
+    //@ExcelProperty(value = "合同到款")
+    @ApiModelProperty(value = "合同到款")
+    private java.math.BigDecimal htdk;
+    /**合同待收款*/
+    @Excel(name = "合同待收款", width = 15)
+    //@ExcelProperty(value = "合同待收款")
+    @ApiModelProperty(value = "合同待收款")
+    private java.math.BigDecimal htdsk;
+    /**合同已开票*/
+    @Excel(name = "合同已开票", width = 15)
+    //@ExcelProperty(value = "合同已开票")
+    @ApiModelProperty(value = "合同已开票")
+    private java.math.BigDecimal htykp;
+    /**合同待开票*/
+    @Excel(name = "合同待开票", width = 15)
+    //@ExcelProperty(value = "合同待开票")
+    @ApiModelProperty(value = "合同待开票")
+    private java.math.BigDecimal htdkp;
+    /**任务编号*/
+    @Excel(name = "任务编号", width = 15)
+    //@ExcelProperty(value = "任务编号")
+    @ApiModelProperty(value = "任务编号")
+    private java.lang.String rwbh;
+    /**任务名称*/
+    @Excel(name = "任务名称", width = 15)
+    //@ExcelProperty(value = "任务名称")
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String rwname;
+    /**产品型号*/
+    @Excel(name = "产品型号", width = 15)
+    //@ExcelProperty(value = "产品型号")
+    @ApiModelProperty(value = "产品型号")
+    private java.lang.String cpxh;
+    /**阶段*/
+    @Excel(name = "阶段", width = 15)
+    //@ExcelProperty(value = "阶段")
+    @ApiModelProperty(value = "阶段")
+    private java.lang.String jd;
+    /**研制部门*/
+    @Excel(name = "研制部门", width = 15)
+    //@ExcelProperty(value = "研制部门")
+    @ApiModelProperty(value = "研制部门")
+    private java.lang.String yzbm;
+    /**任务应收款*/
+    @Excel(name = "任务应收款", width = 15)
+    //@ExcelProperty(value = "任务应收款")
+    @ApiModelProperty(value = "任务应收款")
+    private java.math.BigDecimal rwyingsk;
+    /**任务已收款*/
+    @Excel(name = "任务已收款", width = 15)
+    //@ExcelProperty(value = "任务已收款")
+    @ApiModelProperty(value = "任务已收款")
+    private java.math.BigDecimal rwyisk;
+    /**发票类型1*/
+    @Excel(name = "发票类型1", width = 15)
+    //@ExcelProperty(value = "发票类型1")
+    @ApiModelProperty(value = "发票类型1")
+    private java.lang.String fptypeone;
+    /**发票1金额*/
+    @Excel(name = "发票1金额", width = 15)
+    //@ExcelProperty(value = "发票1金额")
+    @ApiModelProperty(value = "发票1金额")
+    private java.math.BigDecimal fpjeone;
+    /**1已开票额*/
+    @Excel(name = "1已开票额", width = 15)
+    //@ExcelProperty(value = "1已开票额")
+    @ApiModelProperty(value = "1已开票额")
+    private java.math.BigDecimal ykpeone;
+    /**发票类型2*/
+	@Excel(name = "发票类型2", width = 15)
+    //@ExcelProperty(value = "发票类型2")
+    @ApiModelProperty(value = "发票类型2")
+    private java.lang.String fptypetwo;
+    /**发票2金额*/
+    @Excel(name = "发票2金额", width = 15)
+    //@ExcelProperty(value = "发票2金额")
+    @ApiModelProperty(value = "发票2金额")
+    private java.math.BigDecimal fpjetwo;
+    /**2已开票额*/
+	@Excel(name = "2已开票额", width = 15)
+//    @ExcelProperty(converter = BigDecimalStringConverter.class)
+//    @ExcelProperty(converter = BigDecimalNumberConverter.class)
+//    @ExcelProperty(value = "2已开票额")
+    @ApiModelProperty(value = "2已开票额")
+    private java.math.BigDecimal ykpetwo;
+    /**合同主管部门*/
+	@Excel(name = "合同主管部门", width = 15)
+    //@ExcelProperty(value = "合同主管部门")
+    @ApiModelProperty(value = "合同主管部门")
+    private java.lang.String htzgbm;
+    /**业务员*/
+	@Excel(name = "业务员", width = 15)
+    //@ExcelProperty(value = "业务员")
+    @ApiModelProperty(value = "业务员")
+    private java.lang.String ywy;
+    /**合同履行情况*/
+	@Excel(name = "合同履行情况", width = 15)
+    //@ExcelProperty(value = "合同履行情况")
+    @ApiModelProperty(value = "合同履行情况")
+    private java.lang.String htlxqk;
+    /**合同状态说明*/
+	@Excel(name = "合同状态说明", width = 15)
+    //@ExcelProperty(value = "合同状态说明")
+    @ApiModelProperty(value = "合同状态说明")
+    private java.lang.String htztsm;
+
+
+
+}

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/entity/ComContractInfoExchangeNewYSKVO.java

@@ -0,0 +1,181 @@
+package org.jeecg.modules.comContractInfoExchangeNew.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.date.DateStringConverter;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dzc
+ * @date 2024/4/12 14:46
+ * @package org.jeecg.modules.comContractInfoExchangeNew.entity
+ * @project yecai_server
+ * @des 已收款实体
+ */
+@Data
+public class ComContractInfoExchangeNewYSKVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ExcelIgnore
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+
+    /**收款单号*/
+	@Excel(name = "收款单号", width = 15)
+//    @ExcelProperty(value = "收款单号")
+    @ApiModelProperty(value = "收款单号")
+    private java.lang.String skdh;
+    /**执行状态*/
+	@Excel(name = "执行状态", width = 15)
+//    @ExcelProperty(value = "执行状态")
+    @ApiModelProperty(value = "执行状态")
+    private java.lang.String zxzt;
+    /**付款方名称*/
+	@Excel(name = "付款方名称", width = 15)
+//    @ExcelProperty(value = "付款方名称")
+    @ApiModelProperty(value = "付款方名称")
+    private java.lang.String fkfmc;
+    /**用户简称*/
+	@Excel(name = "用户简称", width = 15)
+//    @ExcelProperty(value = "用户简称")
+    @ApiModelProperty(value = "用户简称")
+    private java.lang.String yhjc;
+    /**合同编号*/
+	@Excel(name = "合同编号", width = 15)
+    //@ExcelProperty(value = "合同编号")
+    @ApiModelProperty(value = "合同编号")
+    private java.lang.String htbh;
+    /**合同名称*/
+	@Excel(name = "合同名称", width = 15)
+    //@ExcelProperty(value = "合同名称")
+    @ApiModelProperty(value = "合同名称")
+    private java.lang.String htname;
+    /**合同类型*/
+	@Excel(name = "合同类型", width = 15)
+    //@ExcelProperty(value = "合同类型")
+    @ApiModelProperty(value = "合同类型")
+    private java.lang.String httype;
+    /**型号*/
+	@Excel(name = "型号", width = 15)
+    //@ExcelProperty(value = "型号")
+    @ApiModelProperty(value = "型号")
+    private java.lang.String xh;
+    /**阶段*/
+    @Excel(name = "阶段", width = 15)
+    //@ExcelProperty(value = "阶段")
+    @ApiModelProperty(value = "阶段")
+    private java.lang.String jd;
+    /**数量*/
+	@Excel(name = "数量", width = 15)
+    //@ExcelProperty(value = "数量")
+    @ApiModelProperty(value = "数量")
+    private java.lang.Integer sl;
+    /**部门*/
+	@Excel(name = "部门", width = 15)
+    //@ExcelProperty(value = "部门")
+    @ApiModelProperty(value = "部门")
+    private java.lang.String bm;
+    /**任务编号*/
+	@Excel(name = "任务编号", width = 15)
+    //@ExcelProperty(value = "任务编号")
+    @ApiModelProperty(value = "任务编号")
+    private java.lang.String rwbh;
+    /**任务名称*/
+	@Excel(name = "任务名称", width = 15)
+    //@ExcelProperty(value = "任务名称")
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String rwname;
+    /**收款总金额*/
+	@Excel(name = "收款总金额", width = 15)
+//    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 14)
+//    @ExcelProperty(value = "收款总金额", converter = BigDecimalNumberConverter.class)
+//    @ExcelProperty(value = "收款总金额")
+    @ApiModelProperty(value = "收款总金额")
+    private java.math.BigDecimal skzje;
+    /** 任务收款金额 */
+	@Excel(name = " 任务收款金额 ", width = 15)
+//    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 15)
+//    @ExcelProperty(value = "任务收款金额", converter = BigDecimalNumberConverter.class)
+//    @ExcelProperty(value = "任务收款金额")
+    @ApiModelProperty(value = " 任务收款金额 ")
+    private java.math.BigDecimal rwskje;
+    /**到款日期/汇票到期日期*/
+	@Excel(name = "到款日期/汇票到期日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    //@ExcelProperty(value = "到款日期/汇票到期日期", converter = DateStringConverter.class)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "到款日期/汇票到期日期")
+    private java.util.Date dkhpdqrq;
+    /**收款类型*/
+	@Excel(name = "收款类型", width = 15)
+    //@ExcelProperty(value = "收款类型")
+    @ApiModelProperty(value = "收款类型")
+    private java.lang.String sktype;
+    /**收款科目代码*/
+	@Excel(name = "收款科目代码", width = 15)
+    //@ExcelProperty(value = "收款科目代码")
+    @ApiModelProperty(value = "收款科目代码")
+    private java.lang.String skkmdm;
+    /**凭证号*/
+	@Excel(name = "凭证号", width = 15)
+    //@ExcelProperty(value = "凭证号")
+    @ApiModelProperty(value = "凭证号")
+    private java.lang.String pzh;
+    /**业务员*/
+	@Excel(name = "业务员", width = 15)
+    //@ExcelProperty(value = "业务员")
+    @ApiModelProperty(value = "业务员")
+    private java.lang.String ywy;
+    /**业务部门*/
+	@Excel(name = "业务部门", width = 15)
+    //@ExcelProperty(value = "业务部门")
+    @ApiModelProperty(value = "业务部门")
+    private java.lang.String ywbm;
+    /**录入人*/
+	@Excel(name = "录入人", width = 15)
+    //@ExcelProperty(value = "录入人")
+    @ApiModelProperty(value = "录入人")
+    private java.lang.String lrr;
+    /**录入日期*/
+	@Excel(name = "录入日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    //@ExcelProperty(value = "录入日期", converter = DateStringConverter.class)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "录入日期")
+    private java.util.Date lrrq;
+    /**交易流水号*/
+	@Excel(name = "交易流水号", width = 15)
+    //@ExcelProperty(value = "交易流水号")
+    @ApiModelProperty(value = "交易流水号")
+    private java.lang.String jylsh;
+    /**交易ID*/
+	@Excel(name = "交易ID", width = 15)
+    //@ExcelProperty(value = "交易ID")
+    @ApiModelProperty(value = "交易ID")
+    private java.lang.String jyid;
+    /**汇票号*/
+	@Excel(name = "汇票号", width = 15)
+    //@ExcelProperty(value = "汇票号")
+    @ApiModelProperty(value = "汇票号")
+    private java.lang.String hph;
+    /**汇票ID*/
+	@Excel(name = "汇票ID", width = 15)
+    //@ExcelProperty(value = "汇票ID")
+    @ApiModelProperty(value = "汇票ID")
+    private java.lang.String hpid;
+    /**收款单位*/
+	@Excel(name = "收款单位", width = 15)
+    //@ExcelProperty(value = "收款单位")
+    @ApiModelProperty(value = "收款单位")
+    private java.lang.String skdw;
+}

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/mapper/ComContractInfoExchangeNewMapper.java

@@ -1,10 +1,20 @@
 package org.jeecg.modules.comContractInfoExchangeNew.mapper;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.Index.entity.pojo.ContractAmount;
+import org.jeecg.modules.Index.entity.pojo.ReceivedByDate;
 import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
+import org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
 
 /**
  * @Description: 导入合同、收款表
@@ -14,4 +24,60 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ComContractInfoExchangeNewMapper extends BaseMapper<ComContractInfoExchangeNew> {
 
+    BigDecimal getIncomeYearTotalByTasknoListAndByQsrqRange(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    BigDecimal getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    //获取首页当月合同额的明细
+    List<ComContractInfoExchange> getIncomeDetailByTasknoListAndByQsrqRange(Page<ComContractInfoExchange> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    //获取首页当月合同额的明细
+    List<ComContractInfoExchange> getIncomeDetailByTasknoListAndByQsrqRangeIfBoss(Page<ComContractInfoExchange> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    BigDecimal getReceivedYearTotalByTasknoListAndByQsrqRange(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    BigDecimal getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    //获取首页当月收款额的明细
+    List<ComContractInfoExchange> getReceivedDetailByTasknoListAndByQsrqRange(Page<ComContractInfoExchange> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    //获取首页当月收款额的明细
+    List<ComContractInfoExchange> getReceivedDetailByTasknoListAndByQsrqRangeIfBoss(Page<ComContractInfoExchange> page, @Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ContractAmount> getContractAmountandNumByYear(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ContractAmount> getContractAmountandNumByYearIfBoss(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ContractAmount> getContractAmountandNumByMonth(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    List<ContractAmount> getContractAmountandNumByMonthIfBoss(@Param("tasknoList") List<String> tasknoList, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+
+    /*部门领导按年查询已收款*/
+    BigDecimal getReceivedByYear(@Param("tasknoList") List<String> tasknoList, @Param("year") String year);
+
+    List<ReceivedByDate> getReceivedByYear2(@Param("departNames") List<String> departNames, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+
+    /*部门领导按年月查询已收款*/
+    BigDecimal getReceivedByYMonth(@Param("tasknoList") List<String> tasknoList, @Param("ym") String ym);
+
+    List<ReceivedByDate> getReceivedByYMonth2(@Param("departNames") List<String> departNames, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+
+    @Select("select year(a.dkhpdqrq) as date,sum(a.rwskje) as received from (select dkhpdqrq,rwskje from com_contract_info_exchange_new where sjly = 40) a where YEAR(a.dkhpdqrq) BETWEEN #{beginDate} and #{endDate} group by year(a.dkhpdqrq)")
+    List<ReceivedByDate> getReceivedAllByYear(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+    @Select("select CONCAT(year(a.dkhpdqrq), '-', LPAD(month(a.dkhpdqrq), 2, '0')) as date,sum(a.rwskje) as received from (select dkhpdqrq,rwskje from com_contract_info_exchange_new where sjly = 40) a where CONCAT(year(a.dkhpdqrq), '-', LPAD(month(a.dkhpdqrq), 2, '0')) <= #{endDate} and CONCAT(year(a.dkhpdqrq), '-', LPAD(month(a.dkhpdqrq), 2, '0')) >= #{beginDate} group by year(a.dkhpdqrq), month(a.dkhpdqrq)")
+    List<ReceivedByDate> getReceivedAllByYMonth(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+    /**
+     * 用于项目成本——合同额的详情
+     */
+    public List<ComContractInfoExchangeNewHTEVO> getCrmHteDetail(@Param("taskno") String taskno);
+    /**
+     * 用于项目成本——已收款的详情
+     */
+    List<ComContractInfoExchangeNewYSKVO> getCrmYskDetail(@Param("taskno") String taskno);
+
+
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/mapper/xml/ComContractInfoExchangeNewMapper.xml

@@ -2,4 +2,206 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.comContractInfoExchangeNew.mapper.ComContractInfoExchangeNewMapper">
 
+    <select id="getIncomeYearTotalByTasknoListAndByQsrqRange" resultType="java.math.BigDecimal">
+        select sum(a.htfpe)
+        from (select rwbh,rwyingsk as htfpe,qsrq from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getIncomeYearTotalByTasknoListAndByQsrqRangeIfBoss" resultType="java.math.BigDecimal">
+        select sum(a.htfpe)
+        from (select rwyingsk as htfpe, qsrq from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+          and a.qsrq &lt; #{endDate}
+    </select>
+
+    <select id="getIncomeDetailByTasknoListAndByQsrqRange" resultType="org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange">
+        select id,serialno,htid,zhtbh,htbh,htname as htmc,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname as rwmc,
+               cpxh,jd,yzbm,rwyingsk as htfpe,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+               htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+               hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+        and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getIncomeDetailByTasknoListAndByQsrqRangeIfBoss" resultType="org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange">
+        select id,serialno,htid,zhtbh,htbh,htname as htmc,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname as rwmc,
+               cpxh,jd,yzbm,rwyingsk as htfpe,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,
+               htztsm,skdh,zxzt,fkfmc,yhjc,httype,xh,sl,bm,skzje,rwskje,dkhpdqrq,sktype,skkmdm,pzh,ywbm,lrr,lrrq,jylsh,jyid,
+               hph,hpid,skdw,sjly
+        from com_contract_info_exchange_new as a where a.sjly = 20
+        and a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+    </select>
+
+    <select id="getReceivedYearTotalByTasknoListAndByQsrqRange" resultType="java.math.BigDecimal">
+        select sum(a.rwskje)
+        from (select rwbh,dkhpdqrq,rwskje from com_contract_info_exchange_new where sjly = 40) a
+        where a.dkhpdqrq <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getReceivedYearTotalByTasknoListAndByQsrqRangeIfBoss" resultType="java.math.BigDecimal">
+        select sum(a.rwskje)
+        from (select dkhpdqrq, rwskje from com_contract_info_exchange_new where sjly = 40) a
+        where a.dkhpdqrq  <![CDATA[ >= ]]> #{beginDate}
+          and a.dkhpdqrq &lt; #{endDate}
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRange" resultType="org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+        and a.dkhpdqrq <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getReceivedDetailByTasknoListAndByQsrqRangeIfBoss" resultType="org.jeecg.modules.xmcbDetail.entity.ComContractInfoExchange">
+        select * from com_contract_info_exchange_new as a where sjly = 40
+        and a.dkhpdqrq  <![CDATA[ >= ]]> #{beginDate}
+        and a.dkhpdqrq &lt; #{endDate}
+    </select>
+
+    <select id="getContractAmountandNumByYear" resultType="org.jeecg.modules.Index.entity.pojo.ContractAmount">
+        SELECT
+        sum(htfpe) AS contractAmount,
+        count(
+        DISTINCT (htbh)) AS contractTotal,
+        YEAR (qsrq) AS Date
+        from (select rwbh,rwyingsk as htfpe,qsrq,htbh from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        GROUP BY YEAR(qsrq)
+    </select>
+
+    <select id="getContractAmountandNumByYearIfBoss" resultType="org.jeecg.modules.Index.entity.pojo.ContractAmount">
+        SELECT
+            sum(htfpe) AS contractAmount,
+            count(DISTINCT (htbh)) AS contractTotal,
+            YEAR (qsrq) AS Date
+        from (select rwbh,rwyingsk as htfpe,qsrq,htbh from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+          and a.qsrq &lt; #{endDate}
+        GROUP BY YEAR(qsrq)
+    </select>
+
+
+    <select id="getContractAmountandNumByMonth" resultType="org.jeecg.modules.Index.entity.pojo.ContractAmount">
+        SELECT
+        sum(htfpe) AS contractAmount,
+        count(
+        DISTINCT (htbh)) AS contractTotal,
+        CONCAT(YEAR (qsrq),"-",LPAD( MONTH (qsrq), 2, "0" )) AS date
+        from (select rwbh,rwyingsk as htfpe,qsrq,htbh from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+        and a.qsrq &lt; #{endDate}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        GROUP BY YEAR(qsrq),MONTH (qsrq)
+    </select>
+
+    <select id="getContractAmountandNumByMonthIfBoss" resultType="org.jeecg.modules.Index.entity.pojo.ContractAmount">
+        SELECT
+            sum(htfpe) AS contractAmount,
+            count(DISTINCT (htbh)) AS contractTotal,
+            CONCAT(YEAR (qsrq),"-",LPAD( MONTH (qsrq), 2, "0" )) AS date
+        from (select rwbh,rwyingsk as htfpe,qsrq,htbh from com_contract_info_exchange_new where sjly = 20) a
+        where a.qsrq <![CDATA[ >= ]]> #{beginDate}
+          and a.qsrq &lt; #{endDate}
+        GROUP BY YEAR(qsrq),MONTH (qsrq)
+    </select>
+
+    <!--按年查询已收款 -->
+    <select id="getReceivedByYear" resultType="java.math.BigDecimal">
+        select sum(a.rwskje)
+        from (select rwbh,dkhpdqrq,rwskje from com_contract_info_exchange_new where sjly = 40) a
+        where YEAR(a.dkhpdqrq)=#{year}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <!--按月查询已收款 -->
+    <select id="getReceivedByYMonth" resultType="java.math.BigDecimal">
+        select sum(a.rwskje)
+        from (select rwbh,dkhpdqrq,rwskje from com_contract_info_exchange_new where sjly = 40) a
+        where DATE_FORMAT(a.dkhpdqrq,"%Y-%m")=#{ym}
+        and a.rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+
+    <!--部门按年查询已收款 -->
+    <select id="getReceivedByYear2" resultType="org.jeecg.modules.Index.entity.pojo.ReceivedByDate">
+        select year(a.dkhpdqrq) as date,sum(a.rwskje) as received from com_contract_info_exchange_new a
+        where YEAR(a.dkhpdqrq) BETWEEN #{beginDate} and #{endDate}
+        and (a.rwbh in(select taskno from ky_task_info_new where zrbm in (
+        <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        ) or jycs in (
+        <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        )))
+        and sjly = 40
+        group by year(a.dkhpdqrq)
+    </select>
+
+    <!--部门按月查询已收款 -->
+    <select id="getReceivedByYMonth2" resultType="org.jeecg.modules.Index.entity.pojo.ReceivedByDate">
+        select CONCAT(year(a.dkhpdqrq), "-", LPAD(month(a.dkhpdqrq), 2, "0")) as date,sum(a.rwskje) as received
+        from com_contract_info_exchange_new a
+        where CONCAT(year(a.dkhpdqrq), "-", LPAD(month(a.dkhpdqrq), 2, "0")) <![CDATA[ <= ]]> #{endDate}
+        and CONCAT(year(a.dkhpdqrq), "-", LPAD(month(a.dkhpdqrq), 2, "0")) <![CDATA[ >= ]]> #{beginDate}
+        and (a.rwbh in(select taskno from ky_task_info_new where zrbm in (
+        <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        ) or jycs in (
+        <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        )))
+        and sjly = 40
+        group by year(a.dkhpdqrq), month(a.dkhpdqrq)
+    </select>
+    <select id="getCrmHteDetail"
+            resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,cpxh,jd,
+               yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,htztsm
+        from com_contract_info_exchange_new
+        where sjly = 20 and rwbh = #{taskno}
+    </select>
+    <select id="getCrmYskDetail"
+            resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select id,skdh,zxzt,fkfmc,yhjc,htbh,htname,httype,xh,jd,sl,bm,rwbh,rwname,skzje,rwskje,dkhpdqrq,sktype,skkmdm,
+               pzh,ywy,ywbm,lrr,lrrq,jylsh,jyid,hph,hpid,skdw
+        from com_contract_info_exchange_new
+        where sjly = 40 and DATE_FORMAT(`dkhpdqrq`,'%Y') > '2015' and rwbh = #{taskno}
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/service/IComContractInfoExchangeNewService.java

@@ -3,6 +3,13 @@ package org.jeecg.modules.comContractInfoExchangeNew.service;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeYSKVO;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
 
 
 /**
@@ -16,4 +23,36 @@ public interface IComContractInfoExchangeNewService extends IService<ComContract
     /* sjly:数据来源：20合同导入 40收款导入 */
     Result<?> importExcel1(String strUrl, Class<ComContractInfoExchangeNew> clazz, Integer sjly);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 合同额的详情
+    *   date: 2024/4/12
+    */
+    List<ComContractInfoExchangeNewHTEVO> getCrmHteDetail(String taskno);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 已收款的详情
+    *   date: 2024/4/12
+    */
+    List<ComContractInfoExchangeNewYSKVO> getCrmYskDetail(String taskno);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 导出合同额明细
+    *   date: 2024/4/12
+    */
+    public ModelAndView exportHteDetail(List<ComContractInfoExchangeNewHTEVO>  exportList,Class<ComContractInfoExchangeNewHTEVO> clazz, String title);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 导出已收款明细
+    *   date: 2024/4/12
+    */
+    public ModelAndView exportYskDetail(List<ComContractInfoExchangeNewYSKVO>  exportList, Class<ComContractInfoExchangeNewYSKVO> clazz, String title);
+
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/service/impl/ComContractInfoExchangeNewServiceImpl.java

@@ -4,16 +4,28 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
 import org.jeecg.modules.comContractInfoExchangeNew.mapper.ComContractInfoExchangeNewMapper;
 import org.jeecg.modules.comContractInfoExchangeNew.monitor.ComContractInfoExchangeNewListener;
 import org.jeecg.modules.comContractInfoExchangeNew.service.IComContractInfoExchangeNewService;
+import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.servlet.ModelAndView;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * @Description: 导入合同、收款表
@@ -25,6 +37,12 @@ import java.io.File;
 @Service
 public class ComContractInfoExchangeNewServiceImpl extends ServiceImpl<ComContractInfoExchangeNewMapper, ComContractInfoExchangeNew> implements IComContractInfoExchangeNewService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ComContractInfoExchangeNewMapper exchangeNewMapper;
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+
     /* sjly:数据来源：20合同导入 40收款导入 */
     @Override
     public Result<?> importExcel1(String strUrl, Class<ComContractInfoExchangeNew> clazz, Integer sjly){
@@ -41,5 +59,47 @@ public class ComContractInfoExchangeNewServiceImpl extends ServiceImpl<ComContra
         return Result.ok();
     }
 
+    @Override
+    public List<ComContractInfoExchangeNewHTEVO> getCrmHteDetail(String taskno) {
+        return exchangeNewMapper.getCrmHteDetail(taskno);
+    }
+
+    @Override
+    public List<ComContractInfoExchangeNewYSKVO> getCrmYskDetail(String taskno) {
+        return exchangeNewMapper.getCrmYskDetail(taskno);
+    }
 
+    @Override
+    public ModelAndView exportHteDetail(List<ComContractInfoExchangeNewHTEVO> exportList, Class<ComContractInfoExchangeNewHTEVO> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
+
+    @Override
+    public ModelAndView exportYskDetail(List<ComContractInfoExchangeNewYSKVO> exportList, Class<ComContractInfoExchangeNewYSKVO> clazz, String title) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfoNew/entity/KyTaskInfoNew.java

@@ -83,7 +83,7 @@ public class KyTaskInfoNew implements Serializable {
     @ApiModelProperty(value = "分系统")
     private String fxt;
 	/**研制数量*/
-	@ExcelProperty(value = "数量", converter = IntegerNumberConverter.class)
+	@ExcelProperty(value = "数量")
     @ApiModelProperty(value = "研制数量")
     private Integer yzsl;
 	/**研制阶段*/

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfoNew/mapper/KyTaskInfoNewMapper.java

@@ -3,7 +3,9 @@ package org.jeecg.modules.kyTaskInfoNew.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfoNew.entity.KyTaskInfoNew;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -19,4 +21,56 @@ public interface KyTaskInfoNewMapper extends BaseMapper<KyTaskInfoNew> {
     @Update("truncate table ky_task_info_new")
     void truncateTable();
 
+    /**根据任务号查科研任务的业务员和下达部门*/
+    @Select("select * from ky_task_info_new where taskno = #{taskno}")
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询*/
+    List<String> getKyTaskNoByNameCurrYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年查询*/
+    List<String> getKyTaskNoByNameLastYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询*/
+    public List<String> getKyTaskNoByNameCurrMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询*/
+    public List<String> getKyTaskNoByNameLastMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByNameTqMonth(String depName);
+
+    /**根据实际完成时间查询任务号    此处按年查询*/
+    public List<String> getKyTaskNoByCurrYear();
+
+    /**根据实际完成时间查询任务号  此处按上一年查询*/
+    public List<String> getKyTaskNoByLastYear();
+
+    /**根据实际完成时间查询任务号    此处按当月查询*/
+    public List<String> getKyTaskNoByCurrMonth();
+
+    /**根据实际完成时间查询任务号  此处按上个月查询*/
+    public List<String> getKyTaskNoByLastMonth();
+
+    /**根据实际完成时间查询任务号  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByTqMonth();
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按年查询（随便某一年的数据）*/
+    public List<String> getKyTaskNoByYear(String depName, String year);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按月查询（随便某一年某个月的数据） ym形式如2023-09*/
+    public List<String> getKyTaskNoByMonth(String depName, String ym);
+
+    /**根据实际完成时间查询任务号  按年查询（随便某一年的数据）*/
+    public List<String> getKyTaskNoByYear2(String year);
+
+    /**根据实际完成时间查询任务号  按月查询（随便某一年某个月的数据） ym形式如2023-09*/
+    public List<String> getKyTaskNoByMonth2(String ym);
+
+    String getPcCodeByTaskno(String taskNo);
+
+    Long getTaskYzslByTaskno(String taskno);
+
+    Long getPcCodeTaskYzslByTaskno(String taskno);
+
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfoNew/mapper/xml/KyTaskInfoNewMapper.xml

@@ -1,5 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.kyTaskInfoNew.mapper.KyTaskInfoNewMapper">
+    <!--根据部门和实际完成时间 当年-->
+    <select id="getKyTaskNoByNameCurrYear" parameterType="String" resultType="java.lang.String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW())
+            </if>
+        </where>
+    </select>
+
+    <!--根据部门和实际完成时间  上一年-->
+    <select id="getKyTaskNoByNameLastYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
+            </if>
+        </where>
+    </select>
+
+    <!--根据部门和实际完成时间  当月-->
+    <select id="getKyTaskNoByNameCurrMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW())
+            </if>
+        </where>
+    </select>
+
+    <!--根据部门和实际完成时间  上个月-->
+    <select id="getKyTaskNoByNameLastMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH))
+            </if>
+        </where>
+    </select>
+
+    <!--根据部门和实际完成时间  去年同期月份-->
+    <select id="getKyTaskNoByNameTqMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName}) and (DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR))
+            </if>
+        </where>
+    </select>
+
+    <!--根据实际完成时间 当年-->
+    <select id="getKyTaskNoByCurrYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-01-01') AND NOW()
+    </select>
+
+    <!--根据实际完成时间  上一年-->
+    <select id="getKyTaskNoByLastYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)), '-01-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)
+    </select>
+
+    <!--根据实际完成时间  当月-->
+    <select id="getKyTaskNoByCurrMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW()), '-01') AND NOW()
+    </select>
+
+    <!--根据实际完成时间  上个月-->
+    <select id="getKyTaskNoByLastMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW()), '-', Month(NOW())-1, '-01') AND DATE_SUB(NOW(), INTERVAL 1 MONTH)
+    </select>
+
+    <!--实际完成时间  去年同期月份-->
+    <select id="getKyTaskNoByTqMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new where DATE(sjwcsj) BETWEEN CONCAT(YEAR(NOW())-1, '-', Month(NOW()), '-01') AND DATE_SUB(NOW(), INTERVAL 1 YEAR)
+    </select>
+
+    <!--根据部门和实际完成时间  按年查询（随便某一年）-->
+    <select id="getKyTaskNoByYear" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName})
+            </if>
+            <if test="year!=null and year!=''">
+                and (YEAR(sjwcsj)=#{year})
+            </if>
+        </where>
+    </select>
+
+    <!--根据部门和实际完成时间  按年月查询（随便某一年的某个月）-->
+    <select id="getKyTaskNoByMonth" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="depName!=null and depName!=''">
+                and (zrbm=#{depName} or jycs=#{depName})
+            </if>
+            <if test="ym!=null and ym!=''">
+                and (DATE_FORMAT(sjwcsj,"%Y-%m")=#{ym})
+            </if>
+        </where>
+    </select>
+
+    <!--根据实际完成时间  按年查询（随便某一年）-->
+    <select id="getKyTaskNoByYear2" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="year!=null and year!=''">
+                and (YEAR(sjwcsj)=#{year})
+            </if>
+        </where>
+    </select>
+
+    <!--根据实际完成时间  按年月查询（随便某一年的某个月）-->
+    <select id="getKyTaskNoByMonth2" parameterType="String" resultType="String">
+        select taskno from ky_task_info_new
+        <where>
+            <if test="ym!=null and ym!=''">
+                and (DATE_FORMAT(sjwcsj,"%Y-%m")=#{ym})
+            </if>
+        </where>
+    </select>
+
+    <select id="getPcCodeByTaskno" resultType="java.lang.String">
+        select pcCode from ky_task_info_new where taskno = #{taskNo}
+    </select>
+    <select id="getTaskYzslByTaskno" resultType="java.lang.Long">
+        select yzsl from ky_task_info_new where taskno = #{taskno}
+    </select>
+    <select id="getPcCodeTaskYzslByTaskno" resultType="java.lang.Long">
+        select yzsl from ky_task_info_new where taskno = #{taskno}
+    </select>
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfoNew/service/IKyTaskInfoNewService.java

@@ -1,9 +1,12 @@
 package org.jeecg.modules.kyTaskInfoNew.service;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfoNew.entity.KyTaskInfoNew;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: ky_task_info_new
  * @Author: jeecg-boot
@@ -11,5 +14,59 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IKyTaskInfoNewService extends IService<KyTaskInfoNew> {
+    /**导入科研任务数据*/
     Result<?> importExcel1(String strUrl, Class<KyTaskInfoNew> clazz);
+
+    /**根据任务号查科研任务的业务员和下达部门*/
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询*/
+    List<String> getKyTaskNoByNameCurrYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年年查询*/
+    public List<String> getKyTaskNoByNameLastYear(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询*/
+    public List<String> getKyTaskNoByNameCurrMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询*/
+    public List<String> getKyTaskNoByNameLastMonth(String depName);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByNameTqMonth(String depName);
+
+    /**根据实际完成时间查询任务号    此处按年查询*/
+    public List<String> getKyTaskNoByCurrYear();
+
+    /**根据实际完成时间查询任务号  此处按上一年查询*/
+    public List<String> getKyTaskNoByLastYear();
+
+    /**根据实际完成时间查询任务号    此处按当月查询*/
+    public List<String> getKyTaskNoByCurrMonth();
+
+    /**根据实际完成时间查询任务号  此处按上个月查询*/
+    public List<String> getKyTaskNoByLastMonth();
+
+    /**根据实际完成时间查询任务号  此处按去年同期月份查询*/
+    public List<String> getKyTaskNoByTqMonth();
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按年查询（随便某一年的数据）*/
+    public List<String> getKyTaskNoByYear(String depName, String year);
+
+    /**根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按月查询（随便某一年某个月的数据） ym形式如2023-09*/
+    public List<String> getKyTaskNoByMonth(String depName, String ym);
+
+    /**根据实际完成时间查询任务号  按年查询（随便某一年的数据）*/
+    public List<String> getKyTaskNoByYear2(String year);
+
+    /**根据实际完成时间查询任务号  按月查询（随便某一年某个月的数据） ym形式如2023-09*/
+    public List<String> getKyTaskNoByMonth2(String ym);
+
+    Long getTaskYzslByTaskno(String taskno);
+
+    String getPcCodeByTaskno(String taskno);
+
+    boolean hasPcCode(String taskNo);
+
+    Long getPcCodeTaskYzslByTaskno(String taskno);
 }

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfoNew/service/impl/KyTaskInfoNewServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfoNew.entity.KyTaskInfoNew;
 import org.jeecg.modules.kyTaskInfoNew.listener.KyTaskInfoNewListener;
 import org.jeecg.modules.kyTaskInfoNew.mapper.KyTaskInfoNewMapper;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * @Description: ky_task_info_new
@@ -44,4 +46,145 @@ public class KyTaskInfoNewServiceImpl extends ServiceImpl<KyTaskInfoNewMapper, K
 
         return Result.ok();
     }
+
+    /**
+     * 根据任务号查科研任务的业务员和下达部门
+     */
+    @Override
+    public KyTaskInfo getKyTaskInfoByTaskno(String taskno) {
+        return kyTaskInfoNewMapper.getKyTaskInfoByTaskno(taskno);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按年查询
+     */
+    @Override
+    public List<String> getKyTaskNoByNameCurrYear(String depName) {
+        return kyTaskInfoNewMapper.getKyTaskNoByNameCurrYear(depName);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上一年年查询
+     */
+    @Override
+    public List<String> getKyTaskNoByNameLastYear(String depName) {
+        return kyTaskInfoNewMapper.getKyTaskNoByNameLastYear(depName);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按当月查询
+     */
+    @Override
+    public List<String> getKyTaskNoByNameCurrMonth(String depName) {
+        return kyTaskInfoNewMapper.getKyTaskNoByNameCurrMonth(depName);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按上个月查询
+     */
+    @Override
+    public List<String> getKyTaskNoByNameLastMonth(String depName) {
+        return kyTaskInfoNewMapper.getKyTaskNoByNameLastMonth(depName);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  此处按去年同期月份查询
+     */
+    @Override
+    public List<String> getKyTaskNoByNameTqMonth(String depName) {
+        return kyTaskInfoNewMapper.getKyTaskNoByNameTqMonth(depName);
+    }
+
+    /**
+     * 根据实际完成时间查询任务号    此处按年查询
+     */
+    @Override
+    public List<String> getKyTaskNoByCurrYear() {
+        return kyTaskInfoNewMapper.getKyTaskNoByCurrYear();
+    }
+
+    /**
+     * 根据实际完成时间查询任务号  此处按上一年查询
+     */
+    @Override
+    public List<String> getKyTaskNoByLastYear() {
+        return kyTaskInfoNewMapper.getKyTaskNoByLastYear();
+    }
+
+    /**
+     * 根据实际完成时间查询任务号    此处按当月查询
+     */
+    @Override
+    public List<String> getKyTaskNoByCurrMonth() {
+        return kyTaskInfoNewMapper.getKyTaskNoByCurrMonth();
+    }
+
+    /**
+     * 根据实际完成时间查询任务号  此处按上个月查询
+     */
+    @Override
+    public List<String> getKyTaskNoByLastMonth() {
+        return kyTaskInfoNewMapper.getKyTaskNoByLastMonth();
+    }
+
+    /**
+     * 根据实际完成时间查询任务号  此处按去年同期月份查询
+     */
+    @Override
+    public List<String> getKyTaskNoByTqMonth() {
+        return kyTaskInfoNewMapper.getKyTaskNoByTqMonth();
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按年查询（随便某一年的数据）
+     */
+    @Override
+    public List<String> getKyTaskNoByYear(String depName, String year) {
+        return kyTaskInfoNewMapper.getKyTaskNoByYear(depName, year);
+    }
+
+    /**
+     * 根据部门名称和实际完成时间查询任务号  @param depName 部门名称  按月查询（随便某一年某个月的数据） ym形式如2023-09
+     */
+    @Override
+    public List<String> getKyTaskNoByMonth(String depName, String ym) {
+        return kyTaskInfoNewMapper.getKyTaskNoByMonth(depName, ym);
+    }
+
+    /**
+     * 根据实际完成时间查询任务号  按年查询（随便某一年的数据）
+     */
+    @Override
+    public List<String> getKyTaskNoByYear2(String year) {
+        return kyTaskInfoNewMapper.getKyTaskNoByYear2(year);
+    }
+
+    /**
+     * 根据实际完成时间查询任务号  按月查询（随便某一年某个月的数据） ym形式如2023-09
+     */
+    @Override
+    public List<String> getKyTaskNoByMonth2(String ym) {
+        return kyTaskInfoNewMapper.getKyTaskNoByMonth2(ym);
+    }
+
+    @Override
+    public Long getTaskYzslByTaskno(String taskno) {
+        return kyTaskInfoNewMapper.getTaskYzslByTaskno(taskno);
+    }
+
+    @Override
+    public String getPcCodeByTaskno(String taskno) {
+        return kyTaskInfoNewMapper.getPcCodeByTaskno(taskno);
+    }
+
+    @Override
+    public boolean hasPcCode(String taskNo) {
+        String pcCode = kyTaskInfoNewMapper.getPcCodeByTaskno(taskNo);
+        return pcCode != null && !pcCode.isEmpty();
+    }
+
+    @Override
+    public Long getPcCodeTaskYzslByTaskno(String taskno) {
+        return kyTaskInfoNewMapper.getPcCodeTaskYzslByTaskno(taskno);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/xml/ProjectCostMapper.xml

@@ -77,7 +77,7 @@
                 SELECT
                     taskno
                 FROM
-                    ky_task_info
+                    ky_task_info_new
                 WHERE
                     zrbm in
                 <foreach item='item' index='index' collection='departList' open='(' separator=',' close=')'>
@@ -102,7 +102,7 @@
         SELECT
         taskno
         FROM
-        ky_task_info
+        ky_task_info_new
         WHERE
         jycs in
         <foreach item='item' index='index' collection='departList' open='(' separator=',' close=')'>
@@ -126,7 +126,7 @@
         SELECT
         taskno
         FROM
-        ky_task_info
+        ky_task_info_new
         WHERE
         zrbm in
         <foreach item='item' index='index' collection='departList' open='(' separator=',' close=')'>

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -250,6 +250,7 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
                             for (ProjectCostHuijiExportVO data : list) {
                                 List<ProjectCostHuijiExportVO> rList = huijiMapper.costListByTaskNoSubTwoNew(data.getTaskno());
                                 resultList.add(data);
+                                redisUtil.set(CacheKey.INCOME_DATA_REDIS_KEY,resultList);
                                 resultList.addAll(rList);
                             }
                             return resultList;

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -15,6 +15,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.Index.util.CacheKey;
 import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
+import org.jeecg.modules.kyTaskInfoNew.service.IKyTaskInfoNewService;
 import org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderBService;
@@ -58,6 +59,10 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
     @Autowired
     private IKyTaskInfoService kyTaskInfoService;
 
+    @Autowired
+    @SuppressWarnings("all")
+    private IKyTaskInfoNewService kyTaskInfoNewService;
+
     /**
      * 导出材料费详情excel
      */
@@ -144,9 +149,12 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                 }
                 List<CLfCompareDO> Dos;
                 if (hasPcCode) {
-                    Long taskYzsl = kyTaskInfoService.getTaskYzslByTaskno(split[0]);
-                    String pcCode = kyTaskInfoService.getPcCodeByTaskno(split[0]);
-                    Long pcCodeTaskYzsl = kyTaskInfoService.getTaskYzslByTaskno(pcCode);
+                    //Long taskYzsl = kyTaskInfoService.getTaskYzslByTaskno(split[0]);
+                    Long taskYzsl = kyTaskInfoNewService.getTaskYzslByTaskno(split[0]);
+                    //String pcCode = kyTaskInfoService.getPcCodeByTaskno(split[0]);
+                    String pcCode = kyTaskInfoNewService.getPcCodeByTaskno(split[0]);
+                    //Long pcCodeTaskYzsl = kyTaskInfoService.getTaskYzslByTaskno(pcCode);
+                    Long pcCodeTaskYzsl = kyTaskInfoNewService.getTaskYzslByTaskno(pcCode);
                     double proportion;
                     if (taskYzsl != 0 && pcCodeTaskYzsl != 0) {
                         proportion = (double) taskYzsl / pcCodeTaskYzsl;

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderHServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource
+//@TargetDataSource    //采集的物资数据表需要切换数据源；导入的物资数据表不能切换数据源
 public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMapper, WzOutboundOrderH> implements IWzOutboundOrderHService {
 
     @Autowired
@@ -86,14 +86,14 @@ public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMap
 
     @Override
     public List<CLfCompareDO> getCLFCompareDoListByTaskNoList(String tasknos) {
-        //return hMapper.getCLFCompareDoListByTaskNoList(tasknos);
-        return orderBNewMapper.getCLFCompareDoListByTaskNoList(tasknos);
+        //return hMapper.getCLFCompareDoListByTaskNoList(tasknos);  // 采集的物资数据表
+        return orderBNewMapper.getCLFCompareDoListByTaskNoList(tasknos); // 导入的物资数据表
     }
 
     @Override
     public List<WzOutboundOrderBDetailListVO> getClfList(String taskno) {
-        //return hMapper.getClfList(taskno);
-        return orderBNewMapper.getClfList(taskno);
+        //return hMapper.getClfList(taskno); // 采集的物资数据表
+        return orderBNewMapper.getClfList(taskno); // 导入的物资数据表
     }
 
     @Override

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/xml/WzOutboundOrderBNewMapper.xml

@@ -62,12 +62,12 @@
                            je
                     FROM wz_outbound_order_b_new
                     WHERE tcrwh IN ( select pcCode
-                                    from ky_task_info
+                                    from ky_task_info_new
                                     where taskno = #{taskno}
                                     UNION all
                                     SELECT taskno
-                                    from ky_task_info
-                                    where refTaskNo in (select pcCode from ky_task_info where taskno = #{taskno}))
+                                    from ky_task_info_new
+                                    where refTaskNo in (select pcCode from ky_task_info_new where taskno = #{taskno}))
                     ) a
               GROUP BY a.wlbm,
                        a.wlmc,

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/service/impl/WzOutboundOrderBNewServiceImpl.java

@@ -69,79 +69,15 @@ public class WzOutboundOrderBNewServiceImpl extends ServiceImpl<WzOutboundOrderB
         return Result.ok();
     }
 
-
-//    @Override
-//    public Result<?> importExcelNew(String strUrl, Class<WzOutboundOrderBNew> clazz) throws IOException {
-//        int year = DateUtils.getYear();
-//        orderBNewMapper.deleteByDate(year);
-//
-//        File file = new File(strUrl);
-//        Workbook workbook = WorkbookFactory.create(file);
-//        int numOfSheets = workbook.getNumberOfSheets();//获取有多少表
-//        System.out.println("numOfSheets:" + numOfSheets);
-//        //开表的个数 个线程分别处理这些sheet
-//        List<Callable<Object>> tasks = new ArrayList<>();
-//        for(int i=0;i<numOfSheets;i++){
-//            int num = i;
-//            tasks.add(()->{
-//                EasyExcel.read(new File(strUrl), clazz, new WzOutboundOrderBNewListerner(this)).sheet(num).doRead();
-//                return null;
-//            });
-//        }
-//
-//        try {
-//            executorService.invokeAll(tasks);
-//        } catch (InterruptedException e) {
-//            throw new RuntimeException(e);
-//        }
-//
-//        return Result.ok("文件导入成功！");
-//    }
-
     @Override
     public Result<?> importExcelNew(String strUrl, Class<WzOutboundOrderBNew> clazz) throws IOException {
-//        InputStream inputStream = null;
-//        try {
-//            inputStream = new FileInputStream(strUrl);
-//        } catch (FileNotFoundException e) {
-//            e.printStackTrace();
-//        }
-//        EasyExcel.read(inputStream, clazz , new WzOutboundOrderBNewListerner())
-//                .sheet(0)//指定读取哪个sheet
-//                .headRowNumber(2)//指定标题行(需要)
-//                .doRead();//执行读取
-
-//        EasyExcel.read(strUrl, clazz, new WzOutboundOrderBNewListerner(this)).sheet().doRead();
-
-//        InputStream in = null;
-//        try {
-//            in = new BufferedInputStream(new FileInputStream(strUrl));
-//        } catch (FileNotFoundException e) {
-//            e.printStackTrace();
-//        }
-
         int year = DateUtils.getYear();
         orderBNewMapper.deleteByDate(year);
-
-//        File file = new File(strUrl);
-//
-//        Workbook workbook = WorkbookFactory.create(file);
-//        int numberOfSheets = workbook.getNumberOfSheets();
-
-
         ExcelReader excelReader = EasyExcel.read(new File(strUrl), clazz, new WzOutboundOrderBNewListerner(this, webSocket)).build();
         ReadSheet readSheet = EasyExcel.readSheet(0).build();
         excelReader.read(readSheet);
         //这里千万别忘记关闭，读的时候会创建临时文件，到时磁盘会崩的
         excelReader.finish();
-//
-//        for(int i=0;i<numberOfSheets;i++){
-//            ReadSheet readSheet = EasyExcel.readSheet(i).build();
-//            excelReader.read(readSheet);
-//        }
-//        //这里千万别忘记关闭，读的时候会创建临时文件，到时磁盘会崩的
-//        excelReader.finish();
-
         return Result.ok("文件导入成功！");
     }
 

module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/entity/ComContractInfoExchange.java

@@ -31,7 +31,7 @@ public class ComContractInfoExchange implements Serializable {
 	/**主键.主键，自增*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键.主键，自增")
-    private java.lang.Integer id;
+    private java.lang.String id;
 	/**备注.*/
 	@Excel(name = "备注.", width = 15)
     @ApiModelProperty(value = "备注.")

module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/mapper/xml/ComContractInfoExchangeMapper.xml

@@ -181,7 +181,7 @@
     <select id="getReceivedByYear2" resultType="org.jeecg.modules.Index.entity.pojo.ReceivedByDate">
         select year(a.dkhpdqrq) as date,sum(a.rwskje) as received from com_contract_info_exchange a
         where YEAR(a.dkhpdqrq) BETWEEN #{beginDate} and #{endDate}
-        and (a.rwbh in(select taskno from ky_task_info where zrbm in (
+        and (a.rwbh in(select taskno from ky_task_info_new where zrbm in (
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
             #{item}
         </foreach>
@@ -199,7 +199,7 @@
         from com_contract_info_exchange a
         where CONCAT(year(a.dkhpdqrq), "-", LPAD(month(a.dkhpdqrq), 2, "0")) <![CDATA[ <= ]]> #{endDate}
         and CONCAT(year(a.dkhpdqrq), "-", LPAD(month(a.dkhpdqrq), 2, "0")) <![CDATA[ >= ]]> #{beginDate}
-        and (a.rwbh in(select taskno from ky_task_info where zrbm in (
+        and (a.rwbh in(select taskno from ky_task_info_new where zrbm in (
         <foreach item='item' index='index' collection='departNames' open='(' separator=',' close=')'>
             #{item}
         </foreach>