210计量本期计量

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -3303,11 +3303,12 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
             }
             Cell c5 = getCellByAddress(sheet, "C5");
-            if (periodId==1890367903054798850L){
-                c5.setCellValue("933212");
-            }else {
+//            if (periodId==1890367903054798850L){
+//                c5.setCellValue("933212");
+//            }
+//            else {
                 c5.setCellValue(lastEndChangeMoney == null ? "0" : lastEndChangeMoney.toString());
-            }
+ //           }
             //------------------------------------------------------------本期变更------------------------------------------------------------
             //获取当前合同段的所有已审批并且已下达的变更令
             /*String sql4 = "SELECT id,change_money,change_approval_date from s_change_token_form where contract_id = '"+contractId +"' and approve_status = 2 and command_status = 1 and is_deleted = 0";
@@ -3345,13 +3346,14 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 item.setCurrentPeriodEndPay(lastEndChangeMoney.add(changemoneySum).toString());
                 interimPayCertificateItemClient.updateInterimPayCertificateItem1(item);
             }
-            if(periodId==1890367903054798850L){
-                e5.setCellValue("515977");
-            } else if (periodId==1963802568671502338L) {
+//            if(periodId==1890367903054798850L){
+//                e5.setCellValue("515977");
+//            }
+             if (periodId==1963802568671502338L) {
                 e5.setCellValue("1496852");
-            } else {
+             } else {
                 e5.setCellValue(changemoneySum.toString());
-            }
+             }
 
             //------------------------------------------------------------本期末累计变更------------------------------------------------------------
             //上期末累计变更+本期变更

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/InterimPayCertificateItemServiceImpl.java

@@ -142,8 +142,8 @@ public class InterimPayCertificateItemServiceImpl extends BaseServiceImpl<Interi
                 InterimPayCertificateItem item = new InterimPayCertificateItem();
                 item.setCertificateId(reportId);
                 item.setSort(100);
-                item.setFormName(vo.getChapterSeq());
-                item.setChapterSeq(vo.getFormName());
+                item.setNoApply(1);
+                item.setChapterSeq(vo.getChapterSeq());
                 item.setContractAmount(vo.getCurrentMeterMoney() == null ? null : vo.getCurrentMeterMoney().toString());
                 item.setRevisedTotal(vo.getChangeMeterMoney() == null ? null : vo.getChangeMeterMoney().toString());
                 item.setRevisedAmount(vo.getAfterCurrentMeterMoney() == null ? null : vo.getAfterCurrentMeterMoney().toString());