领导驾驶舱支出模块增加删选费

module_kzks/src/main/java/org/jeecg/modules/Index/entity/vo/EightCosts.java

@@ -36,4 +36,6 @@ public class EightCosts implements Serializable {
     private BigDecimal gzjlwf;
     /** 管理费 */
     private BigDecimal glf;
+    /** 管理费 */
+    private BigDecimal sxf;
 }

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

@@ -126,7 +126,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -143,7 +144,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -164,7 +166,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -174,18 +177,19 @@
     <!-- 查询规定时间段内(年月)的 材料费、专用费、事务费、外协费、燃料动力费、固定资产折旧费、工资及劳务费、管理费 之和 根据部门 -->
     <select id="getDepartSumEightCostByYearMonth" resultMap="EigthCostList">
         SELECT
-            sum( clf ) AS clf,
-            sum( zyf ) AS zyf,
-            sum( swf ) AS swf,
-            sum( wxf ) AS wxf,
-            sum( rldlf ) AS rldlf,
-            sum( gdzczj ) AS gdzczj,
-            sum( gzjlwf ) AS gzjlwf,
-            sum( glf ) AS glf
+        sum( clf ) AS clf,
+        sum( zyf ) AS zyf,
+        sum( swf ) AS swf,
+        sum( wxf ) AS wxf,
+        sum( rldlf ) AS rldlf,
+        sum( gdzczj ) AS gdzczj,
+        sum( gzjlwf ) AS gzjlwf,
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
-            kzks_project_cost_cb
+        kzks_project_cost_cb
         WHERE
-            yearmonth >= #{startDate} AND yearmonth <![CDATA[ <= ]]>  #{endDate}
+        yearmonth >= #{startDate} AND yearmonth <![CDATA[ <= ]]>  #{endDate}
         AND zrbm IN
         <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
             #{item}
@@ -206,7 +210,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -225,7 +230,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -278,7 +284,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -299,7 +306,8 @@
         sum( rldlf ) AS rldlf,
         sum( gdzczj ) AS gdzczj,
         sum( gzjlwf ) AS gzjlwf,
-        sum( glf ) AS glf
+        sum( glf ) AS glf,
+        sum( sxf ) AS sxf
         FROM
         kzks_project_cost_cb
         WHERE
@@ -339,4 +347,4 @@
     </select>
 
 
-</mapper>
+</mapper>

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

@@ -379,6 +379,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
         ArrayList<BigDecimal> gdzczjList = new ArrayList<>();//各个年、月固资费集合
         ArrayList<BigDecimal> gzjlwfList = new ArrayList<>();//各个年、月工资费集合
         ArrayList<BigDecimal> glfList = new ArrayList<>();  // 各个年、月管理费集合
+        ArrayList<BigDecimal> sxfList = new ArrayList<>();  // 各个年、月筛选费集合
         ResuliEightCostvo r1 = new ResuliEightCostvo();  // 材料费对象
         r1.setName("clf");
         ResuliEightCostvo r2 = new ResuliEightCostvo();  // 专用费对象
@@ -395,6 +396,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
         r7.setName("gzjlwf");
         ResuliEightCostvo r8 = new ResuliEightCostvo();  // 管理费对象
         r8.setName("glf");
+        ResuliEightCostvo r9 = new ResuliEightCostvo();  // 筛选费费对象
+        r9.setName("sxf");
         // 如果前端传递过来的标记是 按年统计 则获取日期范围内所有的年份，遍历集合 分别查询各个年份下的总成本的和
         if ("year".equals(indexInfoParamDto.getTime())){
             Date beginDate = null;
@@ -436,8 +439,9 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(costList.get(i).getGdzczj());
                         gzjlwfList.add(costList.get(i).getGzjlwf());
                         glfList.add(costList.get(i).getGlf());
+                        sxfList.add(costList.get(i).getSxf());
                         // 对应的总成本
-                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf());
+                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf()).add(costList.get(i).getSxf());
                         zcbSumValueList.add(sumZcbValue);
                         i++;
                     } else {  // 否则表示该年份在数据库中不存在，八项成本为0
@@ -449,6 +453,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(BigDecimal.valueOf(0));
                         gzjlwfList.add(BigDecimal.valueOf(0));
                         glfList.add(BigDecimal.valueOf(0));
+                        sxfList.add(BigDecimal.valueOf(0));
                         zcbSumValueList.add(BigDecimal.valueOf(0));
                     }
                 }
