#

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java

@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+import pwc.taxtech.atms.analysis.entity.AnalysisMaster;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.EnumTbImportType;
 import pwc.taxtech.atms.dao.OrganizationMapper;

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

@@ -98,8 +98,8 @@ public class AnalysisJobServiceImpl extends BaseService {
 
     private final static List<Integer> MONTH_LIST = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
 
-    private final static List<Integer> Q_LIST = Lists.newArrayList(3, 6, 9, 12);
-    private final static List<Integer> ZZS_DATE_LIST = Lists.newArrayList(1, 4, 7, 10);
+    private final static List<Integer> Q_LIST = Lists.newArrayList(1, 4, 7, 10);
+    //private final static List<Integer> ZZS_DATE_LIST = Lists.newArrayList(1, 4, 7, 10);
 
 
     /**
@@ -673,19 +673,17 @@ public class AnalysisJobServiceImpl extends BaseService {
             Organization o = orgMap.get(td.getCompanyId());
             AnalysisFileManagement afm = new AnalysisFileManagement();
             afm.setId(idService.nextId());
-            afm.setSeqNo(o.getCode() + "" + period);
+            afm.setSeqNo(getSeqNoByPeriod(o.getId(), period));
             afm.setFileType(td.getFileType());
 
             // 周期性上传  校验当年的当前及之前的周期是否有上传文件
             if (StringUtils.isNotEmpty(td.getTaxType()) && null != td.getOwnTime()) {
                 List<OrganizationTaxRule> otrs = ruleMap.get(td.getTaxType());
-
                 Optional<OrganizationTaxRule> otrOP= otrs.stream().filter(otr->otr.getGroupName().equals(td.getTaxType())).map(OrganizationTaxRule::getUpdateTime).max(new ComparatorDate());
                 OrganizationTaxRule rule = otrOP.get();
                 if(null==rule){
                     break;
                 }
-
                 afm.setReportingFrequency(rule.getTaxDecCycle());
                 String archivingStatus = "未归档";
                 TaxDocumentExample example = new TaxDocumentExample();

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

@@ -394,7 +394,13 @@ public class AnalysisServiceImpl extends BaseService {
                     //通过公司名称查询orgId
                     OrganizationExample example = new OrganizationExample();
                     example.createCriteria().andNameEqualTo(getCellStringValue(sheet.getRow(j).getCell(0)));
-                    model.setSeqNo(getSeqNoByPeriod(organizationMapper.selectByExample(example).get(0).getId(), Integer.parseInt(periodDate)));
+                /*    if(organizationMapper.selectByExample(example).size() == 0)
+                        continue;*/
+                    try{
+                        model.setSeqNo(getSeqNoByPeriod(organizationMapper.selectByExample(example).get(0).getId(), DateUtils.strToPeriod(periodDate)));
+                    }catch (Exception e){
+                        System.out.println(getCellStringValue(sheet.getRow(j).getCell(0)));
+                    }
                     lists.add(model);
                 }
                 AnalysisEmployeeNumExample example = new AnalysisEmployeeNumExample();
@@ -409,6 +415,7 @@ public class AnalysisServiceImpl extends BaseService {
         }catch (ServiceException se){
             throw se;
         }catch (Exception e){
+            e.printStackTrace();
             throw new ServiceException(e);
         }
     }
@@ -490,6 +497,12 @@ public class AnalysisServiceImpl extends BaseService {
                         model.setRightPublicAmount(getCellBigDecimalValue(cell2));
                     }
                 }
+                AnalysisMasterExample example2 = new AnalysisMasterExample();
+                //todo 这里先写死滴滴出行科技有限公司
+                example2.createCriteria().andNameEqualTo("滴滴出行科技有限公司");
+                List<AnalysisMaster> size = analysisMasterMapper.selectByExample(example2);
+                if(size.size() != 0)
+                    model.setSeqNo(size.get(0).getSeqNo());
                 AnalysisDriverNumExample example = new AnalysisDriverNumExample();
                 example.createCriteria().andPeriodEqualTo(selectedPer);
                 analysisDriverNumMapper.deleteByExample(example);
