fixbug

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

@@ -52,19 +52,19 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
     private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType, Integer amountType, OperationEvaluationContext ec) {
 
         String queryDate = formulaContext.getYear() + (formulaContext.getPeriod() < 10 ? ("0" + formulaContext.getPeriod()) : (formulaContext.getPeriod() + ""));
-        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
-        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
-                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate);
-        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
-        if (CollectionUtils.isEmpty(typeMappingList)) {
-            return 0.0;
-        }
-        List<String> revenueTypes = typeMappingList.stream()
-                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
+//        RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
+//        typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
+//                .andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
+//                .andEndDateGreaterThanOrEqualTo(queryDate);
+//        List<RevenueTypeMapping> typeMappingList = SpringContextUtil.revenueTypeMappingMapper.selectByExample(typeMappingExample);
+//        if (CollectionUtils.isEmpty(typeMappingList)) {
+//            return 0.0;
+//        }
+//        List<String> revenueTypes = typeMappingList.stream()
+//                .map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
         RevenueConfigExample configExample = new RevenueConfigExample();
         configExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId()).andStartDateLessThanOrEqualTo(queryDate)
-                .andEndDateGreaterThanOrEqualTo(queryDate).andNameIn(revenueTypes);
+                .andEndDateGreaterThanOrEqualTo(queryDate).andNameEqualTo(revenueTypeName);
         List<RevenueConfig> configDatas = SpringContextUtil.revenueConfigMapper.selectByExample(configExample);
         if (CollectionUtils.isEmpty(configDatas)) {
             return 0.0;

atms-dao/src/main/java/pwc/taxtech/atms/entity/TaxDocumentExample.java

@@ -1916,72 +1916,72 @@ public class TaxDocumentExample {
         }
 
         public Criteria andEnableIsNull() {
-            addCriterion("enable is null");
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
         public Criteria andEnableIsNotNull() {
-            addCriterion("enable is not null");
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
         public Criteria andEnableEqualTo(String value) {
-            addCriterion("enable =", value, "enable");
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotEqualTo(String value) {
-            addCriterion("enable <>", value, "enable");
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThan(String value) {
-            addCriterion("enable >", value, "enable");
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableGreaterThanOrEqualTo(String value) {
-            addCriterion("enable >=", value, "enable");
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThan(String value) {
-            addCriterion("enable <", value, "enable");
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLessThanOrEqualTo(String value) {
-            addCriterion("enable <=", value, "enable");
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableLike(String value) {
-            addCriterion("enable like", value, "enable");
+            addCriterion("`enable` like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotLike(String value) {
-            addCriterion("enable not like", value, "enable");
+            addCriterion("`enable` not like", value, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableIn(List<String> values) {
-            addCriterion("enable in", values, "enable");
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotIn(List<String> values) {
-            addCriterion("enable not in", values, "enable");
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableBetween(String value1, String value2) {
-            addCriterion("enable between", value1, value2, "enable");
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
         public Criteria andEnableNotBetween(String value1, String value2) {
-            addCriterion("enable not between", value1, value2, "enable");
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js

@@ -528,38 +528,39 @@ taxDocumentManageModule.controller('taxDocumentListController',
                     }
                 });
                 if(delIDs.length ==0){
-                    return;
+                    SweetAlert.warning($translate.instant("NeedChecked"));
+                }else{
+                    SweetAlert.swal({
+                            title: '提示',
+                            text: $translate.instant("DeleteConfirm"),
+                            type: "warning",
+                            showCancelButton: true,
+                            confirmButtonColor: "#DD6B55",
+                            confirmButtonText: $translate.instant('Confirm'),
+                            cancelButtonText: $translate.instant('Cancel'),
+                            closeOnConfirm: true,
+                            closeOnCancel: true
+                        },
+                        function (isConfirm) {
+                            if (isConfirm) {
+                                taxDocumentListService.delFileRecordItems({
+                                    "ids":delIDs
+                                }).then(function (data) {
+                                    if (data) {
+                                        SweetAlert.swal({
+                                                title: $translate.instant("Deleted"),
+                                                type: "success",
+                                                confirmButtonText: $translate.instant('Confirm'),
+                                                closeOnConfirm: true
+                                            },
+                                            function (isConfirm) {
+                                                if (isConfirm) $scope.loadMainData();
+                                            });
+                                    }
+                                });
+                            }
+                        })
                 }
-                SweetAlert.swal({
-                        title: '提示',
-                        text: $translate.instant("DeleteConfirm"),
-                        type: "warning",
-                        showCancelButton: true,
-                        confirmButtonColor: "#DD6B55",
-                        confirmButtonText: $translate.instant('Confirm'),
-                        cancelButtonText: $translate.instant('Cancel'),
-                        closeOnConfirm: true,
-                        closeOnCancel: true
-                    },
-                    function (isConfirm) {
-                        if (isConfirm) {
-                            taxDocumentListService.delFileRecordItems({
-                                "ids":delIDs
-                            }).then(function (data) {
-                                if (data) {
-                                    SweetAlert.swal({
-                                            title: $translate.instant("Deleted"),
-                                            type: "success",
-                                            confirmButtonText: $translate.instant('Confirm'),
-                                            closeOnConfirm: true
-                                        },
-                                        function (isConfirm) {
-                                            if (isConfirm) $scope.loadMainData();
-                                        });
-                                }
-                            });
-                        }
-                    })
             };
 
             (function initialize() {