1、fixbug

2、添加国家字段

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

@@ -175,6 +175,8 @@ public class OrgInfoDto {
     private Date logoutTime;
     @ExcelCell(index=75)
     private String taxRuleIntroduction;
+    @ExcelCell(index=76)
+    private String country;
 
     public String getId() {
         return id;
@@ -839,4 +841,12 @@ public class OrgInfoDto {
     public void setTaxRuleIntroduction(String taxRuleIntroduction) {
         this.taxRuleIntroduction = taxRuleIntroduction;
     }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
 }

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

@@ -3214,6 +3214,7 @@ public class OrganizationServiceImpl extends BaseService{
         header.put("OtherFacts","其他情况说明");
         header.put("LogoutTime","注销时间");
         header.put("TaxRuleIntroduction","税制简介");
+        header.put("Country","国家");
         return header;
     }
 

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

@@ -546,6 +546,17 @@ public class Organization extends BaseEntity implements Serializable {
      */
     private String psCode;
 
+    /**
+     * Database Column Remarks:
+     *   国家
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
     private Area area;
 
     private BusinessUnit businessUnit;
@@ -1878,6 +1889,30 @@ public class Organization extends BaseEntity implements Serializable {
         this.psCode = psCode == null ? null : psCode.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization.country
+     *
+     * @return the value of organization.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization.country
+     *
+     * @param country the value for organization.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
     public Area getArea() {
         return area;
     }
@@ -1961,6 +1996,7 @@ public class Organization extends BaseEntity implements Serializable {
         sb.append(", currencyCode=").append(currencyCode);
         sb.append(", legalEntity=").append(legalEntity);
         sb.append(", psCode=").append(psCode);
+        sb.append(", country=").append(country);
         sb.append("]");
         return sb.toString();
     }

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

@@ -3894,6 +3894,76 @@ public class OrganizationExample {
             addCriterion("ps_code not between", value1, value2, "psCode");
             return (Criteria) this;
         }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -61,6 +61,7 @@
     <result column="currency_code" jdbcType="VARCHAR" property="currencyCode" />
     <result column="legal_entity" jdbcType="VARCHAR" property="legalEntity" />
     <result column="ps_code" jdbcType="VARCHAR" property="psCode" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -143,7 +144,7 @@
     api_update_flag, effec_time_of_general_taxpayers, registration_location_en, paid_in_capital, 
     general_tax_payer_effective_time, oversea, reg_status, national_economic_industry, 
     engage_national_prohibit_industry, logout_time, enterprise_account_code, enterprise_account_name, 
-    currency_code, legal_entity, ps_code
+    currency_code, legal_entity, ps_code, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultMap="BaseResultMap">
     <!--
@@ -215,8 +216,8 @@
       general_tax_payer_effective_time, oversea, reg_status, 
       national_economic_industry, engage_national_prohibit_industry, 
       logout_time, enterprise_account_code, enterprise_account_name, 
-      currency_code, legal_entity, ps_code
-      )
+      currency_code, legal_entity, ps_code, 
+      country)
     values (#{id,jdbcType=VARCHAR}, #{clientCode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{code,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{taxPayerNumber,jdbcType=VARCHAR}, 
       #{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR}, 
@@ -236,8 +237,8 @@
       #{generalTaxPayerEffectiveTime,jdbcType=TIMESTAMP}, #{oversea,jdbcType=BIT}, #{regStatus,jdbcType=VARCHAR}, 
       #{nationalEconomicIndustry,jdbcType=VARCHAR}, #{engageNationalProhibitIndustry,jdbcType=BIT}, 
       #{logoutTime,jdbcType=TIMESTAMP}, #{enterpriseAccountCode,jdbcType=VARCHAR}, #{enterpriseAccountName,jdbcType=VARCHAR}, 
-      #{currencyCode,jdbcType=VARCHAR}, #{legalEntity,jdbcType=VARCHAR}, #{psCode,jdbcType=VARCHAR}
-      )
+      #{currencyCode,jdbcType=VARCHAR}, #{legalEntity,jdbcType=VARCHAR}, #{psCode,jdbcType=VARCHAR}, 
+      #{country,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.Organization">
     <!--
@@ -411,6 +412,9 @@
       <if test="psCode != null">
         ps_code,
       </if>
+      <if test="country != null">
+        country,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -578,6 +582,9 @@
       <if test="psCode != null">
         #{psCode,jdbcType=VARCHAR},
       </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultType="java.lang.Long">
@@ -762,6 +769,9 @@
       <if test="record.psCode != null">
         ps_code = #{record.psCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -827,7 +837,8 @@
       enterprise_account_name = #{record.enterpriseAccountName,jdbcType=VARCHAR},
       currency_code = #{record.currencyCode,jdbcType=VARCHAR},
       legal_entity = #{record.legalEntity,jdbcType=VARCHAR},
-      ps_code = #{record.psCode,jdbcType=VARCHAR}
+      ps_code = #{record.psCode,jdbcType=VARCHAR},
+      country = #{record.country,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1001,6 +1012,9 @@
       <if test="psCode != null">
         ps_code = #{psCode,jdbcType=VARCHAR},
       </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1063,7 +1077,8 @@
       enterprise_account_name = #{enterpriseAccountName,jdbcType=VARCHAR},
       currency_code = #{currencyCode,jdbcType=VARCHAR},
       legal_entity = #{legalEntity,jdbcType=VARCHAR},
-      ps_code = #{psCode,jdbcType=VARCHAR}
+      ps_code = #{psCode,jdbcType=VARCHAR},
+      country = #{country,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultMap="BaseResultMap">

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -329,7 +329,15 @@ var frameworkModule = angular.module('app.framework', ['app.webservices', 'app.c
                                 appTranslation.load([appTranslation.appPart]);
                             }],
                         template: '<app-tax-analysis></app-tax-analysis>'
-                    }
+                    },
+					'importContent': {
+						controller: ['$scope', '$state','appTranslation',
+							function ($scope, $state, appTranslation) {
+								$scope.state = $state;
+								appTranslation.load([appTranslation.appPart]);
+							}],
+						template: '<domestic-data-import></domestic-data-import>'
+					}
                 },
                 deepStateRedirect: true,
                 sticky: true

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -206,6 +206,12 @@
                                                         title="{{selectCompany.engageNationalProhibitIndustry}}">{{selectCompany.engageNationalProhibitIndustryStr}}</span></span>
                                                 </div>
                                             </div>
+                                            <div class="form-group" ng-show="isInternational">
+                                                <div class="col-sm-12">
+                                                <span class="control-label">  {{'Country' | translate}}：<span
+                                                        title="{{selectCompany.country}}">{{selectCompany.country}}</span></span>
+                                                </div>
+                                            </div>
                                         </div>
 
                                         <!--

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -102,16 +102,17 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             this.orgControlForm.$setSubmitted();
 
             var fail = false;
-
-            if($('.localRequired').attr("required")==="required"){
-                $('.localRequired').each( function (index,ele){
-                    if(null==ele.value||""===ele.value){
-                        SweetAlert.error("请检查必填项");
-                        fail = true;
-                        return false;
-                    }
-                });
-            }
+            /*if(!$scope.isInternational){
+                if($('.localRequired').attr("required")==="required"){
+                    $('.localRequired').each( function (index,ele){
+                        if(null==ele.value||""===ele.value){
+                            SweetAlert.error("请检查必填项");
+                            fail = true;
+                            return false;
+                        }
+                    });
+                }
+            }*/
 
             if(fail) return;
 
@@ -1000,6 +1001,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.architectureTypeList = constant.ArchitectureTypeList;
             $scope.nationalEconomicIndustryList = constant.NationalEconomicIndustryList;
             $scope.trueFalse = constant.trueFalse;
+            $scope.countryCNList = constant.countryCNList;
             $('.localRequired').attr("required",true);
 
             // $('.localRequired').attr("required","true"); required="required"

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -325,6 +325,23 @@
                                                 </div>
                                             </div>
                                         </div>
+
+                                        <!--国家-->
+                                        <div class="form-group" ng-show="isInternational">
+                                            <label for="country" class="col-sm-3 control-label">{{'Country'
+                                                | translate}}：</label>
+                                            <div class="col-sm-9"
+                                                 ng-class="{'has-error':orgControlForm.country.$invalid && (orgControlForm.country.$dirty || orgControlForm.$submitted)}">
+                                                <select class="form-control" id='country' name="country"
+                                                        ng-model="editOrgModel.country"
+                                                        ng-options="x for x in countryCNList">
+                                                    <option value="">{{resources.Country}}</option>
+                                                </select>
+                                                <p ng-show="orgControlForm.country.$error.required && (orgControlForm.country.$dirty || orgControlForm.$submitted)"
+                                                   class="has-error label">
+                                                    {{resources.OrganizationMsgcountryRequired}}</p>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                                 <div style="clear: both;"></div>

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1615,6 +1615,9 @@ constant.anlDownLoadFileNameList = [
     {code:101,name:"国际税税务数据_"}
 ];
 
+constant.countryCNList = ['安哥拉', '阿富汗', '阿尔巴尼亚', '阿尔及利亚', '安道尔共和国', '安圭拉岛', '安提瓜和巴布达', '阿根廷', '亚美尼亚', '阿森松', '澳大利亚', '奥地利', '阿塞拜疆', '巴哈马', '巴林', '孟加拉国', '巴巴多斯', '白俄罗斯', '比利时', '伯利兹', '贝宁', '百慕大群岛', '玻利维亚', '博茨瓦纳', '巴西', '文莱', '保加利亚', '布基纳法索', '缅甸', '布隆迪', '喀麦隆', '加拿大', '开曼群岛', '中非共和国', '乍得', '智利', '中国', '哥伦比亚', '刚果', '库克群岛', '哥斯达黎加', '古巴', '塞浦路斯', '捷克', '丹麦', '吉布提', '多米尼加共和国', '厄瓜多尔', '埃及', '萨尔瓦多', '爱沙尼亚', '埃塞俄比亚', '斐济', '芬兰', '法国', '法属圭亚那', '法属玻利尼西亚', '加蓬', '冈比亚', '格鲁吉亚', '德国', '加纳', '直布罗陀', '希腊', '格林纳达', '关岛', '危地马拉', '几内亚', '圭亚那', '海地', '洪都拉斯', '香港', '匈牙利', '冰岛', '印度', '印度尼西亚', '伊朗', '伊拉克', '爱尔兰', '以色列', '意大利', '科特迪瓦', '牙买加', '日本', '约旦', '柬埔寨', '哈萨克斯坦', '肯尼亚', '韩国', '科威特', '吉尔吉斯坦', '老挝', '拉脱维亚', '黎巴嫩', '莱索托', '利比里亚', '利比亚', '列支敦士登', '立陶宛', '卢森堡', '澳门', '马达加斯加', '马拉维', '马来西亚', '马尔代夫', '马里', '马耳他', '马里亚那群岛', '马提尼克', '毛里求斯', '墨西哥', '摩尔多瓦', '摩纳哥', '蒙古', '蒙特塞拉特岛', '摩洛哥', '莫桑比克', '纳米比亚', '瑙鲁', '尼泊尔', '荷属安的列斯', '荷兰', '新西兰', '尼加拉瓜', '尼日尔', '尼日利亚', '朝鲜', '挪威', '阿曼', '巴基斯坦', '巴拿马', '巴布亚新几内亚', '巴拉圭', '秘鲁', '菲律宾', '波兰', '葡萄牙', '波多黎各', '卡塔尔', '留尼旺', '罗马尼亚', '俄罗斯', '圣卢西亚', '圣文森特岛', '东萨摩亚(美)', '西萨摩亚', '圣马力诺', '圣多美和普林西比', '沙特阿拉伯', '塞内加尔', '塞舌尔', '塞拉利昂', '新加坡', '斯洛伐克', '斯洛文尼亚', '所罗门群岛', '索马里', '南非', '西班牙', '斯里兰卡', '圣卢西亚', '圣文森特', '苏丹', '苏里南', '斯威士兰', '瑞典', '瑞士', '叙利亚', '台湾省', '塔吉克斯坦', '坦桑尼亚', '泰国', '多哥', '汤加', '特立尼达和多巴哥', '突尼斯', '土耳其', '土库曼斯坦', '乌干达', '乌克兰', '阿拉伯联合酋长国', '英国', '美国', '乌拉圭', '乌兹别克斯坦', '委内瑞拉', '越南', '也门', '南斯拉夫', '津巴布韦', '扎伊尔', '赞比亚'];
+
+constant.countryENList = ['Angola', 'Afghanistan', 'Albania', 'Algeria', 'Andorra', 'Anguilla', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Ascension', 'Australia', 'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda Is', 'Bolivia', 'Botswana', 'Brazil', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burma', 'Burundi', 'Cameroon', 'Canada', 'Cayman Is', 'Central African Republic', 'Chad', 'Chile', 'China', 'Colombia', 'Congo', 'Cook Is', 'Costa Rica', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica Rep', 'Ecuador', 'Egypt', 'EI Salvador', 'Estonia', 'Ethiopia', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Grenada', 'Guam', 'Guatemala', 'Guinea', 'Guyana', 'Haiti', 'Honduras', 'Hongkong', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Israel', 'Italy', 'Ivory Coast', 'Jamaica', 'Japan', 'Jordan', 'Kampuchea (Cambodia )', 'Kazakstan', 'Kenya', 'Korea', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macao', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Mariana Is', 'Martinique', 'Mauritius', 'Mexico', 'Moldova', 'Monaco', 'Mongolia', 'Montserrat Is', 'Morocco', 'Mozambique', 'Namibia', 'Nauru', 'Nepal', 'Netheriands Antilles', 'Netherlands', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'North Korea', 'Norway', 'Oman', 'Pakistan', 'Panama', 'Papua New Cuinea', 'Paraguay', 'Peru', 'Philippines', 'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russia', 'Saint Lueia', 'Saint Vincent', 'Samoa Eastern', 'Samoa Western', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Is', 'Somali', 'South Africa', 'Spain', 'SriLanka', 'St.Lucia', 'St.Vincent', 'Sudan', 'Suriname', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikstan', 'Tanzania', 'Thailand', 'Togo', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kiongdom', 'United States of America', 'Uruguay', 'Uzbekistan', 'Venezuela', 'Vietnam', 'Yemen', 'Yugoslavia', 'Zimbabwe', 'Zaire', 'Zambia'];
 
 
 

atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.js

@@ -11,6 +11,8 @@
             },
             controller: 'appDataImportController',
             link: function (scope, element, attr) {
+                debugger;
+                $('.nav-element-left a').removeClass('active');
                 $('.main-contents')[0].style.width = "260px";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";