fixed filling issues

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -308,7 +308,8 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
 
         ProjectServiceTypeExample projectServiceTypeExample = new ProjectServiceTypeExample();
         projectServiceTypeExample.createCriteria().andServiceTypeIDEqualTo(serviceTypeStr).andProjectIDEqualTo(projectId);
-        Optional<Long> templateGroupID = projectServiceTypeMapper.selectByExample(projectServiceTypeExample).stream().map(ProjectServiceType::getTemplateGroupID).findFirst();
+        Optional<Long> templateGroupID = projectServiceTypeMapper.selectByExample(projectServiceTypeExample).stream()
+                .map(ProjectServiceType::getTemplateGroupID).findFirst();
         if (templateGroupID == null) {
             operationResultDto.setResultMsg("TemplateGroupNotExist");
             return operationResultDto;
@@ -317,7 +318,11 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
         List<Long> templateIds;
         if (reportType != null) {
             PeriodTemplateExample periodTemplateExample = new PeriodTemplateExample();
-            periodTemplateExample.createCriteria().andTemplateGroupIdEqualTo(templateGroupID.get()).andPeriodEqualTo(period).andIsActiveAssociationEqualTo(true).andReportTypeEqualTo(reportType);
+            periodTemplateExample.createCriteria()
+                    .andTemplateGroupIdEqualTo(templateGroupID.get())
+                    .andPeriodEqualTo(period)
+                    .andIsActiveAssociationEqualTo(true)
+                    .andReportTypeEqualTo(reportType);
             templateIds = periodTemplateMapper.selectByExample(periodTemplateExample).stream().map(PeriodTemplate::getId).collect(Collectors.toList());
         } else {
             PeriodTemplateExample periodTemplateExample = new PeriodTemplateExample();

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JXFPMX.java

@@ -28,10 +28,17 @@ import java.util.stream.Collectors;
 /// <param name="period">会计期间——三种取值结果 “-1”指上期，“0”当期，“99”当前累计（从期初到目前）</param>
 /// <returns></returns>
 public class JXFPMX extends FunctionBase implements FreeRefFunction {
+    //private Boolean isSave;
+
     public JXFPMX(FormulaContext formulaContext) {
         super(formulaContext);
     }
 
+//    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec,Boolean isSave){
+//        this.isSave = isSave;
+//        evaluate( args,  ec);
+//    }
+
     @Override
     public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
         if (args.length < 4) {