1、机构管理内容新增

// todo
1、机构国际化修改
2、其他信息补充日志
3、前端表单调整

atms-api/src/main/java/pwc/taxtech/atms/common/CommonConstants.java

@@ -139,6 +139,8 @@ public class CommonConstants {
     public static final String NullAreaId = "NullAreaId";
     public static final String CommonFail = "CommonFail";
 
+    public static final String SystemError = "系统异常";
+
     public static final String OneSpace = " ";
     public static final String Comma = ",";
 }

atms-api/src/main/java/pwc/taxtech/atms/common/OperateLogType.java

@@ -30,6 +30,9 @@ public enum OperateLogType {
     OperationLogWorkflow("operation_log_work_flow", 11),
     /***/
     OperationLogStock("operation_log_stock", 12),
+    /**
+     * 股权变更操作日志*/
+    OperationLogEquity("operation_log_equity", 13),
     /***/
     ;
     /***/

atms-api/src/main/java/pwc/taxtech/atms/common/OperationAction.java

@@ -36,7 +36,11 @@ public enum OperationAction {
     /**去除权限*/
     DeletePermission(18),
     /**进入项目**/
-    EnterProject(19);
+    EnterProject(19),
+    /**变更股权**/
+    ChangeEquity(20),
+    /**新增股权**/
+    NewEquity(21);
 
     private int value;
 

atms-api/src/main/java/pwc/taxtech/atms/common/OperationModule.java

@@ -41,7 +41,9 @@ public enum OperationModule {
     RuleEngineConfig(30), 
     KeyValueConfig(31), 
     Workflow(32), 
-    Stock(33);
+    Stock(33),
+    /** 股权变更 */
+    ChangeEquity(34);
 
     private int value;
 

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumApiUpdateFlag.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum EnumApiUpdateFlag {
+    MANUAL_UPDATE(0, "人工更新"),
+    IMPORT_UPDATES(1, "导入更新");
+
+    private Integer code;
+    private String name;
+
+    EnumApiUpdateFlag(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static EnumApiUpdateFlag fromCode(Integer code){
+        for(EnumApiUpdateFlag type: EnumApiUpdateFlag.values()){
+            if(type.getCode().intValue()==code.intValue())return type;
+        }
+        // 超出范围值默认返回人工更新
+        return EnumApiUpdateFlag.MANUAL_UPDATE;
+    }
+
+    public static String getName(Integer code){
+        for(EnumApiUpdateFlag type: EnumApiUpdateFlag.values()){
+            if(type.getCode().intValue()==code.intValue())return type.name;
+        }
+        // 超出范围值默认返回人工更新
+        return EnumApiUpdateFlag.MANUAL_UPDATE.name;
+    }
+}

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

+package pwc.taxtech.atms.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.equity.EquityInfoDto;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.entity.OperationLogBasicData;
+import pwc.taxtech.atms.service.impl.EquityServiceImpl;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/equity")
+public class EquityController {
+
+    @Autowired
+    private EquityServiceImpl equityServiceService;
+
+    @RequestMapping(value = "getEquityListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<EquityInfoDto> getEquityListByOrgId(@RequestParam("orgId") String orgId) {
+        return equityServiceService.getEquityListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "getEquityListRespByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity getEquityListRespByOrgId(@RequestParam("orgId") String orgId) {
+        return ResponseEntity.ok().body(equityServiceService.getEquityListByOrgId(orgId));
+    }
+
+    @RequestMapping(value = "insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insert(@RequestBody List<EquityInfoDto> equityInfoDtos) {
+        return equityServiceService.insertAll(equityInfoDtos);
+    }
+
+    @RequestMapping(value = "change", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> change(@RequestParam("orgName") String orgName, @RequestParam("comment") String comment, @RequestBody List<EquityInfoDto> equityInfoDtos) {
+        return equityServiceService.change(orgName, comment, equityInfoDtos);
+    }
+
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> update(@RequestBody EquityInfoDto equityInfoDto) {
+        return equityServiceService.update(equityInfoDto);
+    }
+
+    @RequestMapping(value = "delete", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> delete(@RequestParam Long id, @RequestBody List<Integer> eNums) {
+        return equityServiceService.delete(id, eNums);
+    }
+
+    @RequestMapping(value = "getChangeLogByOrgName", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OperationLogBasicData> getChangeLogByOrgName(@RequestParam("orgName") String orgName) {
+        return equityServiceService.getChangeLogByOrgName(orgName);
+    }
+
+    @RequestMapping(value = "cancelChange", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> cancelChange(@RequestParam("oldId") Long oldId, @RequestParam("newId") Long newId) {
+        return equityServiceService.cancelChange(oldId, newId);
+    }
+
+    @RequestMapping(value = "getEquityListById", method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity getEquityListById(@RequestParam("id") Long id) {
+        return ResponseEntity.ok().body(equityServiceService.getEquityListById(id));
+    }
+
+    @RequestMapping(value = "getEquityHisListById", method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity getEquityHisListById(@RequestParam("id") Long id) {
+        return ResponseEntity.ok().body(equityServiceService.getEquityHisListById(id));
+    }
+
+
+}

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

+package pwc.taxtech.atms.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.organization.*;
+import pwc.taxtech.atms.service.impl.OrgExtraServiceImpl;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/orgExtra")
+public class OrgExtraController {
+
+    @Autowired
+    private OrgExtraServiceImpl orgExtraServiceImpl;
+
+    // 机构其他信息-发票信息
+
+    @RequestMapping(value = "invoice/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationInvoiceDto> getInvoiceListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getInvoiceListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "invoice/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertInvoice(@RequestBody List<OrganizationInvoiceDto> organizationInvoiceDtos) {
+        return orgExtraServiceImpl.insertAllInvoice(organizationInvoiceDtos);
+    }
+
+    @RequestMapping(value = "invoice/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateInvoice(@RequestBody OrganizationInvoiceDto organizationInvoiceDto) {
+        return orgExtraServiceImpl.updateInvoice(organizationInvoiceDto);
+    }
+
+    @RequestMapping(value = "invoice/delete", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> deleteInvoice(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteInvoice(id);
+    }
+
+    // 机构其他信息-税种信息
+
+    @RequestMapping(value = "taxRule/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationTaxRuleDto> getTaxRuleListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getTaxRuleListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "taxRule/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertTaxRule(@RequestBody List<OrganizationTaxRuleDto> organizationTaxRuleDtos) {
+        return orgExtraServiceImpl.insertAllTaxRule(organizationTaxRuleDtos);
+    }
+
+    @RequestMapping(value = "taxRule/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateTaxRule(@RequestBody OrganizationTaxRuleDto organizationTaxRuleDto) {
+        return orgExtraServiceImpl.updateTaxRule(organizationTaxRuleDto);
+    }
+
+    @RequestMapping(value = "taxRule/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteTaxRule(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteTaxRule(id);
+    }
+
+    // 机构其他信息-入账汇率信息
+
+    @RequestMapping(value = "accountingRate/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationAccountingRateDto> getAccountingRateListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getAccountingRateListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "accountingRate/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertAccountingRate(@RequestBody List<OrganizationAccountingRateDto> organizationAccountingRateDtos) {
+        return orgExtraServiceImpl.insertAllAccountingRate(organizationAccountingRateDtos);
+    }
+
+    @RequestMapping(value = "accountingRate/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateAccountingRate(@RequestBody OrganizationAccountingRateDto organizationAccountingRateDto) {
+        return orgExtraServiceImpl.updateAccountingRate(organizationAccountingRateDto);
+    }
+
+    @RequestMapping(value = "accountingRate/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteAccountingRate(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteAccountingRate(id);
+    }
+
+    // 机构其他信息-返还率信息
+
+    @RequestMapping(value = "returnRate/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationReturnRateDto> getReturnRateListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getReturnRateListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "returnRate/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertReturnRate(@RequestBody List<OrganizationReturnRateDto> organizationReturnRateDtos) {
+        return orgExtraServiceImpl.insertAllReturnRate(organizationReturnRateDtos);
+    }
+
+    @RequestMapping(value = "returnRate/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateReturnRate(@RequestBody OrganizationReturnRateDto organizationReturnRateDto) {
+        return orgExtraServiceImpl.updateReturnRate(organizationReturnRateDto);
+    }
+
+    @RequestMapping(value = "returnRate/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteReturnRate(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteReturnRate(id);
+    }
+
+    // 机构其他信息-核定征收信息
+
+    @RequestMapping(value = "approvedLevyInfo/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationApprovedLevyInfoDto> getApprovedLevyInfoListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getApprovedLevyInfoListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "approvedLevyInfo/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertApprovedLevyInfo(@RequestBody List<OrganizationApprovedLevyInfoDto> organizationApprovedLevyInfoDtos) {
+        return orgExtraServiceImpl.insertAllApprovedLevyInfo(organizationApprovedLevyInfoDtos);
+    }
+
+    @RequestMapping(value = "approvedLevyInfo/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateApprovedLevyInfo(@RequestBody OrganizationApprovedLevyInfoDto organizationApprovedLevyInfoDto) {
+        return orgExtraServiceImpl.updateApprovedLevyInfo(organizationApprovedLevyInfoDto);
+    }
+
+    @RequestMapping(value = "approvedLevyInfo/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteApprovedLevyInfo(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteApprovedLevyInfo(id);
+    }
+
+    // 机构其他信息-专管员列表
+
+    @RequestMapping(value = "taxOfficer/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationTaxOfficerDto> getTaxOfficerListByOrgId(@RequestParam("orgId") String orgId) {
+        return orgExtraServiceImpl.getTaxOfficerListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "taxOfficer/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertTaxOfficer(@RequestBody List<OrganizationTaxOfficerDto> organizationTaxOfficerDtos) {
+        return orgExtraServiceImpl.insertAllTaxOfficer(organizationTaxOfficerDtos);
+    }
+
+    @RequestMapping(value = "taxOfficer/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateTaxOfficer(@RequestBody OrganizationTaxOfficerDto organizationTaxOfficerDto) {
+        return orgExtraServiceImpl.updateTaxOfficer(organizationTaxOfficerDto);
+    }
+
+    @RequestMapping(value = "taxOfficer/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteTaxOfficer(@RequestParam Long id) {
+        return orgExtraServiceImpl.deleteTaxOfficer(id);
+    }
+
+}

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

@@ -7,7 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dpo.OrgBasicDto;
+import pwc.taxtech.atms.dpo.OrgInfoDto;
 import pwc.taxtech.atms.dpo.OrganizationDto;
+import pwc.taxtech.atms.dpo.OrganizationExtraDto;
 import pwc.taxtech.atms.dto.AreaOrganizationStatistics;
 import pwc.taxtech.atms.dto.IndustryDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
@@ -85,6 +87,14 @@ public class OrganizationController {
         return organizationService.getOrgListLevel();
     }
 
+    //    @ApiOperation(value = "层级显示机构列表_列表显示")
+    @RequestMapping(value = "getOrgInfoList", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrgInfoDto> getOrgInfoList() {
+        logger.info("GET /api/v1/org/getOrgInfoList");
+        return organizationService.getOrgInfo();
+    }
+
 //    @ApiOperation(value = "纳税人识别号唯一性验证")
     @RequestMapping(value = "taxPayerNumberUniqueValidate", method = RequestMethod.POST)
     public @ResponseBody
@@ -176,6 +186,14 @@ public class OrganizationController {
         return organizationService.getSingleOrgByOrgId(orgId);
     }
 
+//    @ApiOperation(value = "通过orgId获取一个组织的其他信息")
+    @RequestMapping(value = "displaySingleExtra", method = RequestMethod.GET)
+    public @ResponseBody
+    OrganizationExtraDto getSingleExtraOrgByOrgId(@RequestParam("orgId") String orgId) {
+        logger.info("POST /api/v1/org/displaySingleExtra");
+        return organizationService.getSingleOrgExtraByOrgId(orgId);
+    }
+
 //    @ApiOperation(value = "机构代码唯一性验证")
     @RequestMapping(value = "codeUniqueValidate", method = RequestMethod.POST)
     public @ResponseBody
@@ -215,6 +233,14 @@ public class OrganizationController {
         return organizationService.updateOrg(orgDto);
     }
 
+//    @ApiOperation(value = "更新机构-其他信息")
+    @RequestMapping(value = "updateExtra", method = RequestMethod.PUT)
+    public @ResponseBody
+    OperationResultDto<Object> updateOrgExtraInfo(@RequestBody OrganizationExtraDto orgExtraDto) {
+        logger.info("PUT /api/v1/org/updateExtra");
+        return organizationService.updateOrgExtra(orgExtraDto);
+    }
+
 //    @ApiOperation(value = "删除用户维度权限设置")
     @RequestMapping(value = "deleteUserDimensionValue", method = RequestMethod.POST)
     public @ResponseBody

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

@@ -69,6 +69,16 @@ public class OperationLogDto {
      */
     private Integer logType;
 
+    private boolean isEquityLog = false;
+
+    public boolean isEquityLog() {
+        return isEquityLog;
+    }
+
+    public void setEquityLog(boolean equityLog) {
+        isEquityLog = equityLog;
+    }
+
     public String getId() {
         return id;
     }

atms-api/src/main/java/pwc/taxtech/atms/dto/equity/EquityInfoDto.java

+package pwc.taxtech.atms.dto.equity;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
+import java.util.Date;
+
+public class EquityInfoDto {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.id
+     *
+     * @mbg.generated
+     */
+    @JsonSerialize(using = PwCIdSerialize.class)
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   股权信息序号。从1开始
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.e_num
+     *
+     * @mbg.generated
+     */
+    private Integer eNum;
+
+    /**
+     * Database Column Remarks:
+     *   对应机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   认缴股东姓名
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_shareholders_name
+     *
+     * @mbg.generated
+     */
+    private String subShareholdersName;
+
+    /**
+     * Database Column Remarks:
+     *   认缴股东身份证号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_shareholders_id_num
+     *
+     * @mbg.generated
+     */
+    private String subShareholdersIdNum;
+
+    /**
+     * Database Column Remarks:
+     *   认缴股东企业名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_shareholders_ent_name
+     *
+     * @mbg.generated
+     */
+    private String subShareholdersEntName;
+
+    /**
+     * Database Column Remarks:
+     *   认缴股东企业税号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_shareholders_ent_tax_num
+     *
+     * @mbg.generated
+     */
+    private String subShareholdersEntTaxNum;
+
+    /**
+     * Database Column Remarks:
+     *   认缴出资金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_capital_contribution_amount
+     *
+     * @mbg.generated
+     */
+    private Long subCapitalContributionAmount;
+
+    /**
+     * Database Column Remarks:
+     *   认缴出资比例。百分比，多个股东合计为100%
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.sub_contribution_proportion
+     *
+     * @mbg.generated
+     */
+    private Byte subContributionProportion;
+
+    /**
+     * Database Column Remarks:
+     *   实缴股东姓名
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.paid_in_shareholders_name
+     *
+     * @mbg.generated
+     */
+    private String paidInShareholdersName;
+
+    /**
+     * Database Column Remarks:
+     *   实缴股东企业名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.paid_in_shareholders_ent_name
+     *
+     * @mbg.generated
+     */
+    private String paidInShareholdersEntName;
+
+    /**
+     * Database Column Remarks:
+     *   实缴股东企业税号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.paid_in_shareholders_ent_tax_num
+     *
+     * @mbg.generated
+     */
+    private String paidInShareholdersEntTaxNum;
+
+    /**
+     * Database Column Remarks:
+     *   实缴出资金额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.paid_in_capital_contribution_amount
+     *
+     * @mbg.generated
+     */
+    private Long paidInCapitalContributionAmount;
+
+    /**
+     * Database Column Remarks:
+     *   实缴出资比例。百分比，多个股东合计为100%
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.paid_in_contribution_proportion
+     *
+     * @mbg.generated
+     */
+    private Byte paidInContributionProportion;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column equity_information.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer geteNum() {
+        return eNum;
+    }
+
+    public void seteNum(Integer eNum) {
+        this.eNum = eNum;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getSubShareholdersName() {
+        return subShareholdersName;
+    }
+
+    public void setSubShareholdersName(String subShareholdersName) {
+        this.subShareholdersName = subShareholdersName;
+    }
+
+    public String getSubShareholdersIdNum() {
+        return subShareholdersIdNum;
+    }
+
+    public void setSubShareholdersIdNum(String subShareholdersIdNum) {
+        this.subShareholdersIdNum = subShareholdersIdNum;
+    }
+
+    public String getSubShareholdersEntName() {
+        return subShareholdersEntName;
+    }
+
+    public void setSubShareholdersEntName(String subShareholdersEntName) {
+        this.subShareholdersEntName = subShareholdersEntName;
+    }
+
+    public String getSubShareholdersEntTaxNum() {
+        return subShareholdersEntTaxNum;
+    }
+
+    public void setSubShareholdersEntTaxNum(String subShareholdersEntTaxNum) {
+        this.subShareholdersEntTaxNum = subShareholdersEntTaxNum;
+    }
+
+    public Byte getSubContributionProportion() {
+        return subContributionProportion;
+    }
+
+    public void setSubContributionProportion(Byte subContributionProportion) {
+        this.subContributionProportion = subContributionProportion;
+    }
+
+    public String getPaidInShareholdersName() {
+        return paidInShareholdersName;
+    }
+
+    public void setPaidInShareholdersName(String paidInShareholdersName) {
+        this.paidInShareholdersName = paidInShareholdersName;
+    }
+
+    public String getPaidInShareholdersEntName() {
+        return paidInShareholdersEntName;
+    }
+
+    public void setPaidInShareholdersEntName(String paidInShareholdersEntName) {
+        this.paidInShareholdersEntName = paidInShareholdersEntName;
+    }
+
+    public String getPaidInShareholdersEntTaxNum() {
+        return paidInShareholdersEntTaxNum;
+    }
+
+    public void setPaidInShareholdersEntTaxNum(String paidInShareholdersEntTaxNum) {
+        this.paidInShareholdersEntTaxNum = paidInShareholdersEntTaxNum;
+    }
+
+    public Byte getPaidInContributionProportion() {
+        return paidInContributionProportion;
+    }
+
+    public void setPaidInContributionProportion(Byte paidInContributionProportion) {
+        this.paidInContributionProportion = paidInContributionProportion;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getSubCapitalContributionAmount() {
+        return subCapitalContributionAmount;
+    }
+
+    public void setSubCapitalContributionAmount(Long subCapitalContributionAmount) {
+        this.subCapitalContributionAmount = subCapitalContributionAmount;
+    }
+
+    public Long getPaidInCapitalContributionAmount() {
+        return paidInCapitalContributionAmount;
+    }
+
+    public void setPaidInCapitalContributionAmount(Long paidInCapitalContributionAmount) {
+        this.paidInCapitalContributionAmount = paidInCapitalContributionAmount;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationReturnRateDto.java

+package pwc.taxtech.atms.dto.organization;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table organization_return_rate
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OrganizationReturnRateDto implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.id
+     *
+     * @mbg.generated
+     */
+    @JsonSerialize(using = PwCIdSerialize.class)
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   税种
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.group_name
+     *
+     * @mbg.generated
+     */
+    private String groupName;
+
+    /**
+     * Database Column Remarks:
+     *   返还率
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.return_rate
+     *
+     * @mbg.generated
+     */
+    private Byte returnRate;
+
+    /**
+     * Database Column Remarks:
+     *   开始时间。2015-05-02
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.start_date
+     *
+     * @mbg.generated
+     */
+    private Date startDate;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_return_rate.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_return_rate
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_return_rate.id
+     *
+     * @return the value of organization_return_rate.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.id
+     *
+     * @param id the value for organization_return_rate.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_return_rate.organization_id
+     *
+     * @return the value of organization_return_rate.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.organization_id
+     *
+     * @param organizationId the value for organization_return_rate.organization_id
+     *
+     * @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 organization_return_rate.group_name
+     *
+     * @return the value of organization_return_rate.group_name
+     *
+     * @mbg.generated
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.group_name
+     *
+     * @param groupName the value for organization_return_rate.group_name
+     *
+     * @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 organization_return_rate.return_rate
+     *
+     * @return the value of organization_return_rate.return_rate
+     *
+     * @mbg.generated
+     */
+    public Byte getReturnRate() {
+        return returnRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.return_rate
+     *
+     * @param returnRate the value for organization_return_rate.return_rate
+     *
+     * @mbg.generated
+     */
+    public void setReturnRate(Byte returnRate) {
+        this.returnRate = returnRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_return_rate.start_date
+     *
+     * @return the value of organization_return_rate.start_date
+     *
+     * @mbg.generated
+     */
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.start_date
+     *
+     * @param startDate the value for organization_return_rate.start_date
+     *
+     * @mbg.generated
+     */
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_return_rate.create_time
+     *
+     * @return the value of organization_return_rate.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.create_time
+     *
+     * @param createTime the value for organization_return_rate.create_time
+     *
+     * @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 organization_return_rate.update_time
+     *
+     * @return the value of organization_return_rate.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_return_rate.update_time
+     *
+     * @param updateTime the value for organization_return_rate.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_return_rate
+     *
+     * @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(", organizationId=").append(organizationId);
+        sb.append(", groupName=").append(groupName);
+        sb.append(", returnRate=").append(returnRate);
+        sb.append(", startDate=").append(startDate);
+        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/dto/organization/OrganizationTaxOfficerDto.java

+package pwc.taxtech.atms.dto.organization;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table organization_tax_officer
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OrganizationTaxOfficerDto implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.id
+     *
+     * @mbg.generated
+     */
+    @JsonSerialize(using = PwCIdSerialize.class)
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   专管员姓名
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.tax_officer_name
+     *
+     * @mbg.generated
+     */
+    private String taxOfficerName;
+
+    /**
+     * Database Column Remarks:
+     *   专管员电话
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.tax_officer_phone_num
+     *
+     * @mbg.generated
+     */
+    private String taxOfficerPhoneNum;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_tax_officer
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_officer.id
+     *
+     * @return the value of organization_tax_officer.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.id
+     *
+     * @param id the value for organization_tax_officer.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_officer.organization_id
+     *
+     * @return the value of organization_tax_officer.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.organization_id
+     *
+     * @param organizationId the value for organization_tax_officer.organization_id
+     *
+     * @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 organization_tax_officer.tax_officer_name
+     *
+     * @return the value of organization_tax_officer.tax_officer_name
+     *
+     * @mbg.generated
+     */
+    public String getTaxOfficerName() {
+        return taxOfficerName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.tax_officer_name
+     *
+     * @param taxOfficerName the value for organization_tax_officer.tax_officer_name
+     *
+     * @mbg.generated
+     */
+    public void setTaxOfficerName(String taxOfficerName) {
+        this.taxOfficerName = taxOfficerName == null ? null : taxOfficerName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_officer.tax_officer_phone_num
+     *
+     * @return the value of organization_tax_officer.tax_officer_phone_num
+     *
+     * @mbg.generated
+     */
+    public String getTaxOfficerPhoneNum() {
+        return taxOfficerPhoneNum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.tax_officer_phone_num
+     *
+     * @param taxOfficerPhoneNum the value for organization_tax_officer.tax_officer_phone_num
+     *
+     * @mbg.generated
+     */
+    public void setTaxOfficerPhoneNum(String taxOfficerPhoneNum) {
+        this.taxOfficerPhoneNum = taxOfficerPhoneNum == null ? null : taxOfficerPhoneNum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_officer.create_time
+     *
+     * @return the value of organization_tax_officer.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.create_time
+     *
+     * @param createTime the value for organization_tax_officer.create_time
+     *
+     * @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 organization_tax_officer.update_time
+     *
+     * @return the value of organization_tax_officer.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.update_time
+     *
+     * @param updateTime the value for organization_tax_officer.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_tax_officer
+     *
+     * @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(", organizationId=").append(organizationId);
+        sb.append(", taxOfficerName=").append(taxOfficerName);
+        sb.append(", taxOfficerPhoneNum=").append(taxOfficerPhoneNum);
+        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/dto/organization/OrganizationTaxRuleDto.java

+package pwc.taxtech.atms.dto.organization;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table organization_tax_rule
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OrganizationTaxRuleDto implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.id
+     *
+     * @mbg.generated
+     */
+    @JsonSerialize(using = PwCIdSerialize.class)
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   税种类型
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.group_name
+     *
+     * @mbg.generated
+     */
+    private String groupName;
+
+    /**
+     * Database Column Remarks:
+     *   税种申报周期.月度/季度/半年度/年度
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.tax_dec_cycle
+     *
+     * @mbg.generated
+     */
+    private String taxDecCycle;
+
+    /**
+     * Database Column Remarks:
+     *   税种申报方式.网报-CA、用户名密码；建议自己把各自负责的公司的网报账号、密码放到系统中，并更新
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.tax_dec_type
+     *
+     * @mbg.generated
+     */
+    private String taxDecType;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_rule.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_tax_rule
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_rule.id
+     *
+     * @return the value of organization_tax_rule.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.id
+     *
+     * @param id the value for organization_tax_rule.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_rule.organization_id
+     *
+     * @return the value of organization_tax_rule.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.organization_id
+     *
+     * @param organizationId the value for organization_tax_rule.organization_id
+     *
+     * @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 organization_tax_rule.group_name
+     *
+     * @return the value of organization_tax_rule.group_name
+     *
+     * @mbg.generated
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.group_name
+     *
+     * @param groupName the value for organization_tax_rule.group_name
+     *
+     * @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 organization_tax_rule.tax_dec_cycle
+     *
+     * @return the value of organization_tax_rule.tax_dec_cycle
+     *
+     * @mbg.generated
+     */
+    public String getTaxDecCycle() {
+        return taxDecCycle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.tax_dec_cycle
+     *
+     * @param taxDecCycle the value for organization_tax_rule.tax_dec_cycle
+     *
+     * @mbg.generated
+     */
+    public void setTaxDecCycle(String taxDecCycle) {
+        this.taxDecCycle = taxDecCycle == null ? null : taxDecCycle.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_rule.tax_dec_type
+     *
+     * @return the value of organization_tax_rule.tax_dec_type
+     *
+     * @mbg.generated
+     */
+    public String getTaxDecType() {
+        return taxDecType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.tax_dec_type
+     *
+     * @param taxDecType the value for organization_tax_rule.tax_dec_type
+     *
+     * @mbg.generated
+     */
+    public void setTaxDecType(String taxDecType) {
+        this.taxDecType = taxDecType == null ? null : taxDecType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_tax_rule.create_time
+     *
+     * @return the value of organization_tax_rule.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.create_time
+     *
+     * @param createTime the value for organization_tax_rule.create_time
+     *
+     * @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 organization_tax_rule.update_time
+     *
+     * @return the value of organization_tax_rule.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_rule.update_time
+     *
+     * @param updateTime the value for organization_tax_rule.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_tax_rule
+     *
+     * @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(", organizationId=").append(organizationId);
+        sb.append(", groupName=").append(groupName);
+        sb.append(", taxDecCycle=").append(taxDecCycle);
+        sb.append(", taxDecType=").append(taxDecType);
+        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/impl/OperationLogServiceImpl.java

@@ -52,11 +52,16 @@ public class OperationLogServiceImpl extends AbstractService {
         String table = OperateLogType.getTableName(logtype);
         Assert.hasText(table, "Empty tableName");
         record.setTableName(table);
-
-        record.setId(CommonUtils.getUUID());
+        // 股权变更记录不生成新id和创建时间
+        if(operationLogDto.isEquityLog()){
+            record.setId(operationLogDto.getId());
+            record.setCreateTime(operationLogDto.getCreateTime());
+        }else{
+            record.setId(CommonUtils.getUUID());
+            record.setCreateTime(new Date());
+        }
         record.setIp(authUserHelper.getClientIp());
         record.setOperationUser(authUserHelper.getCurrentAuditor().get());
-        record.setCreateTime(new Date());
 
         record.setOperationContent(operationLogDto.getOperationContent());
         Assert.notNull(operationLogDto.getModule(), "Null module");
@@ -178,6 +183,7 @@ public class OperationLogServiceImpl extends AbstractService {
         example.setOrderByClause("create_time desc");
         String searchText = queryOperateParamDto.getSearchText();
         if (StringUtils.hasText(searchText)) {
+            // todo 多个模糊查询的慢sql，可确认需求进行拆分
             String sqlValue = "%" + searchText + "%";
             Criteria criteria1 = example.createCriteria();
             criteria1.andModuleNameEqualTo(queryOperateParamDto.getModuleName());
@@ -479,4 +485,26 @@ public class OperationLogServiceImpl extends AbstractService {
         addLog.setLogType(logType.value());
         this.addOperationLog(addLog);
     }
+
+    /**
+     * 18/01/2019 14:15
+     * 根据机构名称获取股权变更记录
+     * [orgName]
+     * @author Gary J Li
+     * @return
+     */
+    public List<OperationLogBasicData> getEquityChangeLogByOrgName(String orgName) {
+        OperationLogBasicDataExample example = new OperationLogBasicDataExample();
+        example.createCriteria().andOperationObjectEqualTo(orgName).andOperationActionEqualTo(OperationAction.ChangeEquity.name());
+        Criteria criteria = example.createCriteria().andOperationActionEqualTo(OperationAction.NewEquity.name());
+        example.or(criteria);
+        example.setOrderByClause("create_time desc");
+        return operationLogBasicDataMapper.selectEquityLogByExample(example);
+    }
+
+    public int deleteById(Long id) {
+        OperationLogBasicDataExample example = new OperationLogBasicDataExample();
+        example.createCriteria().andIdEqualTo(String.valueOf(id));
+        return operationLogBasicDataMapper.deleteEquityLogByExample(example);
+    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/dao/EquityInformationHistoryMapper.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.entity.EquityInformation;
+import pwc.taxtech.atms.entity.EquityInformationExample;
+import pwc.taxtech.atms.entity.EquityInformationKey;
+
+@Mapper
+public interface EquityInformationHistoryMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    long countByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(EquityInformationKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int insert(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int insertSelective(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    List<EquityInformation> selectByExampleWithRowbounds(EquityInformationExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    List<EquityInformation> selectByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    EquityInformation selectByPrimaryKey(EquityInformationKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") EquityInformation record, @Param("example") EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") EquityInformation record, @Param("example") EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information_history
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(EquityInformation record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/EquityInformationMapper.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.entity.EquityInformation;
+import pwc.taxtech.atms.entity.EquityInformationExample;
+import pwc.taxtech.atms.entity.EquityInformationKey;
+
+@Mapper
+public interface EquityInformationMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    long countByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(EquityInformationKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int insert(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int insertSelective(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    List<EquityInformation> selectByExampleWithRowbounds(EquityInformationExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    List<EquityInformation> selectByExample(EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    EquityInformation selectByPrimaryKey(EquityInformationKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") EquityInformation record, @Param("example") EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") EquityInformation record, @Param("example") EquityInformationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(EquityInformation record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table equity_information
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(EquityInformation record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/OperationLogBasicDataMapper.java

@@ -28,6 +28,13 @@ public interface OperationLogBasicDataMapper extends MyMapper {
      * @mbg.generated
      */
     int deleteByExample(OperationLogBasicDataExample example);
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.OPERATION_LOG_BASIC_DATA
+     *
+     * @mbg.generated
+     */
+    int deleteEquityLogByExample(OperationLogBasicDataExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -69,6 +76,14 @@ public interface OperationLogBasicDataMapper extends MyMapper {
      */
     List<OperationLogBasicData> selectByExample(OperationLogBasicDataExample example);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table TAX_ADMIN.OPERATION_LOG_BASIC_DATA
+     *
+     * @mbg.generated
+     */
+    List<OperationLogBasicData> selectEquityLogByExample(OperationLogBasicDataExample example);
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table TAX_ADMIN.OPERATION_LOG_BASIC_DATA

atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationAccountingRateMapper.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 org.springframework.stereotype.Repository;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.OrganizationAccountingRate;
+import pwc.taxtech.atms.entity.OrganizationAccountingRateExample;
+
+@Mapper
+@Repository
+public interface OrganizationAccountingRateMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    long countByExample(OrganizationAccountingRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(OrganizationAccountingRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int insert(OrganizationAccountingRate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int insertSelective(OrganizationAccountingRate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    List<OrganizationAccountingRate> selectByExampleWithRowbounds(OrganizationAccountingRateExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    List<OrganizationAccountingRate> selectByExample(OrganizationAccountingRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    OrganizationAccountingRate selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") OrganizationAccountingRate record, @Param("example") OrganizationAccountingRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") OrganizationAccountingRate record, @Param("example") OrganizationAccountingRateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(OrganizationAccountingRate record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(OrganizationAccountingRate record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationApprovedLevyInfoMapper.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 org.springframework.stereotype.Repository;
+import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.OrganizationApprovedLevyInfo;
+import pwc.taxtech.atms.entity.OrganizationApprovedLevyInfoExample;
+
+@Mapper
+@Repository
+public interface OrganizationApprovedLevyInfoMapper extends MyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    long countByExample(OrganizationApprovedLevyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(OrganizationApprovedLevyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int insert(OrganizationApprovedLevyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int insertSelective(OrganizationApprovedLevyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    List<OrganizationApprovedLevyInfo> selectByExampleWithRowbounds(OrganizationApprovedLevyInfoExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    List<OrganizationApprovedLevyInfo> selectByExample(OrganizationApprovedLevyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    OrganizationApprovedLevyInfo selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") OrganizationApprovedLevyInfo record, @Param("example") OrganizationApprovedLevyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") OrganizationApprovedLevyInfo record, @Param("example") OrganizationApprovedLevyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(OrganizationApprovedLevyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_approved_levy_info
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(OrganizationApprovedLevyInfo record);
+}
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OperationLogBasicDataExtendsMapper.xml

@@ -86,7 +86,6 @@
     </trim>
   </insert>
 
-
   <select id="countByExampleSmart" parameterType="pwc.taxtech.atms.entity.OperationLogSmartExample" resultType="java.lang.Long">
     select count(*) from ${tableName}
     <if test="_parameter != null">

atms-web/src/main/webapp/app-resources/i18n/en-us/infrastructure.json

@@ -70,6 +70,7 @@
 	"ProjectYearCol" : "年份",
 	"AssignRoleCol" : "分配角色",
 	"SequenceNoCol":"序号",
+	"TaxGroup":"税种",
 	"ReportTemplate":"Report Template",
 
 	"OrganizationManage":"Organization Management",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -355,6 +355,7 @@
     "DeleteSuccess": "删除成功",
     "DeleteTbDataTip": "确定清除数据？清除后数据不可恢复",
     "DeleteTips": "请选择需要删除的数据",
+    "ClickEnsureTip": "点击确定,提交变更!",
     "DirectionDifferent": "借贷方向不一致",
     "Display": "显示",
     "DisplayCurrentPeriod": "仅显示当月",
@@ -784,6 +785,7 @@
     "StartRowNum": "起始行：",
     "StartRowNumberCheckMsg": "起始行不能大于当前导入数据总数！",
     "StartingDate": "开始日期",
+    "EndDate": "结束日期",
     "StdAccountMappingResult": "标准科目对应结果",
     "StdCodeDirection": "标准科目借贷方向",
     "StdGoodsName": "标准货物名称",