@@ -492,8 +497,9 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(costList.get(i).getGdzczj());
                         gzjlwfList.add(costList.get(i).getGzjlwf());
                         glfList.add(costList.get(i).getGlf());
+                        sxfList.add(costList.get(i).getSxf());
                         // 计算该年份的总成本
-                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf());
+                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf()).add(costList.get(i).getSxf());
                         zcbSumValueList.add(sumZcbValue);
                         i++;
                     }else {  // 如果不存在，则表示库中不存在该年份的数据，八项成本默认为0
@@ -505,6 +511,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(BigDecimal.valueOf(0));
                         gzjlwfList.add(BigDecimal.valueOf(0));
                         glfList.add(BigDecimal.valueOf(0));
+                        sxfList.add(BigDecimal.valueOf(0));
                         zcbSumValueList.add(BigDecimal.valueOf(0));
                     }
                 }
@@ -520,6 +527,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                     gdzczjList.add(BigDecimal.valueOf(0));
                     gzjlwfList.add(BigDecimal.valueOf(0));
                     glfList.add(BigDecimal.valueOf(0));
+                    sxfList.add(BigDecimal.valueOf(0));
                     zcbSumValueList.add(BigDecimal.valueOf(0));
                 }
             }
@@ -532,6 +540,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             r6.setValues(gdzczjList);
             r7.setValues(gzjlwfList);
             r8.setValues(glfList);
+            r9.setValues(sxfList);
             resuliEightCostvosList.add(r1);
             resuliEightCostvosList.add(r2);
             resuliEightCostvosList.add(r3);
@@ -540,6 +549,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             resuliEightCostvosList.add(r6);
             resuliEightCostvosList.add(r7);
             resuliEightCostvosList.add(r8);
+            resuliEightCostvosList.add(r9);
 
             //indexChartInfoVo.setSeriesData(resuliEightCostvosList);
             //indexChartInfoVo.setXAxisData(yearList);
@@ -594,7 +604,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(costList.get(i).getGdzczj());
                         gzjlwfList.add(costList.get(i).getGzjlwf());
                         glfList.add(costList.get(i).getGlf());
-                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf());
+                        sxfList.add(costList.get(i).getSxf());
+                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf()).add(costList.get(i).getSxf());
                         zcbSumValueList.add(sumZcbValue);
                         i++;
                     }else {
@@ -606,6 +617,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(BigDecimal.valueOf(0));
                         gzjlwfList.add(BigDecimal.valueOf(0));
                         glfList.add(BigDecimal.valueOf(0));
+                        sxfList.add(BigDecimal.valueOf(0));
                         zcbSumValueList.add(BigDecimal.valueOf(0));
                     }
                     yearMonthList.add(yearsMonthI);
@@ -649,7 +661,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(costList.get(i).getGdzczj());
                         gzjlwfList.add(costList.get(i).getGzjlwf());
                         glfList.add(costList.get(i).getGlf());
-                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf());
+                        sxfList.add(costList.get(i).getSxf());
+                        BigDecimal sumZcbValue = costList.get(i).getClf().add(costList.get(i).getZyf()).add(costList.get(i).getSwf()).add(costList.get(i).getWxf()).add(costList.get(i).getRldlf()).add(costList.get(i).getGdzczj()).add(costList.get(i).getGzjlwf()).add(costList.get(i).getGlf()).add(costList.get(i).getSxf());
                         zcbSumValueList.add(sumZcbValue);
                         i++;
                     }else {
@@ -661,6 +674,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         gdzczjList.add(BigDecimal.valueOf(0));
                         gzjlwfList.add(BigDecimal.valueOf(0));
                         glfList.add(BigDecimal.valueOf(0));
+                        sxfList.add(BigDecimal.valueOf(0));
                         zcbSumValueList.add(BigDecimal.valueOf(0));
                     }
                     yearMonthList.add(yearsMonthI);
@@ -678,6 +692,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                     gdzczjList.add(BigDecimal.valueOf(0));
                     gzjlwfList.add(BigDecimal.valueOf(0));
                     glfList.add(BigDecimal.valueOf(0));
+                    sxfList.add(BigDecimal.valueOf(0));
                     zcbSumValueList.add(BigDecimal.valueOf(0));
                     yearMonthList.add(yearsMonthI);
                 }