@@ -578,6 +591,12 @@ public class AnalysisServiceImpl extends BaseService {
                     model.setSubsidyC(getCellBigDecimalValue(sheet.getRow(j).getCell(3)));
                     model.setRevenue(getCellBigDecimalValue(sheet.getRow(j).getCell(4)));
                     model.setProfit(getCellBigDecimalValue(sheet.getRow(j).getCell(5)));
+                    model.setRef1(getCellBigDecimalValue(sheet.getRow(j).getCell(6)));
+                    model.setRef2(getCellBigDecimalValue(sheet.getRow(j).getCell(7)));
+                    model.setRef3(getCellBigDecimalValue(sheet.getRow(j).getCell(8)));
+                    model.setRef4(getCellBigDecimalValue(sheet.getRow(j).getCell(9)));
+                    model.setRef5(getCellBigDecimalValue(sheet.getRow(j).getCell(10)));
+                    model.setRef6(getCellBigDecimalValue(sheet.getRow(j).getCell(11)));
                     lists.add(model);
                 }
                 AnalysisInternationalBusinessDataExample example = new AnalysisInternationalBusinessDataExample();

atms-dao/etc/generator-mysql/analysisGeneratorConfig.xml

@@ -41,7 +41,7 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
         </javaClientGenerator>
 
-        <table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
+        <table tableName="analysis_international_business_data" domainObjectName="AnalysisInternationalBusinessData">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessData.java

