1、字段修改

2、税务信息添加雇员、资格信息
3、添加国际化校验，显示不同字段

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

@@ -50,7 +50,9 @@ public enum OperationModule {
     OrganizationApprovedLevyInfo(38),
     OrganizationTaxOfficer(39),
     OrganizationTaxRule(40),
-    Equity(41);
+    Equity(41),
+    OrganizationEmployee(42),
+    OrganizationTaxpayerQualification(43);
 
     private int value;
 

atms-api/src/main/java/pwc/taxtech/atms/common/message/LogMessage.java

@@ -48,6 +48,14 @@ public class LogMessage {
     public static final String  UpdateOrganizationTaxRule = "UpdateOrganizationTaxRule";
     public static final String  DeleteOrganizationTaxRule = "DeleteOrganizationTaxRule";
 
+    public static final String  AddOrganizationEmployee = "AddOrganizationEmployee";
+    public static final String  UpdateOrganizationEmployee = "UpdateOrganizationEmployee";
+    public static final String  DeleteOrganizationEmployee = "DeleteOrganizationEmployee";
+
+    public static final String  AddOrganizationTaxpayerQualification = "AddOrganizationTaxpayerQualification";
+    public static final String  UpdateOrganizationTaxpayerQualification = "UpdateOrganizationTaxpayerQualification";
+    public static final String  DeleteOrganizationTaxpayerQualification = "DeleteOrganizationTaxpayerQualification";
+
 
     public static final String  AddProject = "AddProject";
     public static final String  AddProjectServiceType = "AddProjectServiceType";

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

@@ -172,4 +172,56 @@ public class OrganizationExtraController {
         return organizationExtraServiceImpl.deleteTaxOfficer(id);
     }
 
+    // 机构其他信息-雇员信息列表
+
+    @RequestMapping(value = "employee/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationEmployeeDto> getEmployeeListByOrgId(@RequestParam("orgId") String orgId) {
+        return organizationExtraServiceImpl.getEmployeeListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "employee/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertEmployee(@RequestBody List<OrganizationEmployeeDto> organizationEmployeeDtos) {
+        return organizationExtraServiceImpl.insertAllEmployee(organizationEmployeeDtos);
+    }
+
+    @RequestMapping(value = "employee/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateEmployee(@RequestBody OrganizationEmployeeDto organizationEmployeeDto) {
+        return organizationExtraServiceImpl.updateEmployee(organizationEmployeeDto);
+    }
+
+    @RequestMapping(value = "employee/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteEmployee(@RequestParam Long id) {
+        return organizationExtraServiceImpl.deleteEmployee(id);
+    }
+
+    // 机构其他信息-资格列表
+
+    @RequestMapping(value = "taxpayerQualification/getListByOrgId", method = RequestMethod.GET)
+    public @ResponseBody
+    List<OrganizationTaxpayerQualificationDto> getTaxpayerQualificationListByOrgId(@RequestParam("orgId") String orgId) {
+        return organizationExtraServiceImpl.getTaxpayerQualificationListByOrgId(orgId);
+    }
+
+    @RequestMapping(value = "taxpayerQualification/insert", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public @ResponseBody
+    OperationResultDto<Object> insertTaxpayerQualification(@RequestBody List<OrganizationTaxpayerQualificationDto> organizationTaxpayerQualificationDtos) {
+        return organizationExtraServiceImpl.insertAllTaxpayerQualification(organizationTaxpayerQualificationDtos);
+    }
+
+    @RequestMapping(value = "taxpayerQualification/update", method = RequestMethod.POST)
+    public @ResponseBody
+    OperationResultDto<Object> updateTaxpayerQualification(@RequestBody OrganizationTaxpayerQualificationDto organizationTaxpayerQualificationDto) {
+        return organizationExtraServiceImpl.updateTaxpayerQualification(organizationTaxpayerQualificationDto);
+    }
+
+    @RequestMapping(value = "taxpayerQualification/delete", method = RequestMethod.GET)
+    public @ResponseBody
+    OperationResultDto<Object> deleteTaxpayerQualification(@RequestParam Long id) {
+        return organizationExtraServiceImpl.deleteTaxpayerQualification(id);
+    }
+
 }

atms-api/src/main/java/pwc/taxtech/atms/data/RoleData.java

@@ -44,7 +44,7 @@ public class RoleData {
         List<Role> roleList = new ArrayList<>();
         try{
             RoleExample roleExample = new RoleExample();
-            if(StringUtils.isNotBlank(serviceTypeId)){
+            if(!StringUtils.equals("All",serviceTypeId)){
                 roleExample.createCriteria().andServiceTypeIdEqualTo(serviceTypeId);
             }
             roleList = roleMapper.selectByExample(roleExample);

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

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.dto.organization;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import pwc.taxtech.atms.common.util.PwCIdSerialize;
+import pwc.taxtech.atms.entity.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -48,17 +49,6 @@ public class OrganizationApprovedLevyInfoDto implements Serializable {
      */
     private String approvedLevyProject;
 
-    /**
-     * Database Column Remarks:
-     *   核定征收品目
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    private String approvedLevyItems;
-
     /**
      * Database Column Remarks:
      *   核定有效期起
@@ -205,30 +195,6 @@ public class OrganizationApprovedLevyInfoDto implements Serializable {
         this.approvedLevyProject = approvedLevyProject == null ? null : approvedLevyProject.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @return the value of organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    public String getApprovedLevyItems() {
-        return approvedLevyItems;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @param approvedLevyItems the value for organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    public void setApprovedLevyItems(String approvedLevyItems) {
-        this.approvedLevyItems = approvedLevyItems == null ? null : approvedLevyItems.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_approved_levy_info.approved_validity_period_start_time
@@ -388,7 +354,6 @@ public class OrganizationApprovedLevyInfoDto implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", approvedLevyProject=").append(approvedLevyProject);
-        sb.append(", approvedLevyItems=").append(approvedLevyItems);
         sb.append(", approvedValidityPeriodStartTime=").append(approvedValidityPeriodStartTime);
         sb.append(", approvedValidityPeriodEndTime=").append(approvedValidityPeriodEndTime);
         sb.append(", approvedRate=").append(approvedRate);

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

+package pwc.taxtech.atms.dto.organization;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+import pwc.taxtech.atms.entity.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table organization_employee
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OrganizationEmployeeDto implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   系统唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.id
+     *
+     * @mbg.generated
+     */
+    @JsonSerialize(using = PwCIdSerialize.class)
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.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_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    private Integer employeesNumStart;
+
+    /**
+     * Database Column Remarks:
+     *   期末雇员人数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    private Integer employeesNumEnd;
+
+    /**
+     * Database Column Remarks:
+     *   统计月份.2019/2
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    private Date statisticalMonth;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.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_employee.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_employee
+     *
+     * @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_employee.id
+     *
+     * @return the value of organization_employee.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_employee.id
+     *
+     * @param id the value for organization_employee.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_employee.organization_id
+     *
+     * @return the value of organization_employee.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_employee.organization_id
+     *
+     * @param organizationId the value for organization_employee.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_employee.employees_num_start
+     *
+     * @return the value of organization_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    public Integer getEmployeesNumStart() {
+        return employeesNumStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.employees_num_start
+     *
+     * @param employeesNumStart the value for organization_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    public void setEmployeesNumStart(Integer employeesNumStart) {
+        this.employeesNumStart = employeesNumStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.employees_num_end
+     *
+     * @return the value of organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    public Integer getEmployeesNumEnd() {
+        return employeesNumEnd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.employees_num_end
+     *
+     * @param employeesNumEnd the value for organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    public void setEmployeesNumEnd(Integer employeesNumEnd) {
+        this.employeesNumEnd = employeesNumEnd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.statistical_month
+     *
+     * @return the value of organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    public Date getStatisticalMonth() {
+        return statisticalMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.statistical_month
+     *
+     * @param statisticalMonth the value for organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    public void setStatisticalMonth(Date statisticalMonth) {
+        this.statisticalMonth = statisticalMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.create_time
+     *
+     * @return the value of organization_employee.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_employee.create_time
+     *
+     * @param createTime the value for organization_employee.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_employee.update_time
+     *
+     * @return the value of organization_employee.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_employee.update_time
+     *
+     * @param updateTime the value for organization_employee.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_employee
+     *
+     * @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(", employeesNumStart=").append(employeesNumStart);
+        sb.append(", employeesNumEnd=").append(employeesNumEnd);
+        sb.append(", statisticalMonth=").append(statisticalMonth);
+        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/OrganizationInvoiceDto.java

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.dto.organization;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import pwc.taxtech.atms.common.util.PwCIdSerialize;
+import pwc.taxtech.atms.entity.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -39,7 +40,7 @@ public class OrganizationInvoiceDto implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   发票种类名称。支持添加多个发票种类
+     *   发票种类名称。增值税专用发票/增值税普通发票/机动车销售统一发票/其他票种
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization_invoice.invoice_type_name
@@ -48,6 +49,17 @@ public class OrganizationInvoiceDto implements Serializable {
      */
     private String invoiceTypeName;
 
+    /**
+     * Database Column Remarks:
+     *   单位。份、本、其他
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_invoice.unit
+     *
+     * @mbg.generated
+     */
+    private String unit;
+
     /**
      * Database Column Remarks:
      *   单份发票最高开票额
@@ -72,14 +84,14 @@ public class OrganizationInvoiceDto implements Serializable {
 
     /**
      * Database Column Remarks:
-     *   每月最高开票限额
+     *   单份发票最高开票限额
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_invoice.monthly_max_invoicing_limit
+     * This field corresponds to the database column organization_invoice.single_invoicing_max_limit
      *
      * @mbg.generated
      */
-    private Long monthlyMaxInvoicingLimit;
+    private Long singleInvoicingMaxLimit;
 
     /**
      * Database Column Remarks:
@@ -92,17 +104,6 @@ public class OrganizationInvoiceDto implements Serializable {
      */
     private String offlineBillingTimeLimit;
 
-    /**
-     * Database Column Remarks:
-     *   离线开票累计限额
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_invoice.offline_billing_cumulative_limit
-     *
-     * @mbg.generated
-     */
-    private Long offlineBillingCumulativeLimit;
-
     /**
      * Database Column Remarks:
      *   创建时间
@@ -205,6 +206,30 @@ public class OrganizationInvoiceDto implements Serializable {
         this.invoiceTypeName = invoiceTypeName == null ? null : invoiceTypeName.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_invoice.unit
+     *
+     * @return the value of organization_invoice.unit
+     *
+     * @mbg.generated
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_invoice.unit
+     *
+     * @param unit the value for organization_invoice.unit
+     *
+     * @mbg.generated
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_invoice.single_invoice_max_invoice_amount
@@ -255,26 +280,26 @@ public class OrganizationInvoiceDto implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_invoice.monthly_max_invoicing_limit
+     * This method returns the value of the database column organization_invoice.single_invoicing_max_limit
      *
-     * @return the value of organization_invoice.monthly_max_invoicing_limit
+     * @return the value of organization_invoice.single_invoicing_max_limit
      *
      * @mbg.generated
      */
-    public Long getMonthlyMaxInvoicingLimit() {
-        return monthlyMaxInvoicingLimit;
+    public Long getSingleInvoicingMaxLimit() {
+        return singleInvoicingMaxLimit;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_invoice.monthly_max_invoicing_limit
+     * This method sets the value of the database column organization_invoice.single_invoicing_max_limit
      *
-     * @param monthlyMaxInvoicingLimit the value for organization_invoice.monthly_max_invoicing_limit
+     * @param singleInvoicingMaxLimit the value for organization_invoice.single_invoicing_max_limit
      *
      * @mbg.generated
      */
-    public void setMonthlyMaxInvoicingLimit(Long monthlyMaxInvoicingLimit) {
-        this.monthlyMaxInvoicingLimit = monthlyMaxInvoicingLimit;
+    public void setSingleInvoicingMaxLimit(Long singleInvoicingMaxLimit) {
+        this.singleInvoicingMaxLimit = singleInvoicingMaxLimit;
     }
 
     /**
@@ -301,30 +326,6 @@ public class OrganizationInvoiceDto implements Serializable {
         this.offlineBillingTimeLimit = offlineBillingTimeLimit == null ? null : offlineBillingTimeLimit.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_invoice.offline_billing_cumulative_limit
-     *
-     * @return the value of organization_invoice.offline_billing_cumulative_limit
-     *
-     * @mbg.generated
-     */
-    public Long getOfflineBillingCumulativeLimit() {
-        return offlineBillingCumulativeLimit;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_invoice.offline_billing_cumulative_limit
-     *
-     * @param offlineBillingCumulativeLimit the value for organization_invoice.offline_billing_cumulative_limit
-     *
-     * @mbg.generated
-     */
-    public void setOfflineBillingCumulativeLimit(Long offlineBillingCumulativeLimit) {
-        this.offlineBillingCumulativeLimit = offlineBillingCumulativeLimit;
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_invoice.create_time
@@ -388,11 +389,11 @@ public class OrganizationInvoiceDto implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", invoiceTypeName=").append(invoiceTypeName);
+        sb.append(", unit=").append(unit);
         sb.append(", singleInvoiceMaxInvoiceAmount=").append(singleInvoiceMaxInvoiceAmount);
         sb.append(", monthlyMaxTicketsPurchased=").append(monthlyMaxTicketsPurchased);
-        sb.append(", monthlyMaxInvoicingLimit=").append(monthlyMaxInvoicingLimit);
+        sb.append(", singleInvoicingMaxLimit=").append(singleInvoicingMaxLimit);
         sb.append(", offlineBillingTimeLimit=").append(offlineBillingTimeLimit);
-        sb.append(", offlineBillingCumulativeLimit=").append(offlineBillingCumulativeLimit);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

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

@@ -59,6 +59,9 @@ public class OrganizationTaxOfficerDto implements Serializable {
      */
     private String taxOfficerPhoneNum;
 
+    private String remark;
+
+
     /**
      * Database Column Remarks:
      *   创建时间
@@ -233,12 +236,22 @@ public class OrganizationTaxOfficerDto implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     /**
      * 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();

atms-api/src/main/java/pwc/taxtech/atms/security/JwtAuthenticationService.java

@@ -70,18 +70,6 @@ public class JwtAuthenticationService {
             apiAuthList.addAll(Arrays.stream(permission.getOperationPermList().split("\\|")).filter(p -> StringUtils.isNotBlank(p)).collect(Collectors.toList()));
         });
 
-        /*apiAuthList.add("user:add");
-        apiAuthList.add("cit:apply");
-        apiAuthList.add("user:edit");
-        apiAuthList.add("userRole:add");
-        apiAuthList.add("userRole:edit");
-        apiAuthList.add("role:add");
-        apiAuthList.add("role:edit");
-        apiAuthList.add("roleCategory:add");
-        apiAuthList.add("roleCategory:edit");
-        apiAuthList.add("vatApproval:commit");
-        apiAuthList.add("vatApproval:check");*/
-
         logger.debug("get Cache from upm :"+"apiAuthCache-"+"key :"+userid + " value :"+String.join("，",apiAuthList));
         return apiAuthList;
     }

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

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import pwc.taxtech.atms.common.CommonConstants;
 import pwc.taxtech.atms.common.CommonUtils;
+import pwc.taxtech.atms.data.RoleData;
 import pwc.taxtech.atms.dto.datainit.DataCountDto;
 import pwc.taxtech.atms.dto.datainit.DataInitDto;
 import pwc.taxtech.atms.dto.user.UserTemp;
@@ -30,6 +31,9 @@ public class DataInitServiceImpl extends AbstractService {
     @Autowired
     private FileService fileService;
 
+    @Autowired
+    private RoleData roleData;
+
     /*
      * (non-Javadoc)
      *
@@ -912,7 +916,8 @@ public class DataInitServiceImpl extends AbstractService {
                 RoleCategory newObject = queryList.stream().filter(a -> Objects.equals(a.getName(), oldId)).findFirst().orElse(null);
                 role.setRoleCategoryId(newObject == null ? null : newObject.getId());
                 try {
-                    roleMapper.insert(role);
+//                    roleMapper.insert(role);
+                    roleData.insert(role);
                 } catch (Exception e) {
                     logger.debug("Error inserting 角色: " + e.getMessage());
                     errorCount++;
@@ -945,8 +950,8 @@ public class DataInitServiceImpl extends AbstractService {
             // 插入User
             userTempList = dataInitDto.getImportUserTemp();
             List<Organization> orgList = organizationMapper.selectByExample(null);
-            List<Role> roleList = roleMapper.selectByExample(null);
-
+//            List<Role> roleList = roleMapper.selectByExample(null);
+            List<Role> roleList = roleData.selectByServiceTypeId("All");
             for (UserTemp item : userTempList) {
                 try {
                     User user = new User();

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

@@ -11,29 +11,37 @@ import pwc.taxtech.atms.dto.OperationLogDto;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.organization.*;
 import pwc.taxtech.atms.entity.*;
+
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 @Service
 public class OrganizationExtraServiceImpl extends BaseService{
 
-    @Autowired
+    @Resource
     private OrganizationInvoiceMapper organizationInvoiceMapper;
 
-    @Autowired
+    @Resource
     private OrganizationAccountingRateMapper organizationAccountingRateMapper;
 
-    @Autowired
+    @Resource
     private OrganizationReturnRateMapper organizationReturnRateMapper;
 
-    @Autowired
+    @Resource
     private OrganizationApprovedLevyInfoMapper organizationApprovedLevyInfoMapper;
 
-    @Autowired
+    @Resource
     private OrganizationTaxOfficerMapper organizationTaxOfficerMapper;
 
-    @Autowired
+    @Resource
     private OrganizationTaxRuleMapper organizationTaxRuleMapper;
 
+    @Resource
+    private OrganizationEmployeeMapper organizationEmployeeMapper;
+
+    @Resource
+    private OrganizationTaxpayerQualificationMapper organizationTaxpayerQualificationMapper;
+
     public List<OrganizationInvoiceDto> getInvoiceListByOrgId(String orgId) {
         List<OrganizationInvoiceDto> res = new ArrayList<>();
         OrganizationInvoiceExample example = new OrganizationInvoiceExample();
@@ -293,6 +301,92 @@ public class OrganizationExtraServiceImpl extends BaseService{
         return new OperationResultDto(true);
     }
 
+    public List<OrganizationEmployeeDto> getEmployeeListByOrgId(String orgId) {
+        List<OrganizationEmployeeDto> res = new ArrayList<>();
+        OrganizationEmployeeExample example = new OrganizationEmployeeExample();
+        example.createCriteria().andOrganizationIdEqualTo(orgId);
+        List<OrganizationEmployee> organizationEmployees = organizationEmployeeMapper.selectByExample(example);
+        organizationEmployees.forEach(oe -> {
+                OrganizationEmployeeDto organizationEmployeeDto = new OrganizationEmployeeDto();
+                    beanUtil.copyProperties(oe, organizationEmployeeDto);
+                    res.add(organizationEmployeeDto);
+                }
+        );
+        return res;
+    }
+
+    public OperationResultDto<Object> insertAllEmployee(List<OrganizationEmployeeDto> organizationEmployeeDtos) {
+        organizationEmployeeDtos.forEach(oed->{
+            OrganizationEmployee organizationEmployee = new OrganizationEmployee();
+            beanUtil.copyProperties(oed,organizationEmployee);
+            organizationEmployee.setId(idService.nextId());
+            organizationEmployeeMapper.insertSelective(organizationEmployee);
+        });
+        AddOrgExtraLog(OperationAction.New.value(),LogMessage.AddOrganizationEmployee,organizationEmployeeDtos.get(0).getOrganizationId(),OperationModule.OrganizationEmployee.value());
+        return new OperationResultDto(true);
+    }
+
+    public OperationResultDto<Object> updateEmployee(OrganizationEmployeeDto organizationEmployeeDto) {
+        OrganizationEmployeeExample example = new OrganizationEmployeeExample();
+        example.createCriteria().andIdEqualTo(organizationEmployeeDto.getId());
+        OrganizationEmployee organizationEmployee = new OrganizationEmployee();
+        beanUtil.copyProperties(organizationEmployeeDto,organizationEmployee);
+        organizationEmployeeMapper.updateByExampleSelective(organizationEmployee,example);
+        AddOrgExtraLog(OperationAction.Update.value(),LogMessage.UpdateOrganizationEmployee,organizationEmployeeDto.getOrganizationId(),OperationModule.OrganizationEmployee.value());
+        return new OperationResultDto(true);
+    }
+
+    public OperationResultDto<Object> deleteEmployee(Long id) {
+        OrganizationEmployeeExample example = new OrganizationEmployeeExample();
+        example.createCriteria().andIdEqualTo(id);
+        organizationEmployeeMapper.deleteByExample(example);
+        AddOrgExtraLog(OperationAction.Delete.value(),LogMessage.DeleteOrganizationEmployee,String.valueOf(id),OperationModule.OrganizationEmployee.value());
+        return new OperationResultDto(true);
+    }
+
+    public List<OrganizationTaxpayerQualificationDto> getTaxpayerQualificationListByOrgId(String orgId) {
+        List<OrganizationTaxpayerQualificationDto> res = new ArrayList<>();
+        OrganizationTaxpayerQualificationExample example = new OrganizationTaxpayerQualificationExample();
+        example.createCriteria().andOrganizationIdEqualTo(orgId);
+        List<OrganizationTaxpayerQualification> organizationTaxpayerQualifications = organizationTaxpayerQualificationMapper.selectByExample(example);
+        organizationTaxpayerQualifications.forEach(oe -> {
+                    OrganizationTaxpayerQualificationDto organizationTaxpayerQualificationDto = new OrganizationTaxpayerQualificationDto();
+                    beanUtil.copyProperties(oe, organizationTaxpayerQualificationDto);
+                    res.add(organizationTaxpayerQualificationDto);
+                }
+        );
+        return res;
+    }
+
+    public OperationResultDto<Object> insertAllTaxpayerQualification(List<OrganizationTaxpayerQualificationDto> organizationTaxpayerQualificationDtos) {
+        organizationTaxpayerQualificationDtos.forEach(oed->{
+            OrganizationTaxpayerQualification organizationTaxpayerQualification = new OrganizationTaxpayerQualification();
+            beanUtil.copyProperties(oed,organizationTaxpayerQualification);
+            organizationTaxpayerQualification.setId(idService.nextId());
+            organizationTaxpayerQualificationMapper.insertSelective(organizationTaxpayerQualification);
+        });
+        AddOrgExtraLog(OperationAction.New.value(),LogMessage.AddOrganizationTaxpayerQualification,organizationTaxpayerQualificationDtos.get(0).getOrganizationId(),OperationModule.OrganizationTaxpayerQualification.value());
+        return new OperationResultDto(true);
+    }
+
+    public OperationResultDto<Object> updateTaxpayerQualification(OrganizationTaxpayerQualificationDto organizationTaxpayerQualificationDto) {
+        OrganizationTaxpayerQualificationExample example = new OrganizationTaxpayerQualificationExample();
+        example.createCriteria().andIdEqualTo(organizationTaxpayerQualificationDto.getId());
+        OrganizationTaxpayerQualification organizationTaxpayerQualification = new OrganizationTaxpayerQualification();
+        beanUtil.copyProperties(organizationTaxpayerQualificationDto,organizationTaxpayerQualification);
+        organizationTaxpayerQualificationMapper.updateByExampleSelective(organizationTaxpayerQualification,example);
+        AddOrgExtraLog(OperationAction.Update.value(),LogMessage.UpdateOrganizationTaxpayerQualification,organizationTaxpayerQualificationDto.getOrganizationId(),OperationModule.OrganizationTaxpayerQualification.value());
+        return new OperationResultDto(true);
+    }
+
+    public OperationResultDto<Object> deleteTaxpayerQualification(Long id) {
+        OrganizationTaxpayerQualificationExample example = new OrganizationTaxpayerQualificationExample();
+        example.createCriteria().andIdEqualTo(id);
+        organizationTaxpayerQualificationMapper.deleteByExample(example);
+        AddOrgExtraLog(OperationAction.Delete.value(),LogMessage.DeleteOrganizationTaxpayerQualification,String.valueOf(id),OperationModule.OrganizationTaxpayerQualification.value());
+        return new OperationResultDto(true);
+    }
+
 
     /**
      * 24/01/2019 10:41

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

@@ -79,7 +79,7 @@ public class RoleServiceImpl extends AbstractService {
         roleCategoryExample.createCriteria().andIsActiveEqualTo(CommonConstants.ACTIVE_STATUS);
         List<RoleCategory> roleCategoryList = roleCategoryMapper.selectByExample(roleCategoryExample);
 //        List<Role> allRoleList = roleMapper.selectByExample(new RoleExample());
-        List<Role> allRoleList = roleData.selectByServiceTypeId(null);
+        List<Role> allRoleList = roleData.selectByServiceTypeId("All");
         List<NavTreeDto> retList = new ArrayList<>();
         for (RoleCategory category : roleCategoryList) {
             NavTreeDto treeDto = new NavTreeDto();
@@ -190,7 +190,7 @@ public class RoleServiceImpl extends AbstractService {
     private List<Role> findAll() {
         RoleExample roleExample = new RoleExample();
 //        return roleMapper.selectByExample(roleExample);
-        return roleData.selectByServiceTypeId(null);
+        return roleData.selectByServiceTypeId("All");
     }
 
     private List<UserRole> findAllUserRoles() {
@@ -1471,7 +1471,7 @@ public class RoleServiceImpl extends AbstractService {
 
         // 角色列表
 //        List<Role> roles = roleMapper.selectByExample(null);
-        List<Role> roles = roleData.selectByServiceTypeId(null);
+        List<Role> roles = roleData.selectByServiceTypeId("All");
         List<NameDto> roleList = new ArrayList<>();
         roles.stream().forEach(role -> {
             NameDto nameDto = new NameDto();
@@ -1972,7 +1972,7 @@ public class RoleServiceImpl extends AbstractService {
         List<User> userList = userMapper.selectByExample(new UserExample());
         // 角色列表
 //        List<Role> roleList = roleMapper.selectByExample(new RoleExample());
-        List<Role> roleList = roleData.selectByServiceTypeId(null);
+        List<Role> roleList = roleData.selectByServiceTypeId("All");
         List<UserDimensionValueRoleDto> group = userDimensionValueRoleDtoList.stream()
                 .map(this::convertUserDimensionValueRoleDtoForDistinct).distinct().collect(Collectors.toList());
         for (UserDimensionValueRoleDto item : group) {
@@ -2133,7 +2133,7 @@ public class RoleServiceImpl extends AbstractService {
         // 角色列表
         /*List<NameDto> roleList = roleMapper.selectByExample(new RoleExample()).stream()
                 .map(sa -> CommonUtils.copyProperties(sa, new NameDto())).collect(toList());*/
-        List<NameDto> roleList = roleData.selectByServiceTypeId(null).stream()
+        List<NameDto> roleList = roleData.selectByServiceTypeId("All").stream()
                 .map(sa -> CommonUtils.copyProperties(sa, new NameDto())).collect(toList());
         // 获取原始角色列表
         List<UserRoleSimpleDto> userRoleList = getOriginalUserRoleList(roleList);

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

@@ -316,7 +316,7 @@ public class UserAccountServiceImpl extends AbstractService {
         userMapper.insert(user);
         List<String> arrRoles = userAndUserRoleSaveDto.getRoleIds();
 //        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
-        List<Role> roleQuery = roleData.selectByServiceTypeId(null);
+        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
         if (arrRoles != null && !arrRoles.isEmpty()) {
             for (String role : arrRoles) {
                 UserRole userRole = new UserRole();

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

@@ -715,7 +715,7 @@ public class UserServiceImpl extends AbstractService {
             userRoleMapper.deleteByPrimaryKey(userRole.getId());
         }
 //        List<Role> roleQuery = roleMapper.selectByExample(new RoleExample());
-        List<Role> roleQuery = roleData.selectByServiceTypeId(null);
+        List<Role> roleQuery = roleData.selectByServiceTypeId("All");
         for (String role : userDto.getRoleIds()) {
             if (oldUserRoleList.stream().anyMatch(sa -> Objects.equals(sa.getRoleId(), role))) {
                 continue;

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

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

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationDto.java

@@ -91,7 +91,9 @@ public class OrganizationDto {
 
     private String businessScope;
 
-    private Boolean isOversea;
+    private Boolean oversea;
+
+    private Date logoutTime;
 
     public List<EnterpriseAccountSetOrgDto> enterpriseAccountSetOrgList;
     public List<OrganizationServiceTemplateGroupDto> organizationServiceTemplateGroupList;
@@ -212,6 +214,14 @@ public class OrganizationDto {
         this.isActive = isActive;
     }
 
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    public void setActive(Boolean active) {
+        isActive = active;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -598,11 +608,19 @@ public class OrganizationDto {
     }
 
     public Boolean getOversea() {
-        return isOversea;
+        return oversea;
     }
 
     public void setOversea(Boolean oversea) {
-        isOversea = oversea;
+        this.oversea = oversea;
+    }
+
+    public Date getLogoutTime() {
+        return logoutTime;
+    }
+
+    public void setLogoutTime(Date logoutTime) {
+        this.logoutTime = logoutTime;
     }
 
     @Override

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

@@ -44,17 +44,6 @@ public class OrganizationApprovedLevyInfo extends BaseEntity implements Serializ
      */
     private String approvedLevyProject;
 
-    /**
-     * Database Column Remarks:
-     *   核定征收品目
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    private String approvedLevyItems;
-
     /**
      * Database Column Remarks:
      *   核定有效期起
@@ -201,30 +190,6 @@ public class OrganizationApprovedLevyInfo extends BaseEntity implements Serializ
         this.approvedLevyProject = approvedLevyProject == null ? null : approvedLevyProject.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @return the value of organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    public String getApprovedLevyItems() {
-        return approvedLevyItems;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column organization_approved_levy_info.approved_levy_items
-     *
-     * @param approvedLevyItems the value for organization_approved_levy_info.approved_levy_items
-     *
-     * @mbg.generated
-     */
-    public void setApprovedLevyItems(String approvedLevyItems) {
-        this.approvedLevyItems = approvedLevyItems == null ? null : approvedLevyItems.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_approved_levy_info.approved_validity_period_start_time
@@ -384,7 +349,6 @@ public class OrganizationApprovedLevyInfo extends BaseEntity implements Serializ
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", approvedLevyProject=").append(approvedLevyProject);
-        sb.append(", approvedLevyItems=").append(approvedLevyItems);
         sb.append(", approvedValidityPeriodStartTime=").append(approvedValidityPeriodStartTime);
         sb.append(", approvedValidityPeriodEndTime=").append(approvedValidityPeriodEndTime);
         sb.append(", approvedRate=").append(approvedRate);

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

@@ -395,76 +395,6 @@ public class OrganizationApprovedLevyInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andApprovedLevyItemsIsNull() {
-            addCriterion("approved_levy_items is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsIsNotNull() {
-            addCriterion("approved_levy_items is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsEqualTo(String value) {
-            addCriterion("approved_levy_items =", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsNotEqualTo(String value) {
-            addCriterion("approved_levy_items <>", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsGreaterThan(String value) {
-            addCriterion("approved_levy_items >", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsGreaterThanOrEqualTo(String value) {
-            addCriterion("approved_levy_items >=", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsLessThan(String value) {
-            addCriterion("approved_levy_items <", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsLessThanOrEqualTo(String value) {
-            addCriterion("approved_levy_items <=", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsLike(String value) {
-            addCriterion("approved_levy_items like", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsNotLike(String value) {
-            addCriterion("approved_levy_items not like", value, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsIn(List<String> values) {
-            addCriterion("approved_levy_items in", values, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsNotIn(List<String> values) {
-            addCriterion("approved_levy_items not in", values, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsBetween(String value1, String value2) {
-            addCriterion("approved_levy_items between", value1, value2, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
-        public Criteria andApprovedLevyItemsNotBetween(String value1, String value2) {
-            addCriterion("approved_levy_items not between", value1, value2, "approvedLevyItems");
-            return (Criteria) this;
-        }
-
         public Criteria andApprovedValidityPeriodStartTimeIsNull() {
             addCriterion("approved_validity_period_start_time is null");
             return (Criteria) this;

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

+package pwc.taxtech.atms.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table organization_employee
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class OrganizationEmployee extends BaseEntity implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   系统唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.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_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    private Integer employeesNumStart;
+
+    /**
+     * Database Column Remarks:
+     *   期末雇员人数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    private Integer employeesNumEnd;
+
+    /**
+     * Database Column Remarks:
+     *   统计月份.2019/2
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    private Date statisticalMonth;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_employee.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_employee.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table organization_employee
+     *
+     * @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_employee.id
+     *
+     * @return the value of organization_employee.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_employee.id
+     *
+     * @param id the value for organization_employee.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_employee.organization_id
+     *
+     * @return the value of organization_employee.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_employee.organization_id
+     *
+     * @param organizationId the value for organization_employee.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_employee.employees_num_start
+     *
+     * @return the value of organization_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    public Integer getEmployeesNumStart() {
+        return employeesNumStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.employees_num_start
+     *
+     * @param employeesNumStart the value for organization_employee.employees_num_start
+     *
+     * @mbg.generated
+     */
+    public void setEmployeesNumStart(Integer employeesNumStart) {
+        this.employeesNumStart = employeesNumStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.employees_num_end
+     *
+     * @return the value of organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    public Integer getEmployeesNumEnd() {
+        return employeesNumEnd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.employees_num_end
+     *
+     * @param employeesNumEnd the value for organization_employee.employees_num_end
+     *
+     * @mbg.generated
+     */
+    public void setEmployeesNumEnd(Integer employeesNumEnd) {
+        this.employeesNumEnd = employeesNumEnd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.statistical_month
+     *
+     * @return the value of organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    public Date getStatisticalMonth() {
+        return statisticalMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_employee.statistical_month
+     *
+     * @param statisticalMonth the value for organization_employee.statistical_month
+     *
+     * @mbg.generated
+     */
+    public void setStatisticalMonth(Date statisticalMonth) {
+        this.statisticalMonth = statisticalMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization_employee.create_time
+     *
+     * @return the value of organization_employee.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_employee.create_time
+     *
+     * @param createTime the value for organization_employee.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_employee.update_time
+     *
+     * @return the value of organization_employee.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_employee.update_time
+     *
+     * @param updateTime the value for organization_employee.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_employee
+     *
+     * @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(", employeesNumStart=").append(employeesNumStart);
+        sb.append(", employeesNumEnd=").append(employeesNumEnd);
+        sb.append(", statisticalMonth=").append(statisticalMonth);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

@@ -55,6 +55,17 @@ public class OrganizationTaxOfficer extends BaseEntity implements Serializable {
      */
     private String taxOfficerPhoneNum;
 
+    /**
+     * Database Column Remarks:
+     *   备注.填写专管员特长等信息
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_tax_officer.remark
+     *
+     * @mbg.generated
+     */
+    private String remark;
+
     /**
      * Database Column Remarks:
      *   创建时间
@@ -181,6 +192,30 @@ public class OrganizationTaxOfficer extends BaseEntity implements Serializable {
         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.remark
+     *
+     * @return the value of organization_tax_officer.remark
+     *
+     * @mbg.generated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_tax_officer.remark
+     *
+     * @param remark the value for organization_tax_officer.remark
+     *
+     * @mbg.generated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column organization_tax_officer.create_time
@@ -245,6 +280,7 @@ public class OrganizationTaxOfficer extends BaseEntity implements Serializable {
         sb.append(", organizationId=").append(organizationId);
         sb.append(", taxOfficerName=").append(taxOfficerName);
         sb.append(", taxOfficerPhoneNum=").append(taxOfficerPhoneNum);
+        sb.append(", remark=").append(remark);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

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

@@ -89,6 +89,7 @@
     "BusinessAllottedTimeTo": "营业期限截止",
     "BusinessPromition": "业务宣传费",
     "BusinessScope": "经营范围",
+    "RegStatus": "工商登记状态",
     "BusinessUnit": "事业部",
     "BusinessUnitDesc": "事业部",
     "BusinessUnitID": "事业部",
@@ -359,7 +360,19 @@
     "LandAppreciationTax": "土地增值税",
     "LastMonth": "上月实际",
     "LegalCode": "法人代码",
-    "LegalPersonName": "法人名称",
+    "LegalPersonName": "法定代表人/负责人名称",
+    "LegalPersonPhoneNumber": "法定代表人/负责人手机",
+    "LegalPersonLandlineNum": "法定代表人/负责人座机",
+    "LegalPersonEmailAddress": "法定代表人/负责人邮箱",
+    "RegFinancialOfficerName": "注册登记财务负责人姓名",
+    "RegFinancialOfficerPhoneNum": "注册登记财务负责人手机",
+    "RegFinancialOfficerLandlineNum": "注册登记财务负责人座机",
+    "RegFinancialOfficerEmailAddress": "注册登记财务负责人邮箱",
+    "SecondaryApprovalAmount": "二级审批金额",
+    "BusinessRegistrationNumber": "Business registration number",
+    "ParValue": "Par Value",
+    "IssuedShares": "Issued shares",
+    "Directors": "Directors",
     "LegalPersonIdNum": "法人身份证号",
     "LessThan": "及以下",
     "LinkToIssue": "关联事项",
@@ -572,7 +585,7 @@
     "RegionManageLog": "日志-区域管理",
     "RegistrationAddress": "注册地址",
     "RegistrationAddressEn": "注册地址(英文)",
-    "RegistrationCapital": "注册资本（万元）",
+    "RegistrationCapital": "注册资本(万元)",
     "PaidInCapital": "实缴资本(万元)",
     "UpdateType": "更新方式",
     "RegistrationDate": "注册日期",