@@ -692,6 +707,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             r6.setValues(gdzczjList);
             r7.setValues(gzjlwfList);
             r8.setValues(glfList);
+            r9.setValues(sxfList);
             resuliEightCostvosList.add(r1);
             resuliEightCostvosList.add(r2);
             resuliEightCostvosList.add(r3);
@@ -700,6 +716,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             resuliEightCostvosList.add(r6);
             resuliEightCostvosList.add(r7);
             resuliEightCostvosList.add(r8);
+            resuliEightCostvosList.add(r9);
 
 
             //indexChartInfoVo.setSeriesData(resuliEightCostvosList);
@@ -768,6 +785,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                 m.put("gdzczj",BigDecimal.valueOf(0));
                                 m.put("gzjlwf",BigDecimal.valueOf(0));
                                 m.put("glf",BigDecimal.valueOf(0));
+                                m.put("sxf",BigDecimal.valueOf(0));
                                 sumZcb = BigDecimal.valueOf(0);
                             } else {
                                 if (e.getClf() != null){
@@ -824,7 +842,13 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                     e.setGlf(BigDecimal.valueOf(0));
                                     m.put("glf",BigDecimal.valueOf(0));
                                 }
-                                sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf());
+                                if (!ObjectUtil.isEmpty(e.getSxf()) || e.getSxf() !=  null){
+                                    m.put("sxf",e.getSxf());
+                                }else {
+                                    e.setSxf(BigDecimal.valueOf(0));
+                                    m.put("sxf",BigDecimal.valueOf(0));
+                                }
+                                sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf()).add(e.getSxf());
                             }
                         }
                         Map<String, BigDecimal> sortedMap = m.entrySet()
@@ -857,6 +881,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         m.put("gdzczj",BigDecimal.valueOf(0));
                         m.put("gzjlwf",BigDecimal.valueOf(0));
                         m.put("glf",BigDecimal.valueOf(0));
+                        m.put("sxf",BigDecimal.valueOf(0));
 
                         Map<String, BigDecimal> sortedMap = m.entrySet()
                                 .stream()
@@ -901,6 +926,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                 m.put("gdzczj",BigDecimal.valueOf(0));
                                 m.put("gzjlwf",BigDecimal.valueOf(0));
                                 m.put("glf",BigDecimal.valueOf(0));
+                                m.put("sxf",BigDecimal.valueOf(0));
                                 sumZcb = BigDecimal.valueOf(0);
                             } else {
                                 if (e.getClf() != null){
@@ -924,7 +950,6 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                     m.put("swf",BigDecimal.valueOf(0));
                                 }
 
-
                                 if (!ObjectUtil.isEmpty(e.getWxf()) || e.getWxf() != null){
                                     m.put("wxf",e.getWxf());
                                 }else {
@@ -957,7 +982,13 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                     e.setGlf(BigDecimal.valueOf(0));
                                     m.put("glf",BigDecimal.valueOf(0));
                                 }
-                                sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf());
+                                if (!ObjectUtil.isEmpty(e.getSxf()) || e.getSxf() !=  null){
+                                    m.put("sxf",e.getSxf());
+                                }else {
+                                    e.setSxf(BigDecimal.valueOf(0));
+                                    m.put("sxf",BigDecimal.valueOf(0));
+                                }
+                                sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf()).add(e.getSxf());
                             }
                         }
                         Map<String, BigDecimal> sortedMap = m.entrySet()
@@ -990,6 +1021,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                         m.put("gdzczj",BigDecimal.valueOf(0));
                         m.put("gzjlwf",BigDecimal.valueOf(0));
                         m.put("glf",BigDecimal.valueOf(0));
+                        m.put("sxf",BigDecimal.valueOf(0));
 
                         Map<String, BigDecimal> sortedMap = m.entrySet()
                                 .stream()
@@ -1023,6 +1055,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                 m.put("gdzczj",BigDecimal.valueOf(0));
                 m.put("gzjlwf",BigDecimal.valueOf(0));
                 m.put("glf",BigDecimal.valueOf(0));
+                m.put("sxf",BigDecimal.valueOf(0));
 
                 Map<String, BigDecimal> sortedMap = m.entrySet()
                         .stream()
@@ -1061,6 +1094,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                             m.put("gdzczj",BigDecimal.valueOf(0));
                             m.put("gzjlwf",BigDecimal.valueOf(0));
                             m.put("glf",BigDecimal.valueOf(0));