@@ -101,6 +101,60 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
      */
     private BigDecimal profit;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_1
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_2
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_3
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_4
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref4;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_5
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref5;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.ref_6
+     *
+     * @mbg.generated
+     */
+    private BigDecimal ref6;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -376,6 +430,150 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         this.profit = profit;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_1
+     *
+     * @return the value of analysis_international_business_data.ref_1
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef1() {
+        return ref1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_1
+     *
+     * @param ref1 the value for analysis_international_business_data.ref_1
+     *
+     * @mbg.generated
+     */
+    public void setRef1(BigDecimal ref1) {
+        this.ref1 = ref1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_2
+     *
+     * @return the value of analysis_international_business_data.ref_2
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef2() {
+        return ref2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_2
+     *
+     * @param ref2 the value for analysis_international_business_data.ref_2
+     *
+     * @mbg.generated
+     */
+    public void setRef2(BigDecimal ref2) {
+        this.ref2 = ref2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_3
+     *
+     * @return the value of analysis_international_business_data.ref_3
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef3() {
+        return ref3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_3
+     *
+     * @param ref3 the value for analysis_international_business_data.ref_3
+     *
+     * @mbg.generated
+     */
+    public void setRef3(BigDecimal ref3) {
+        this.ref3 = ref3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_4
+     *
+     * @return the value of analysis_international_business_data.ref_4
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef4() {
+        return ref4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_4
+     *
+     * @param ref4 the value for analysis_international_business_data.ref_4
+     *
+     * @mbg.generated
+     */
+    public void setRef4(BigDecimal ref4) {
+        this.ref4 = ref4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_5
+     *
+     * @return the value of analysis_international_business_data.ref_5
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef5() {
+        return ref5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_5
+     *
+     * @param ref5 the value for analysis_international_business_data.ref_5
+     *
+     * @mbg.generated
+     */
+    public void setRef5(BigDecimal ref5) {
+        this.ref5 = ref5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.ref_6
+     *
+     * @return the value of analysis_international_business_data.ref_6
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getRef6() {
+        return ref6;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.ref_6
+     *
+     * @param ref6 the value for analysis_international_business_data.ref_6
+     *
+     * @mbg.generated
+     */
+    public void setRef6(BigDecimal ref6) {
+        this.ref6 = ref6;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_international_business_data.exchange_rate
@@ -564,6 +762,12 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         sb.append(", subsidyC=").append(subsidyC);
         sb.append(", revenue=").append(revenue);
         sb.append(", profit=").append(profit);
+        sb.append(", ref1=").append(ref1);
+        sb.append(", ref2=").append(ref2);
+        sb.append(", ref3=").append(ref3);
+        sb.append(", ref4=").append(ref4);
+        sb.append(", ref5=").append(ref5);
+        sb.append(", ref6=").append(ref6);
         sb.append(", exchangeRate=").append(exchangeRate);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessDataExample.java

@@ -686,6 +686,366 @@ public class AnalysisInternationalBusinessDataExample {
             return (Criteria) this;
         }
 
+        public Criteria andRef1IsNull() {
+            addCriterion("ref_1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1IsNotNull() {
+            addCriterion("ref_1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1EqualTo(BigDecimal value) {
+            addCriterion("ref_1 =", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1NotEqualTo(BigDecimal value) {
+            addCriterion("ref_1 <>", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1GreaterThan(BigDecimal value) {
+            addCriterion("ref_1 >", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_1 >=", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1LessThan(BigDecimal value) {
+            addCriterion("ref_1 <", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_1 <=", value, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1In(List<BigDecimal> values) {
+            addCriterion("ref_1 in", values, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1NotIn(List<BigDecimal> values) {
+            addCriterion("ref_1 not in", values, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_1 between", value1, value2, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef1NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_1 not between", value1, value2, "ref1");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2IsNull() {
+            addCriterion("ref_2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2IsNotNull() {
+            addCriterion("ref_2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2EqualTo(BigDecimal value) {
+            addCriterion("ref_2 =", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2NotEqualTo(BigDecimal value) {
+            addCriterion("ref_2 <>", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2GreaterThan(BigDecimal value) {
+            addCriterion("ref_2 >", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_2 >=", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2LessThan(BigDecimal value) {
+            addCriterion("ref_2 <", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_2 <=", value, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2In(List<BigDecimal> values) {
+            addCriterion("ref_2 in", values, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2NotIn(List<BigDecimal> values) {
+            addCriterion("ref_2 not in", values, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_2 between", value1, value2, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef2NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_2 not between", value1, value2, "ref2");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3IsNull() {
+            addCriterion("ref_3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3IsNotNull() {
+            addCriterion("ref_3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3EqualTo(BigDecimal value) {
+            addCriterion("ref_3 =", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3NotEqualTo(BigDecimal value) {
+            addCriterion("ref_3 <>", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3GreaterThan(BigDecimal value) {
+            addCriterion("ref_3 >", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_3 >=", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3LessThan(BigDecimal value) {
+            addCriterion("ref_3 <", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_3 <=", value, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3In(List<BigDecimal> values) {
+            addCriterion("ref_3 in", values, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3NotIn(List<BigDecimal> values) {
+            addCriterion("ref_3 not in", values, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_3 between", value1, value2, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef3NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_3 not between", value1, value2, "ref3");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4IsNull() {
+            addCriterion("ref_4 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4IsNotNull() {
+            addCriterion("ref_4 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4EqualTo(BigDecimal value) {
+            addCriterion("ref_4 =", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4NotEqualTo(BigDecimal value) {
+            addCriterion("ref_4 <>", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4GreaterThan(BigDecimal value) {
+            addCriterion("ref_4 >", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_4 >=", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4LessThan(BigDecimal value) {
+            addCriterion("ref_4 <", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_4 <=", value, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4In(List<BigDecimal> values) {
+            addCriterion("ref_4 in", values, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4NotIn(List<BigDecimal> values) {
+            addCriterion("ref_4 not in", values, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_4 between", value1, value2, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef4NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_4 not between", value1, value2, "ref4");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5IsNull() {
+            addCriterion("ref_5 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5IsNotNull() {
+            addCriterion("ref_5 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5EqualTo(BigDecimal value) {
+            addCriterion("ref_5 =", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5NotEqualTo(BigDecimal value) {
+            addCriterion("ref_5 <>", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5GreaterThan(BigDecimal value) {
+            addCriterion("ref_5 >", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_5 >=", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5LessThan(BigDecimal value) {
+            addCriterion("ref_5 <", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_5 <=", value, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5In(List<BigDecimal> values) {
+            addCriterion("ref_5 in", values, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5NotIn(List<BigDecimal> values) {
+            addCriterion("ref_5 not in", values, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_5 between", value1, value2, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef5NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_5 not between", value1, value2, "ref5");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6IsNull() {
+            addCriterion("ref_6 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6IsNotNull() {
+            addCriterion("ref_6 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6EqualTo(BigDecimal value) {
+            addCriterion("ref_6 =", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6NotEqualTo(BigDecimal value) {
+            addCriterion("ref_6 <>", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6GreaterThan(BigDecimal value) {
+            addCriterion("ref_6 >", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_6 >=", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6LessThan(BigDecimal value) {
+            addCriterion("ref_6 <", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_6 <=", value, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6In(List<BigDecimal> values) {
+            addCriterion("ref_6 in", values, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6NotIn(List<BigDecimal> values) {
+            addCriterion("ref_6 not in", values, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_6 between", value1, value2, "ref6");
+            return (Criteria) this;
+        }
+
+        public Criteria andRef6NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_6 not between", value1, value2, "ref6");
+            return (Criteria) this;
+        }
+
         public Criteria andExchangeRateIsNull() {
             addCriterion("exchange_rate is null");
             return (Criteria) this;

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.xml

@@ -14,6 +14,12 @@
     <result column="subsidy_c" jdbcType="DECIMAL" property="subsidyC" />
     <result column="revenue" jdbcType="DECIMAL" property="revenue" />
     <result column="profit" jdbcType="DECIMAL" property="profit" />
+    <result column="ref_1" jdbcType="DECIMAL" property="ref1" />
+    <result column="ref_2" jdbcType="DECIMAL" property="ref2" />
+    <result column="ref_3" jdbcType="DECIMAL" property="ref3" />
+    <result column="ref_4" jdbcType="DECIMAL" property="ref4" />
+    <result column="ref_5" jdbcType="DECIMAL" property="ref5" />
+    <result column="ref_6" jdbcType="DECIMAL" property="ref6" />
     <result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -93,8 +99,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, exchange_rate, create_time, 
-    update_time, organization_id, company_name, period, country
+    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, ref_1, ref_2, ref_3, 
+    ref_4, ref_5, ref_6, exchange_rate, create_time, update_time, organization_id, company_name, 
+    period, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">
     <!--
@@ -149,16 +156,18 @@
     -->
     insert into analysis_international_business_data (id, seq_no, gmv, 
       trips, subsidy_b, subsidy_c, 
-      revenue, profit, exchange_rate, 
-      create_time, update_time, organization_id, 
-      company_name, period, country
-      )
+      revenue, profit, ref_1, 
+      ref_2, ref_3, ref_4, ref_5, 
+      ref_6, exchange_rate, create_time, 
+      update_time, organization_id, company_name, 
+      period, country)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{gmv,jdbcType=DECIMAL}, 
       #{trips,jdbcType=DECIMAL}, #{subsidyB,jdbcType=DECIMAL}, #{subsidyC,jdbcType=DECIMAL}, 
-      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, 
-      #{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR}
-      )
+      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{ref1,jdbcType=DECIMAL}, 
+      #{ref2,jdbcType=DECIMAL}, #{ref3,jdbcType=DECIMAL}, #{ref4,jdbcType=DECIMAL}, #{ref5,jdbcType=DECIMAL}, 
+      #{ref6,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
+      #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessData">
     <!--
@@ -191,6 +200,24 @@
       <if test="profit != null">
         profit,
       </if>
+      <if test="ref1 != null">
+        ref_1,
+      </if>
+      <if test="ref2 != null">
+        ref_2,
+      </if>
+      <if test="ref3 != null">
+        ref_3,
+      </if>
+      <if test="ref4 != null">
+        ref_4,
+      </if>
+      <if test="ref5 != null">
+        ref_5,
+      </if>
+      <if test="ref6 != null">
+        ref_6,
+      </if>
       <if test="exchangeRate != null">
         exchange_rate,
       </if>
@@ -238,6 +265,24 @@
       <if test="profit != null">
         #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="ref1 != null">
+        #{ref1,jdbcType=DECIMAL},
+      </if>
+      <if test="ref2 != null">
+        #{ref2,jdbcType=DECIMAL},
+      </if>
+      <if test="ref3 != null">
+        #{ref3,jdbcType=DECIMAL},
+      </if>
+      <if test="ref4 != null">
+        #{ref4,jdbcType=DECIMAL},
+      </if>
+      <if test="ref5 != null">
+        #{ref5,jdbcType=DECIMAL},
+      </if>
+      <if test="ref6 != null">
+        #{ref6,jdbcType=DECIMAL},
+      </if>
       <if test="exchangeRate != null">
         #{exchangeRate,jdbcType=DECIMAL},
       </if>
@@ -302,6 +347,24 @@
       <if test="record.profit != null">
         profit = #{record.profit,jdbcType=DECIMAL},
       </if>
+      <if test="record.ref1 != null">
+        ref_1 = #{record.ref1,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ref2 != null">
+        ref_2 = #{record.ref2,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ref3 != null">
+        ref_3 = #{record.ref3,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ref4 != null">
+        ref_4 = #{record.ref4,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ref5 != null">
+        ref_5 = #{record.ref5,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ref6 != null">
+        ref_6 = #{record.ref6,jdbcType=DECIMAL},
+      </if>
       <if test="record.exchangeRate != null">
         exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
       </if>
@@ -342,6 +405,12 @@
       subsidy_c = #{record.subsidyC,jdbcType=DECIMAL},
       revenue = #{record.revenue,jdbcType=DECIMAL},
       profit = #{record.profit,jdbcType=DECIMAL},
+      ref_1 = #{record.ref1,jdbcType=DECIMAL},
+      ref_2 = #{record.ref2,jdbcType=DECIMAL},
+      ref_3 = #{record.ref3,jdbcType=DECIMAL},
+      ref_4 = #{record.ref4,jdbcType=DECIMAL},
+      ref_5 = #{record.ref5,jdbcType=DECIMAL},
+      ref_6 = #{record.ref6,jdbcType=DECIMAL},
       exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -381,6 +450,24 @@
       <if test="profit != null">
         profit = #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="ref1 != null">
+        ref_1 = #{ref1,jdbcType=DECIMAL},
+      </if>
+      <if test="ref2 != null">
+        ref_2 = #{ref2,jdbcType=DECIMAL},
+      </if>
+      <if test="ref3 != null">
+        ref_3 = #{ref3,jdbcType=DECIMAL},
+      </if>
+      <if test="ref4 != null">
+        ref_4 = #{ref4,jdbcType=DECIMAL},
+      </if>
+      <if test="ref5 != null">
+        ref_5 = #{ref5,jdbcType=DECIMAL},
+      </if>
+      <if test="ref6 != null">
+        ref_6 = #{ref6,jdbcType=DECIMAL},
+      </if>
       <if test="exchangeRate != null">
         exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
       </if>
@@ -418,6 +505,12 @@
       subsidy_c = #{subsidyC,jdbcType=DECIMAL},
       revenue = #{revenue,jdbcType=DECIMAL},
       profit = #{profit,jdbcType=DECIMAL},
+      ref_1 = #{ref1,jdbcType=DECIMAL},
+      ref_2 = #{ref2,jdbcType=DECIMAL},
+      ref_3 = #{ref3,jdbcType=DECIMAL},
+      ref_4 = #{ref4,jdbcType=DECIMAL},
+      ref_5 = #{ref5,jdbcType=DECIMAL},
+      ref_6 = #{ref6,jdbcType=DECIMAL},
       exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js

@@ -314,6 +314,42 @@
                         allowHeaderFiltering: false,
                         width: '16%',
                         caption: 'Profit'
+                    },
+                    {
+                        dataField: "ref1",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref1'
+                    },
+                    {
+                        dataField: "ref2",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref2'
+                    },
+                    {
+                        dataField: "ref3",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref3'
+                    },
+                    {
+                        dataField: "ref4",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref4'
+                    },
+                    {
+                        dataField: "ref5",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref5'
+                    },
+                    {
+                        dataField: "ref6",
+                        allowHeaderFiltering: false,
+                        width: '16%',
+                        caption: 'ref6'
                     }],
                 onContentReady: function (e) {
                     $scope.accountingRateListInstance = e.component;
@@ -606,14 +642,14 @@
                 case 100:
                     $scope.showInternationalBUDataGrid = true;
                     loadinternationalBUDatagrid();
-                    $scope.selectCountry = '';
-                    $scope.selectCompany = '';
+                    /*$scope.selectCountry = '';
+                    $scope.selectCompany = '';*/
                     break;
                 case 101:
                     $scope.showInternationalTaxDataGrid = true;
                     loadInternationalTaxDataGrid();
-                    $scope.selectCountry = '';
-                    $scope.selectCompany = '';
+                  /*  $scope.selectCountry = '';
+                    $scope.selectCompany = '';*/
                     break;
                 default:
                     break;

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html

@@ -36,7 +36,7 @@
                                <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                            </div>
                        </div>
-                    <div class="col-sm-5 rightNav" style="width:46%;padding-left: 0px;    left: 20%;">
+                    <div class="col-sm-5 rightNav" style="width:46%;padding-left: 0px;        left: 14%;">
                         <button type="button"
                                 ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                                 ngf-allow-dir="false" class="btn btn-vat-third" >