fixed issue of rule save failed

atms-api/src/main/java/pwc/taxtech/atms/dto/TaxPayerReportRuleDto.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
 public class TaxPayerReportRuleDto {
-    @JsonProperty("ID")
     private Long id;
     private int isDefault;
     private int taxPayerType;

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

@@ -81,7 +81,7 @@ public class RuleEngineeConfigServiceImpl extends AbstractService {
         return trsdList;
     }
 
-    @Transactional(readOnly = true)
+    @Transactional
     public void savetaxrulesettings(BatchUpdateTaxRuleDto batchUpdateTaxRule) {
         for (TaxRuleSettingOperation trso : batchUpdateTaxRule.getTaxRuleSettingOperations()) {
             TaxRuleSetting taxRuleSetting = new TaxRuleSetting();
@@ -134,8 +134,8 @@ public class RuleEngineeConfigServiceImpl extends AbstractService {
             SaveOrganizationServiceTemplateGroup(taxPayerReportRule, tprrdo.getAction());
             if ("Add".equals(tprrdo.getAction())) {
                 taxPayerReportRuleMapper.insert(taxPayerReportRule);
-                operationService.addDataAddLog(taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
-                        "AddRuleEngineConfiguration", "纳税类型", "纳税类型添加特殊机构", OperateLogType.OperationLogRuleEngine);
+//                operationService.addDataAddLog(taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
+//                        "AddRuleEngineConfiguration", "纳税类型", "纳税类型添加特殊机构", OperateLogType.OperationLogRuleEngine);
             } else if ("Update".equals(tprrdo.getAction())) {
                 TaxPayerReportRule old = taxPayerReportRuleMapper.selectByPrimaryKey(reportDto.getId());
                 TaxPayerReportRule original = new TaxPayerReportRule();
@@ -149,13 +149,13 @@ public class RuleEngineeConfigServiceImpl extends AbstractService {
                 old.setUpdateTime(taxPayerReportRule.getUpdateTime());
 
                 taxPayerReportRuleMapper.updateByPrimaryKey(old);
-                operationService.updateDataAddLog(original, taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
-                        "UpdateRuleEngineConfiguration", "纳税类型", taxPayerReportRule.getIsDefault() ? "默认纳税类型或默认纳税报表" : "纳税类型更新特殊机构", OperateLogType.OperationLogRuleEngine);
+//                operationService.updateDataAddLog(original, taxPayerReportRule, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
+//                        "UpdateRuleEngineConfiguration", "纳税类型", taxPayerReportRule.getIsDefault() ? "默认纳税类型或默认纳税报表" : "纳税类型更新特殊机构", OperateLogType.OperationLogRuleEngine);
 
             } else if ("Delete".equals(tprrdo.getAction())) {
                 taxPayerReportRuleMapper.deleteByPrimaryKey(taxPayerReportRule.getId());
-                operationService.deleteDataAddLog(reportDto, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
-                        "DeleteRuleEngineConfiguration", "纳税类型", "纳税类型删除特殊机构", OperateLogType.OperationLogRuleEngine);
+//                operationService.deleteDataAddLog(reportDto, OperationModule.RuleEngineConfig, authUserHelper.getCurrentUserId(),
+//                        "DeleteRuleEngineConfiguration", "纳税类型", "纳税类型删除特殊机构", OperateLogType.OperationLogRuleEngine);
             }
         }
     }

atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/vatRuleEnginee/rule-enginee-config.ctrl.js

@@ -29,7 +29,11 @@
 
                 $scope.taxPayerReportMappingExceptions.forEach(function (value) {
                     value.templateGroupID = value.templateGroupID.toString();
-                })
+                });
+
+                taxReportRuleOrginal.forEach(function (value) {
+                    value.templateGroupID = value.templateGroupID.toString();
+                });
             });
 
 

atms-web/src/main/webapp/bundles/framework.js

@@ -4546,10 +4546,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
 
                 cfg.isWebApiRequest = true;
                 if (config && config.dbName) {
-                    cfg.headers = { 'from': config.project.id  };
+                    cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
                 }
                 else {
-                    cfg.headers = { 'from': vatSessionService.project.id  };
+                    cfg.headers = { 'from': vatSessionService.project.id };
                 }
                 //$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
                 //cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';

atms-web/src/main/webapp/bundles/systemConfiguration.js

@@ -7277,7 +7277,11 @@ systemConfigurationModule.controller('ruleEngineeConfigController', ['$scope', '
 
                 $scope.taxPayerReportMappingExceptions.forEach(function (value) {
                     value.templateGroupID = value.templateGroupID.toString();
-                })
+                });
+
+                taxReportRuleOrginal.forEach(function (value) {
+                    value.templateGroupID = value.templateGroupID.toString();
+                });
             });