+                            m.put("sxf",BigDecimal.valueOf(0));
                             sumZcb = BigDecimal.valueOf(0);
                         } else {
                             if (e.getClf() != null){
@@ -1117,7 +1151,13 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                 e.setGlf(BigDecimal.valueOf(0));
                                 m.put("glf",BigDecimal.valueOf(0));
                             }
-                            sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf());
+                            if (!ObjectUtil.isEmpty(e.getSxf()) || e.getSxf() !=  null){
+                                m.put("sxf",e.getSxf());
+                            }else {
+                                e.setSxf(BigDecimal.valueOf(0));
+                                m.put("sxf",BigDecimal.valueOf(0));
+                            }
+                            sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf()).add(e.getSxf());
                         }
 
                     }
@@ -1151,6 +1191,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                     m.put("gdzczj",BigDecimal.valueOf(0));
                     m.put("gzjlwf",BigDecimal.valueOf(0));
                     m.put("glf",BigDecimal.valueOf(0));
+                    m.put("sxf",BigDecimal.valueOf(0));
 
                     Map<String, BigDecimal> sortedMap = m.entrySet()
                             .stream()
@@ -1185,6 +1226,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                             m.put("gdzczj",BigDecimal.valueOf(0));
                             m.put("gzjlwf",BigDecimal.valueOf(0));
                             m.put("glf",BigDecimal.valueOf(0));
+                            m.put("sxf",BigDecimal.valueOf(0));
                             sumZcb = BigDecimal.valueOf(0);
                         } else {
                             if (e.getClf() != null){
@@ -1241,7 +1283,13 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                                 e.setGlf(BigDecimal.valueOf(0));
                                 m.put("glf",BigDecimal.valueOf(0));
                             }
-                            sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf());
+                            if (!ObjectUtil.isEmpty(e.getSxf()) || e.getSxf() !=  null){
+                                m.put("sxf",e.getSxf());
+                            }else {
+                                e.setSxf(BigDecimal.valueOf(0));
+                                m.put("sxf",BigDecimal.valueOf(0));
+                            }
+                            sumZcb = e.getClf().add(e.getZyf()).add(e.getSwf()).add(e.getWxf()).add(e.getRldlf()).add(e.getGdzczj()).add(e.getGzjlwf()).add(e.getGlf()).add(e.getSxf());
                         }
                     }
                     Map<String, BigDecimal> sortedMap = m.entrySet()
@@ -1274,6 +1322,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                     m.put("gdzczj",BigDecimal.valueOf(0));
                     m.put("gzjlwf",BigDecimal.valueOf(0));
                     m.put("glf",BigDecimal.valueOf(0));
+                    m.put("sxf",BigDecimal.valueOf(0));
 
                     Map<String, BigDecimal> sortedMap = m.entrySet()
                             .stream()
@@ -1301,6 +1350,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
                 m.put("gdzczj",BigDecimal.valueOf(0));
                 m.put("gzjlwf",BigDecimal.valueOf(0));
                 m.put("glf",BigDecimal.valueOf(0));
+                m.put("sxf",BigDecimal.valueOf(0));
 
                 Map<String, BigDecimal> sortedMap = m.entrySet()
                         .stream()

module_kzks/src/main/java/org/jeecg/modules/projectImportList/readListener/ProjectChbImportListener.java

@@ -28,6 +28,7 @@ import org.jeecg.modules.projectImportList.service.impl.ProjectImportListService
 import org.jeecg.modules.projectKmbh.entity.KzksProjectKmbh;
 import org.jeecg.modules.projectKmbh.service.IKzksProjectKmbhService;
 
