unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsstoragesubsidysettle/mapper/mapping/FsStorageSubsidySettleMapper.xml

@@ -10,7 +10,7 @@
             sum(ROUND(qmkc/10000, 2)) AS qmkc
         FROM
             depot_qh.data_kcgl_kcyjd_default
-        where pz!=7144 and nf=#{Year} and UnitID=#{orgId}
+        where pz!=7144 and nf=#{year} and UnitID=#{orgId}
         GROUP BY
             nf,
             UnitID
@@ -24,7 +24,7 @@
         FROM
             province_all.biz_pss_storage_empty_period a
         left join depot_qh.business_rp_report b on a.rp_report_id =b.id and plan_type=1
-        where a.org_id=#{orgId} and a.plan_year =#{Year} and a.rotation_status=1
+        where a.org_id=#{orgId} and a.plan_year =#{year} and a.rotation_status=1
         GROUP BY a.org_id
 
     </select>
@@ -36,7 +36,7 @@
             sum(ROUND(qmkc/10000, 2)) AS qmkc
         FROM
             depot_qh.data_kcgl_kcyjd_default
-        where pz=7144 and nf=#{Year}
+        where pz=7144 and nf=#{year}
         GROUP BY
             nf,
             UnitID

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsstoragesubsidysettle/service/impl/FsStorageSubsidySettleServiceImpl.java

@@ -14,12 +14,14 @@ package com.unis.financialSupervision.modular.fsstoragesubsidysettle.service.imp
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qcloud.cos.utils.DateUtils;
 import com.unis.rotationPlan.info.modular.rpWarnThreshold.mapper.RpWarnThresholdMapper;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,9 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.Year;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -112,16 +117,23 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
     /**
      * 定时添加保管费用补贴清算表
      */
