add back end code for rule enginee

atms-api/src/main/java/pwc/taxtech/atms/controller/RuleEngineeConfigController.java

+package pwc.taxtech.atms.controller;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+import pwc.taxtech.atms.dto.BatchUpdateTaxRuleDto;
+import pwc.taxtech.atms.dto.TaxPayerReportRuleDto;
+import pwc.taxtech.atms.dto.TaxRuleSettingDto;
+import pwc.taxtech.atms.dto.navtree.NavTreeDto;
+import pwc.taxtech.atms.service.RuleEngineeConfigService;
+
+/** @see PwC.Tax.Tech.Atms.WebApi\Controllers\RuleEngineeConfigController.cs */
+@RestController
+@RequestMapping("/api/v1/ruleEngineeConfig/")
+public class RuleEngineeConfigController {
+    private static Logger logger = LoggerFactory.getLogger(RuleEngineeConfigController.class);
+    
+    @Autowired
+    RuleEngineeConfigService ruleEngineeConfigService;
+    
+    @ApiOperation(value = "Get TaxPayerReportMapping", notes = "Return TaxPayerReportMapping")
+    @RequestMapping(value = "taxPayerReportMapping", method = RequestMethod.GET)
+    public @ResponseBody List<TaxPayerReportRuleDto> GetTaxPayerReportMapping() {
+        logger.debug("RuleEngineeConfigController GetTaxPayerReportMapping");
+        return ruleEngineeConfigService.GetTaxPayerReportMapping();
+    }
+    
+    @ApiOperation(value="Get TaxRuleSetting",notes="Return TaxRuleSetting")
+    @RequestMapping(value="taxRuleSetting",method= RequestMethod.GET)
+    public @ResponseBody List<TaxRuleSettingDto> GetTaxRuleSetting()
+    {
+    	logger.debug("RuleEngineeConfigController GetTaxRuleSetting");
+    	return ruleEngineeConfigService.GetTaxRuleSetting();
+    }
+    
+    @ApiOperation(value="",notes="")
+    @RequestMapping(value="taxRuleSetting/Save",method = RequestMethod.POST)
+    public void SaveTaxRuleSettings(@RequestBody BatchUpdateTaxRuleDto batchUpdateTaxRule) {
+    	logger.debug("RuleEngineeConfigController SaveTaxRuleSettings");
+    	ruleEngineeConfigService.SaveTaxRuleSettings(batchUpdateTaxRule);
+    }
+	
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/KeyValueConfigMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entitiy.KeyValueConfig;
+import pwc.taxtech.atms.entitiy.KeyValueConfigExample;
+
+@Mapper
+public interface KeyValueConfigMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    long countByExample(KeyValueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(KeyValueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int insert(KeyValueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int insertSelective(KeyValueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    List<KeyValueConfig> selectByExampleWithRowbounds(KeyValueConfigExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    List<KeyValueConfig> selectByExample(KeyValueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    KeyValueConfig selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") KeyValueConfig record, @Param("example") KeyValueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") KeyValueConfig record, @Param("example") KeyValueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(KeyValueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table KeyValueConfig
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(KeyValueConfig record);
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TaxRuleSettingMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.dto.TaxRuleSettingDto;
+import pwc.taxtech.atms.entitiy.TaxRuleSetting;
+import pwc.taxtech.atms.entitiy.TaxRuleSettingExample;
+
+@Mapper
+public interface TaxRuleSettingMapper extends MyMapper {
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	long countByExample(TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int deleteByExample(TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int deleteByPrimaryKey(String ID);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int insert(TaxRuleSetting record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int insertSelective(TaxRuleSetting record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	List<TaxRuleSetting> selectByExampleWithBLOBsWithRowbounds(TaxRuleSettingExample example, RowBounds rowBounds);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	List<TaxRuleSetting> selectByExampleWithBLOBs(TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	List<TaxRuleSetting> selectByExampleWithRowbounds(TaxRuleSettingExample example, RowBounds rowBounds);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	List<TaxRuleSetting> selectByExample(TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	TaxRuleSetting selectByPrimaryKey(String ID);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByExampleSelective(@Param("record") TaxRuleSetting record,
+			@Param("example") TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByExampleWithBLOBs(@Param("record") TaxRuleSetting record,
+			@Param("example") TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByExample(@Param("record") TaxRuleSetting record, @Param("example") TaxRuleSettingExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByPrimaryKeySelective(TaxRuleSetting record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByPrimaryKeyWithBLOBs(TaxRuleSetting record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to
+	 * the database table TaxRuleSetting
+	 *
+	 * @mbg.generated
+	 */
+	int updateByPrimaryKey(TaxRuleSetting record);
+
+	@Select("select trs.GroupName,trs.ID,trs.IsDefault,trs.Name,trs.TaxBase,trs.TaxRate*100 as TaxRate,trso.OrganizationID"
+			+ " from TaxRuleSetting trs " 
+			+ "join TaxRuleSettingOrganization trso on trs.ID=trso.TaxSettingID")
+	@Results({ 
+		@Result(id = true, column = "ID", property = "ID"),
+		@Result(column = "GroupName",property="GroupName"),
+		@Result(column = "IsDefault",property="IsDefault"),
+		@Result(column = "Name",property="Name"),
+		@Result(column = "TaxBase",property="TaxBase"),
+		@Result(column = "TaxRate",property="TaxRate"),
+		@Result(column = "OrganizationID",property="OrganizationID"),
+	})
+	List<TaxRuleSettingDto> GetTaxRuleSetting();
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TaxRuleSettingOrganizationMapper.java

+package pwc.taxtech.atms.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entitiy.TaxRuleSettingOrganization;
+import pwc.taxtech.atms.entitiy.TaxRuleSettingOrganizationExample;
+
+@Mapper
+public interface TaxRuleSettingOrganizationMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    long countByExample(TaxRuleSettingOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(TaxRuleSettingOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int insert(TaxRuleSettingOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int insertSelective(TaxRuleSettingOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    List<TaxRuleSettingOrganization> selectByExampleWithRowbounds(TaxRuleSettingOrganizationExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    List<TaxRuleSettingOrganization> selectByExample(TaxRuleSettingOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    TaxRuleSettingOrganization selectByPrimaryKey(String ID);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") TaxRuleSettingOrganization record, @Param("example") TaxRuleSettingOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") TaxRuleSettingOrganization record, @Param("example") TaxRuleSettingOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(TaxRuleSettingOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(TaxRuleSettingOrganization record);
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateGroupMapper.java

@@ -11,96 +11,96 @@ import pwc.taxtech.atms.entitiy.TemplateGroupExample;
 @Mapper
 public interface TemplateGroupMapper extends MyMapper {
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     long countByExample(TemplateGroupExample example);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int deleteByExample(TemplateGroupExample example);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int deleteByPrimaryKey(String ID);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int insert(TemplateGroup record);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int insertSelective(TemplateGroup record);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     List<TemplateGroup> selectByExampleWithRowbounds(TemplateGroupExample example, RowBounds rowBounds);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     List<TemplateGroup> selectByExample(TemplateGroupExample example);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     TemplateGroup selectByPrimaryKey(String ID);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int updateByExampleSelective(@Param("record") TemplateGroup record, @Param("example") TemplateGroupExample example);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int updateByExample(@Param("record") TemplateGroup record, @Param("example") TemplateGroupExample example);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */
     int updateByPrimaryKeySelective(TemplateGroup record);
 
     /**
-     * This method was generated by MyBatis Generator. This method corresponds to
-     * the database table dbo.TemplateGroup
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TemplateGroup
      *
      * @mbg.generated
      */

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

+package pwc.taxtech.atms.dto;
+
+import java.util.List;
+
+public class BatchUpdateTaxRuleDto {
+	private List<TaxRuleSettingOperation> TaxRuleSettingOperations;
+	private List<TaxPayerReportRuleDtoOperation> TaxPayerReportRuleOperations;
+	public List<TaxRuleSettingOperation> getTaxRuleSettingOperations() {
+		return TaxRuleSettingOperations;
+	}
+	public void setTaxRuleSettingOperations(List<TaxRuleSettingOperation> taxRuleSettingOperations) {
+		TaxRuleSettingOperations = taxRuleSettingOperations;
+	}
+	public List<TaxPayerReportRuleDtoOperation> getTaxPayerReportRuleOperations() {
+		return TaxPayerReportRuleOperations;
+	}
+	public void setTaxPayerReportRuleOperations(List<TaxPayerReportRuleDtoOperation> taxPayerReportRuleOperations) {
+		TaxPayerReportRuleOperations = taxPayerReportRuleOperations;
+	}
+}

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

+package pwc.taxtech.atms.dto;
+
+import java.util.List;
+
+public class TaxPayerReportRuleDto {
+    private String ID;
+    private int IsDefault;
+    private int TaxPayerType;
+    private String TemplateGroupID;
+    private List<String> Orgs;
+	
+    public String getID() {
+		return ID;
+	}
+    
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+	
+	public int getIsDefault() {
+		return IsDefault;
+	}
+	
+	public void setIsDefault(int isDefault) {
+		this.IsDefault = isDefault;
+	}
+	
+	public int getTaxPayerType() {
+		return TaxPayerType;
+	}
+	
+	public void setTaxPayerType(int taxPayerType) {
+		this.TaxPayerType = taxPayerType;
+	}
+	
+	public String getTemplateGroupID() {
+		return TemplateGroupID;
+	}
+	public void setTemplateGroupID(String templateGroupID) {
+		this.TemplateGroupID = templateGroupID;
+	}
+
+	public List<String> getOrgs() {
+		return Orgs;
+	}
+
+	public void setOrgs(List<String> orgs) {
+		this.Orgs = orgs;
+	}
+	
+	
+	
+	
+}

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

+package pwc.taxtech.atms.dto;
+
+public class TaxPayerReportRuleDtoOperation {
+	private String Action ;
+    private TaxPayerReportRuleDto TaxPayerReportRule;
+	public String getAction() {
+		return Action;
+	}
+	public void setAction(String action) {
+		Action = action;
+	}
+	public TaxPayerReportRuleDto getTaxPayerReportRule() {
+		return TaxPayerReportRule;
+	}
+	public void setTaxPayerReportRule(TaxPayerReportRuleDto taxPayerReportRule) {
+		TaxPayerReportRule = taxPayerReportRule;
+	}
+}

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

+package pwc.taxtech.atms.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class TaxRuleSettingDto {
+	private String ID ;
+	private String Name ;
+	private int IsDefault ;
+	private String GroupName;
+	private String TaxBase ;
+	private BigDecimal TaxRate;
+	private String OrganizationID;
+	private List<String> Orgs ;
+	public String getID() {
+		return ID;
+	}
+	public void setID(String ID) {
+		this.ID = ID;
+	}
+	public String getName() {
+		return Name;
+	}
+	public void setName(String name) {
+		this.Name = name;
+	}
+	public int getIsDefault() {
+		return IsDefault;
+	}
+	public void setIsDefault(int isDefault) {
+		IsDefault = isDefault;
+	}
+	public String getGroupName() {
+		return GroupName;
+	}
+	public void setGroupName(String groupName) {
+		GroupName = groupName;
+	}
+	public String getTaxBase() {
+		return TaxBase;
+	}
+	public void setTaxBase(String taxBase) {
+		TaxBase = taxBase;
+	}
+	public BigDecimal getTaxRate() {
+		return TaxRate;
+	}
+	public void setTaxRate(BigDecimal taxRate) {
+		TaxRate = taxRate;
+	}
+	public List<String> getOrgs() {
+		return Orgs;
+	}
+	public void setOrgs(List<String> orgs) {
+		Orgs = orgs;
+	}
+	public String getOrganizationID() {
+		return OrganizationID;
+	}
+	public void setOrganizationID(String organizationID) {
+		OrganizationID = organizationID;
+	}
+}

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

+package pwc.taxtech.atms.dto;
+
+public class TaxRuleSettingOperation {
+	 private String Action;
+     private TaxRuleSettingDto TaxRuleSetting;
+	public String getAction() {
+		return Action;
+	}
+	public void setAction(String action) {
+		Action = action;
+	}
+	public TaxRuleSettingDto getTaxRuleSetting() {
+		return TaxRuleSetting;
+	}
+	public void setTaxRuleSetting(TaxRuleSettingDto taxPayerReportRule) {
+		TaxRuleSetting = taxPayerReportRule;
+	}
+}

atms-api/src/main/java/pwc/taxtech/atms/entitiy/TaxRuleSetting.java

+package pwc.taxtech.atms.entitiy;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table TaxRuleSetting
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class TaxRuleSetting implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.ID
+     *
+     * @mbg.generated
+     */
+    private String ID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.Name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.IsDefault
+     *
+     * @mbg.generated
+     */
+    private Boolean isDefault;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.GroupName
+     *
+     * @mbg.generated
+     */
+    private String groupName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.TaxRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxRate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.CreateTime
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.UpdateTime
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSetting.TaxBase
+     *
+     * @mbg.generated
+     */
+    private String taxBase;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table TaxRuleSetting
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.ID
+     *
+     * @return the value of TaxRuleSetting.ID
+     *
+     * @mbg.generated
+     */
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.ID
+     *
+     * @param ID the value for TaxRuleSetting.ID
+     *
+     * @mbg.generated
+     */
+    public void setID(String ID) {
+        this.ID = ID == null ? null : ID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.Name
+     *
+     * @return the value of TaxRuleSetting.Name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.Name
+     *
+     * @param name the value for TaxRuleSetting.Name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.IsDefault
+     *
+     * @return the value of TaxRuleSetting.IsDefault
+     *
+     * @mbg.generated
+     */
+    public Boolean getIsDefault() {
+        return isDefault;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.IsDefault
+     *
+     * @param isDefault the value for TaxRuleSetting.IsDefault
+     *
+     * @mbg.generated
+     */
+    public void setIsDefault(Boolean isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.GroupName
+     *
+     * @return the value of TaxRuleSetting.GroupName
+     *
+     * @mbg.generated
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.GroupName
+     *
+     * @param groupName the value for TaxRuleSetting.GroupName
+     *
+     * @mbg.generated
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName == null ? null : groupName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.TaxRate
+     *
+     * @return the value of TaxRuleSetting.TaxRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.TaxRate
+     *
+     * @param taxRate the value for TaxRuleSetting.TaxRate
+     *
+     * @mbg.generated
+     */
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.CreateTime
+     *
+     * @return the value of TaxRuleSetting.CreateTime
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.CreateTime
+     *
+     * @param createTime the value for TaxRuleSetting.CreateTime
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.UpdateTime
+     *
+     * @return the value of TaxRuleSetting.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.UpdateTime
+     *
+     * @param updateTime the value for TaxRuleSetting.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSetting.TaxBase
+     *
+     * @return the value of TaxRuleSetting.TaxBase
+     *
+     * @mbg.generated
+     */
+    public String getTaxBase() {
+        return taxBase;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSetting.TaxBase
+     *
+     * @param taxBase the value for TaxRuleSetting.TaxBase
+     *
+     * @mbg.generated
+     */
+    public void setTaxBase(String taxBase) {
+        this.taxBase = taxBase == null ? null : taxBase.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSetting
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", ID=").append(ID);
+        sb.append(", name=").append(name);
+        sb.append(", isDefault=").append(isDefault);
+        sb.append(", groupName=").append(groupName);
+        sb.append(", taxRate=").append(taxRate);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", taxBase=").append(taxBase);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/entitiy/TaxRuleSettingOrganization.java

+package pwc.taxtech.atms.entitiy;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table TaxRuleSettingOrganization
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class TaxRuleSettingOrganization implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSettingOrganization.ID
+     *
+     * @mbg.generated
+     */
+    private String ID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSettingOrganization.TaxSettingID
+     *
+     * @mbg.generated
+     */
+    private String taxSettingID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSettingOrganization.OrganizationID
+     *
+     * @mbg.generated
+     */
+    private String organizationID;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSettingOrganization.CreateTime
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column TaxRuleSettingOrganization.UpdateTime
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSettingOrganization.ID
+     *
+     * @return the value of TaxRuleSettingOrganization.ID
+     *
+     * @mbg.generated
+     */
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSettingOrganization.ID
+     *
+     * @param ID the value for TaxRuleSettingOrganization.ID
+     *
+     * @mbg.generated
+     */
+    public void setID(String ID) {
+        this.ID = ID == null ? null : ID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSettingOrganization.TaxSettingID
+     *
+     * @return the value of TaxRuleSettingOrganization.TaxSettingID
+     *
+     * @mbg.generated
+     */
+    public String getTaxSettingID() {
+        return taxSettingID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSettingOrganization.TaxSettingID
+     *
+     * @param taxSettingID the value for TaxRuleSettingOrganization.TaxSettingID
+     *
+     * @mbg.generated
+     */
+    public void setTaxSettingID(String taxSettingID) {
+        this.taxSettingID = taxSettingID == null ? null : taxSettingID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSettingOrganization.OrganizationID
+     *
+     * @return the value of TaxRuleSettingOrganization.OrganizationID
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationID() {
+        return organizationID;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSettingOrganization.OrganizationID
+     *
+     * @param organizationID the value for TaxRuleSettingOrganization.OrganizationID
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationID(String organizationID) {
+        this.organizationID = organizationID == null ? null : organizationID.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSettingOrganization.CreateTime
+     *
+     * @return the value of TaxRuleSettingOrganization.CreateTime
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSettingOrganization.CreateTime
+     *
+     * @param createTime the value for TaxRuleSettingOrganization.CreateTime
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column TaxRuleSettingOrganization.UpdateTime
+     *
+     * @return the value of TaxRuleSettingOrganization.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column TaxRuleSettingOrganization.UpdateTime
+     *
+     * @param updateTime the value for TaxRuleSettingOrganization.UpdateTime
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TaxRuleSettingOrganization
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", ID=").append(ID);
+        sb.append(", taxSettingID=").append(taxSettingID);
+        sb.append(", organizationID=").append(organizationID);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/service/OperationLogService.java

@@ -2,6 +2,8 @@ package pwc.taxtech.atms.service;
 
 import java.util.List;
 
+import pwc.taxtech.atms.common.OperateLogType;
+import pwc.taxtech.atms.common.OperationModule;
 import pwc.taxtech.atms.dto.OperationLogDto;
 import pwc.taxtech.atms.dto.PagingResultDto;
 import pwc.taxtech.atms.dto.QueryOperateParamDto;
@@ -38,4 +40,10 @@ public interface OperationLogService {
      * @param updateLogParamsList
      */
     void addOrDeleteDataAddLog(UpdateLogParams updateLogParams);
+    
+    void AddDataAddLog(Object newObj, OperationModule operationModule, String userName, String operationDesc, String operationContent, String OperationObject, OperateLogType logType);
+    
+    void UpdateDataAddLog(Object originalObj,Object updateObj,OperationModule operationModule,String userName,String comment,String operationObject,String operationContent,OperateLogType logType);
+    
+    void DeleteDataAddLog(Object deleteObj, OperationModule operationModule, String userName, String comment, String operationContent, String OperationObject, OperateLogType logType);
 }

atms-api/src/main/java/pwc/taxtech/atms/service/RuleEngineeConfigService.java

+package pwc.taxtech.atms.service;
+
+import java.util.List;
+
+import pwc.taxtech.atms.dto.BatchUpdateTaxRuleDto;
+import pwc.taxtech.atms.dto.TaxPayerReportRuleDto;
+import pwc.taxtech.atms.dto.TaxRuleSettingDto;
+
+public interface RuleEngineeConfigService {
+    List<TaxPayerReportRuleDto> GetTaxPayerReportMapping();
+    
+    List<TaxRuleSettingDto> GetTaxRuleSetting();
+    
+    void SaveTaxRuleSettings(BatchUpdateTaxRuleDto batchUpdateTaxRule);
+}

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

@@ -27,6 +27,7 @@ import pwc.taxtech.atms.dao.MyUserMapper;
 import pwc.taxtech.atms.dao.OperationLogBasicDataMapper;
 import pwc.taxtech.atms.dao.OperationLogEnterPriseMapper;
 import pwc.taxtech.atms.dao.OrganizationMapper;
+import pwc.taxtech.atms.dao.OrganizationServiceTemplateGroupMapper;
 import pwc.taxtech.atms.dao.OrganizationStructureMapper;
 import pwc.taxtech.atms.dao.PermissionMapper;
 import pwc.taxtech.atms.dao.RegionMapper;
@@ -38,6 +39,9 @@ import pwc.taxtech.atms.dao.StandardAccountMapper;
 import pwc.taxtech.atms.dao.StatisticAttributeDimensionMapper;
 import pwc.taxtech.atms.dao.StatisticAttributeMapper;
 import pwc.taxtech.atms.dao.StockMapper;
+import pwc.taxtech.atms.dao.TaxPayerReportRuleMapper;
+import pwc.taxtech.atms.dao.TaxRuleSettingMapper;
+import pwc.taxtech.atms.dao.TaxRuleSettingOrganizationMapper;
 import pwc.taxtech.atms.dao.UserDimensionValueMapper;
 import pwc.taxtech.atms.dao.UserDimensionValueOrgMapper;
 import pwc.taxtech.atms.dao.UserDimensionValueRoleMapper;
@@ -135,4 +139,12 @@ public class AbstractService {
     protected OrganizationStructureMapper organizationStructureMapper;
     @Autowired
     protected IndustryMapper industryMapper;
+    @Autowired
+    protected TaxPayerReportRuleMapper taxPayerReportRuleMapper;
+    @Autowired
+    protected TaxRuleSettingMapper taxRuleSettingMapper;
+    @Autowired
+    protected TaxRuleSettingOrganizationMapper taxRuleSettingOrganizationMapper;
+    @Autowired
+    protected OrganizationServiceTemplateGroupMapper organizationServiceTemplateGroupMapper;
 }

atms-api/src/main/resources/pwc/taxtech/atms/dao/OrganizationMapper.xml

@@ -833,7 +833,7 @@
 	org.RegionID as RegionID, 
 	reg.MergerName as RegionName,
 	org.IsActive as IsActive
-	from "Organization" as org
+	from Organization as org
 	left join Industry as ind on org.IndustryID = ind.ID
 	left join BusinessUnit as bu on org.BusinessUnitID = bu.ID
 	left join Area as area on org.AreaID = area.ID 

atms-web/src/main/webapp/Gruntfile.js

@@ -31,6 +31,16 @@ grunt.initConfig({
         	src: ['app/admin/basicData/**/*.css'],
             dest: '<%= pkg.bundleDest %>/basicData.css'
         },
+        systemConfigurationJs:{
+        	src:['app/admin/systemConfiguration/**/*.js'],
+        	dest:'<%= pkg.bundleDest %>/systemConfiguration.js'
+        },
+        systemConfigurationLess:{
+        	options: { process },
+            files: {
+            	'<%= pkg.bundleDest %>/less/systemConfiguration.less': ['app/admin/systemConfiguration/**/*.less']
+            }
+        },
         infrastructureJs: {
             src: ['app/admin/infrastructure/**/*.js'],
             dest: '<%= pkg.bundleDest %>/infrastructure.js'
@@ -298,6 +308,11 @@ grunt.initConfig({
             files: {
             	'<%= pkg.bundleDest %>/common.less': '<%= pkg.bundleDest %>/less/common.less'
             }
+        },
+        systemConfiguration:{
+        	files:{
+        		"<%= pkg.bundleDest %>/systemConfiguration.less": "<%= pkg.bundleDest %>/less/systemConfiguration.less"
+        	}
         }
     }
 });