+import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,9 +87,9 @@ public class ProjectChbImportListener extends AnalysisEventListener<ProjectChb>
     @Override
     public void invoke(ProjectChb projectChb, AnalysisContext analysisContext) {
         try {
-            String sheetName = analysisContext.readSheetHolder().getSheetName();
-            Integer rowIndex = analysisContext.readRowHolder().getRowIndex();
-            log.info("当前读的是{},第{}行", sheetName, rowIndex);
+            //String sheetName = analysisContext.readSheetHolder().getSheetName();
+            //Integer rowIndex = analysisContext.readRowHolder().getRowIndex();
+            //log.info("当前读的是{},第{}行", sheetName, rowIndex);
             String taskno = projectChb.getTaskno();
             String nd = projectChb.getNd();
             String kmbh = projectChb.getKmbh();
@@ -141,7 +142,7 @@ public class ProjectChbImportListener extends AnalysisEventListener<ProjectChb>
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         try {
-            log.info("一个sheet执行完毕");
+            log.info("{}执行完毕",analysisContext.readSheetHolder().getSheetName());
             int taskCount = ProjectImportListServiceImpl.taskCount;
             int ovTaskCount = overTaskCount.incrementAndGet();
             if (taskCount != ovTaskCount) return;
@@ -151,6 +152,7 @@ public class ProjectChbImportListener extends AnalysisEventListener<ProjectChb>
             throw new RuntimeException(e);
         }
         try {
+            log.info("开始数据入库");
             if (!swfDe.isEmpty()) {
                 for (String nd : swfDe) {
                     int counnt = swfService.getIfHaveThisNd(nd);
@@ -288,7 +290,7 @@ public class ProjectChbImportListener extends AnalysisEventListener<ProjectChb>
             }
             ProjectImportListServiceImpl.taskCount = 0;
             threadPoolExecutor.shutdown();
-            threadPoolExecutor.awaitTermination(5,TimeUnit.HOURS);
+            boolean b = threadPoolExecutor.awaitTermination(5, TimeUnit.HOURS);
             log.info("数据成功入库");
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
@@ -301,7 +303,7 @@ public class ProjectChbImportListener extends AnalysisEventListener<ProjectChb>
     public void initRedisCache() {
         List<KzksProjectKmbh> kmbhs = kmbhService.getAll();
         for (KzksProjectKmbh kmbh : kmbhs) {
-            redisUtil.hset(CacheKey.ND_KMBH_MONEY_TYPE + ":" + kmbh.getYear(), kmbh.getKemuNo(), kmbh.getMoneyType());
+            redisUtil.hset(CacheKey.ND_KMBH_MONEY_TYPE + ":" + kmbh.getYear(), kmbh.getKemuNo(), kmbh.getMoneyType(),60*120);
         }
     }
 

module_kzks/src/main/java/org/jeecg/modules/projectImportList/service/impl/ProjectImportListServiceImpl.java

@@ -75,6 +75,7 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
      * 对各个表进行新增
      */
     public Result<?> importExcel1(String strUrl, Class<ProjectChb> clazz) throws InterruptedException, ExecutionException, IOException {
+        long startTime = System.currentTimeMillis();
         File file = new File(strUrl);
         ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(8, 8, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<>(100));
         ThreadPoolExecutor poolExecutor = new ThreadPoolExecutor(8, 8, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<>(2000));
@@ -102,6 +103,8 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
         } finally {
             taskCount = 0;
         }
+        long endTime = System.currentTimeMillis();
+        log.info("导入项目费用花费时间:{}毫秒 | {}分钟", (endTime - startTime), ((endTime - startTime) / 1000 / 60));
         return Result.ok();
     }
 }

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/mapper/KzksProjectKmbhMapper.java

@@ -21,7 +21,7 @@ public interface KzksProjectKmbhMapper extends BaseMapper<KzksProjectKmbh> {
     public void updateByNdAndKmbh(String nd, String kmbh, String fylb);
 
     /**根据年度和科目编号查询费用类别*/
-    @Select("select money_type from kzks_project_kmbh where year = #{nd} and kemu_no = #{kmbh}")
+    @Select("select id from kzks_project_kmbh where year = #{nd} and kemu_no = #{kmbh}")
     public String getByNdAndKmbh(String nd, String kmbh);
 
     @Select("select money_type,year,kemu_no from kzks_project_kmbh")

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/service/impl/KzksProjectKmbhServiceImpl.java

@@ -59,8 +59,8 @@ public class KzksProjectKmbhServiceImpl extends ServiceImpl<KzksProjectKmbhMappe
             //确保年度和科目编号对应唯一一个费用类别，如果已经存在，更新对应的费用类别
             List<KzksProjectKmbh> list1 = new ArrayList<>();
             for(KzksProjectKmbh kmbh : list){
-                String fylb = this.getByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo());//费用类别
-                if(fylb!=null) kmbhMapper.updateByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo(),kmbh.getMoneyType());
+                String id = this.getByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo());//费用类别
+                if(id!=null) kmbhMapper.updateByNdAndKmbh(kmbh.getYear(), kmbh.getKemuNo(),kmbh.getMoneyType());
                 else list1.add(kmbh);
             }