+    @Transactional
     @Override
     public void addFsStorageSubsidySettle() {
         int year = LocalDate.now().getYear();
+        Year PlayYear = Year.of(year);
 
         LocalDate today = LocalDate.now();
 
         // 获取当前月份
         int ys = today.getMonthValue();
+        QueryWrapper<FsStorageSubsidySettle> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(FsStorageSubsidySettle::getPlanYear,PlayYear);
+        List<FsStorageSubsidySettle> subsidySettles = this.list(queryWrapper);
+         if(subsidySettles.size()>0){
+             this.removeByIds(subsidySettles);
+         }
         //查询data_kcgl_kcyjd_default单位
-
         List<Map<String, Object>> listOrg = fsStorageSubsidySettleMapper.selectOrgInfo();
 
         for (int i = 0; i < listOrg.size(); i++) {
@@ -136,6 +148,7 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
             BigDecimal averageRawGrainInventoryEmpty = new BigDecimal(0.0);/** 储备粮-原粮平均库存数量-平均正常轮空期内轮空数量 */
             BigDecimal averageRawGrainInventory = new BigDecimal(0.00);    /** 储备粮-原粮平均库存数量-小计 */
             BigDecimal averageRawGrainInventoryPhysical = new BigDecimal(0.0);/** 储备粮-原粮平均库存数量-平均月末实物库存 */
+
             List<Map<String, Object>> listyy = fsStorageSubsidySettleMapper.getOrgAndKcSum(year,orgId);
             for (int j = 0; j < listyy.size(); j++) {
                 Map<String, Object> map = listyy.get(j);
@@ -150,8 +163,9 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
                 if (ys != 0) {
                     averageRawGrainInventoryPhysical = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
                 }
+                averageRawGrainInventoryPhysical = (averageRawGrainInventoryPhysical != null) ? averageRawGrainInventoryPhysical :new BigDecimal(0.00) ;
 
-                fsStorageSubsidySettle.setAverageInventory(averageRawGrainInventoryPhysical); //平均月末实物库存
+                fsStorageSubsidySettle.setAverageRawGrainInventoryPhysical(averageRawGrainInventoryPhysical); //平均月末实物库存
 
                 //根据单位 和 日期 查询架空期
                 Map<String, Object> staetAndEnd = fsStorageSubsidySettleMapper.getStaetAndEnd(orgId, year);
@@ -163,12 +177,18 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
                 if (ys != 0) {
                     averageRawGrainInventoryEmpty = quantity.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
                 }
+                averageRawGrainInventoryEmpty = (averageRawGrainInventoryEmpty != null) ? averageRawGrainInventoryEmpty :new BigDecimal(0.00) ;
+
                 fsStorageSubsidySettle.setAverageRawGrainInventoryEmpty(averageRawGrainInventoryEmpty);//平均正常轮空期内轮空数量
                 averageRawGrainInventory = averageRawGrainInventoryPhysical.add(averageRawGrainInventoryEmpty);
-                averageRawGrainInventory = averageRawGrainInventory.multiply(new BigDecimal("0.2"));
+               // averageRawGrainInventory = averageRawGrainInventory.multiply(new BigDecimal("0.2"));
+                fsStorageSubsidySettle.setAverageRawGrainInventory(averageRawGrainInventory);//(1)
+            }
+            if(listyy.isEmpty()){
+                fsStorageSubsidySettle.setAverageRawGrainInventoryPhysical(averageRawGrainInventoryPhysical);
+                fsStorageSubsidySettle.setAverageRawGrainInventoryEmpty(averageRawGrainInventoryEmpty);
                 fsStorageSubsidySettle.setAverageRawGrainInventory(averageRawGrainInventory);//(1)
             }
-
 
 
             /**
@@ -182,42 +202,75 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
             BigDecimal sjsysl = new BigDecimal(0.0);
             for (int j1 = 0; j1 < list1.size(); j1++) {
                 Map<String, Object> map1 = list1.get(j1);
-                LocalDateTime firstTime = (LocalDateTime) map1.getOrDefault("startTime", LocalDateTime.now()); //第一车出库时间
-                LocalDateTime firstDayOfNextMonth = firstTime.plusMonths(1).withDayOfMonth(1);
-                LocalDateTime futureDate = firstDayOfNextMonth.plusMonths(4);
-                LocalDateTime endTime = (LocalDateTime) map1.get("endTime");
-                if (endTime != null && endTime.isBefore(futureDate)) {
-                    BigDecimal wcsl = (BigDecimal) map1.getOrDefault("wcsl", BigDecimal.ZERO);
-                    sjlcsl = sjlcsl.add(wcsl);
-                    BigDecimal sysl = (BigDecimal) map1.getOrDefault("sysl", BigDecimal.ZERO);
-                    sjsysl = sjsysl.add(sysl);
+                Object startTimeObj = map1.get("startTime");
+                Date firstTime;
+                if (startTimeObj == null || startTimeObj.toString().isEmpty()) {
+                    firstTime = new Date(); // 设置默认值为当前日期
+                } else {
+                    firstTime = DateUtil.parseDate(startTimeObj.toString());
+                } // 第一车出库时间
+                Date endTime;
+                // 检查 firstTime 不为 null
+                if (firstTime != null) {
+                    LocalDateTime localDateTime = firstTime.toInstant()
+                            .atZone(ZoneId.systemDefault())
+                            .toLocalDateTime();
+                    LocalDateTime firstDayOfNextMonth = localDateTime.plusMonths(1).withDayOfMonth(1);
+                    LocalDateTime futureDate = firstDayOfNextMonth.plusMonths(4);
+                    Object endTimeObj = map1.get("endTime");
+                    if (endTimeObj == null || endTimeObj.toString().isEmpty()) {
+                        endTime = new Date(); // 设置默认值为当前日期
+                    } else {
+                        endTime = DateUtil.parseDate(endTimeObj.toString());
+                    }
+
+                    // 检查 endTime 不为 null
+                    if (endTime != null) {
+                        LocalDateTime endTime1 = endTime.toInstant()
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+
+                        // 先确保 endTime 不为 null，然后进行比较
+                        if (endTime1.isBefore(futureDate)) {
+                            BigDecimal wcsl = (BigDecimal) map1.getOrDefault("wcsl", BigDecimal.ZERO);
+                            sjlcsl = sjlcsl.add(wcsl);
+                            BigDecimal sysl = (BigDecimal) map1.getOrDefault("sysl", BigDecimal.ZERO);
+                            sjsysl = sjsysl.add(sysl);
+                        }
+                    }
                 }
-
             }
             if (ys != 0) {
                 averageProcessedGrainInventoryEmpty = sjlcsl.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
             }
+            averageProcessedGrainInventoryEmpty = (averageProcessedGrainInventoryEmpty != null) ? averageProcessedGrainInventoryEmpty :new BigDecimal(0.00) ;
+
+
             fsStorageSubsidySettle.setAverageProcessedGrainInventoryEmpty(averageProcessedGrainInventoryEmpty);/** 储备粮-成品粮平均库存数量-平均正常轮空期内轮空数量 */
 
             BigDecimal averageProcessedGrainInventoryPhysical = new BigDecimal(0.0); /** 储备粮-成品粮平均库存数量-平均月末实物库存 */
             if (ys != 0) {
                 averageProcessedGrainInventoryPhysical = sjsysl.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
             }
+            averageProcessedGrainInventoryPhysical = (averageProcessedGrainInventoryPhysical != null) ? averageProcessedGrainInventoryPhysical :new BigDecimal(0.00) ;
+
             fsStorageSubsidySettle.setAverageProcessedGrainInventoryPhysical(averageProcessedGrainInventoryPhysical);/** 储备粮-成品粮平均库存数量-平均月末实物库存 */
 
             BigDecimal averageProcessedGrainInventory = new BigDecimal(0.0);//(2)  /** 储备粮-成品粮平均库存数量-小计 */
+            averageProcessedGrainInventory=averageProcessedGrainInventoryPhysical.add(averageProcessedGrainInventory);
+            fsStorageSubsidySettle.setAverageProcessedGrainInventory(averageProcessedGrainInventory); /** (2)储备粮-成品粮平均库存数量-小计 */
 
 
             BigDecimal averageInventory = new BigDecimal(0.0);/** 储备粮平均库存数量 */
-            averageInventory = averageRawGrainInventory.add(averageProcessedGrainInventoryEmpty);
-            fsStorageSubsidySettle.setAverageOilInventory(averageInventory);//(1)+(2)
+            averageInventory = averageProcessedGrainInventory.add(averageRawGrainInventory);
+            fsStorageSubsidySettle.setAverageInventory(averageInventory);//(1)+(2)
 
             /**
              * 保管费用补贴
              */
             BigDecimal storageSubsidyStandardRawGrain = new BigDecimal(0.0);//(1) /** 储备粮-原粮保管费用补贴（标准：0.12元/公斤）应拨数 */
             storageSubsidyStandardRawGrain = averageRawGrainInventory.multiply(new BigDecimal("0.12"));//单位：万元
-            fsStorageSubsidySettle.setStorageSubsidyRawGrain(storageSubsidyStandardRawGrain);
+            fsStorageSubsidySettle.setStorageSubsidyStandardRawGrain(storageSubsidyStandardRawGrain);
 
             BigDecimal storageSubsidyProcessedGrain = new BigDecimal(0.0);/** 储备粮-成品粮保管费用补贴（标准：0.20元/公斤）应拨数 */
             storageSubsidyProcessedGrain = averageProcessedGrainInventory.multiply(new BigDecimal("0.20"));//单位：万元
@@ -233,6 +286,8 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
             BigDecimal averageOilInventoryPhysical = new BigDecimal(0.0);/** 储备油-储油平均库存数量-平均月末实物库存 */
             BigDecimal averageOilInventoryEmpty = new BigDecimal(0.0);/** 储备油-储油平均库存数量-平均正常轮空期内轮空数量 */
             BigDecimal averageOilInventory = new BigDecimal(0.0);/** 储备油-储油平均库存数量-小计 */
+
+            BigDecimal storageSubsidyOil = new BigDecimal(0.0);/** 储备油-油料保管费用补贴（标准：0.40元/公斤）应拨数 */
             List<Map<String, Object>> list2 = fsStorageSubsidySettleMapper.getOrgAndYlKcSum(year, orgId);
             for (int j2 = 0; j2< list2.size(); j2++) {
                 Map<String, Object> mapy = listyy.get(j2);
@@ -246,27 +301,41 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
                 if (ys != 0) {
                     averageOilInventoryPhysical = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
                 }
+                averageOilInventoryPhysical = (averageOilInventoryPhysical != null) ? averageOilInventoryPhysical :new BigDecimal(0.00) ;
 
                 fsStorageSubsidySettle.setAverageOilInventoryPhysical(averageOilInventoryPhysical); //平均月末实物库存
 
                 //根据单位 和 日期 查询架空期
                 Map<String, Object> staetAndEnd = fsStorageSubsidySettleMapper.getStaetAndEnd(orgId, year);
-                LocalDateTime startTime = (LocalDateTime) mapy.getOrDefault("rotationStart", LocalDateTime.now()); //开始时间
-                LocalDateTime endTime = (LocalDateTime) mapy.getOrDefault("rotationEnd", LocalDateTime.now()); //截至时间
+//                LocalDateTime startTime = (LocalDateTime) mapy.getOrDefault("rotationStart", LocalDateTime.now()); //开始时间
+//                LocalDateTime endTime = (LocalDateTime) mapy.getOrDefault("rotationEnd", LocalDateTime.now()); //截至时间
                 // 获取 quantity 的值，如果没有则默认为 0.0
                 BigDecimal quantity = NumberUtil.toBigDecimal(mapy.getOrDefault("quantity", "0.0").toString());
 
                 if (ys != 0) {
                     averageOilInventoryEmpty = quantity.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
                 }
+                averageOilInventoryEmpty = (averageOilInventoryEmpty != null) ? averageOilInventoryEmpty :new BigDecimal(0.00) ;
+
                 fsStorageSubsidySettle.setAverageOilInventoryEmpty(averageOilInventoryEmpty);//平均正常轮空期内轮空数量
                 averageOilInventory = averageOilInventoryPhysical.add(averageOilInventoryEmpty);
+                fsStorageSubsidySettle.setAverageOilInventory(averageOilInventory);
 
-                BigDecimal storageSubsidyOil = new BigDecimal(0.0);/** 储备油-油料保管费用补贴（标准：0.40元/公斤）应拨数 */
-                storageSubsidyOil = averageOilInventory.multiply(new BigDecimal("0.2"));
+                storageSubsidyOil = averageOilInventory.multiply(new BigDecimal("0.4"));
                 fsStorageSubsidySettle.setStorageSubsidyOil(storageSubsidyOil);//(5)
 
+
+            }
+            if(list2.isEmpty()){
+                fsStorageSubsidySettle.setAverageOilInventoryPhysical(averageOilInventoryPhysical); //平均月末实物库存
+                fsStorageSubsidySettle.setAverageOilInventoryEmpty(averageOilInventoryEmpty);//平均正常轮空期内轮空数量
+                fsStorageSubsidySettle.setAverageOilInventory(averageOilInventory);
+                fsStorageSubsidySettle.setStorageSubsidyOil(storageSubsidyOil);//(5)
             }
+            fsStorageSubsidySettle.setOrgId(Integer.parseInt(orgId));
+
+
+            fsStorageSubsidySettle.setPlanYear(PlayYear);
             this.save(fsStorageSubsidySettle);
         }
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpWarnThreshold/mapper/mapping/RpWarnThresholdMapper.xml

@@ -209,7 +209,7 @@
             depot_qh.business_pg_gops_plan
 
         WHERE
-            org_id=#{orgId} and YEAR(plan_year)=#{year} and plan_type=1
+            org_id=#{orgId} and YEAR(plan_start_time)=#{year} and plan_type=1
     </select>
 
 </mapper>