[DEV] add xxkp xxkp

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.EnumTbImportType;
+import pwc.taxtech.atms.dao.DimensionValueOrgMapper;
 import pwc.taxtech.atms.dao.OrganizationMapper;
 import pwc.taxtech.atms.dao.ProjectMapper;
 import pwc.taxtech.atms.dpo.PagingResultDto;
@@ -30,6 +31,7 @@ import pwc.taxtech.atms.dto.vatdto.QueryEvidenceDto;
 import pwc.taxtech.atms.entity.Organization;
 import pwc.taxtech.atms.entity.OrganizationExample;
 import pwc.taxtech.atms.entity.Project;
+import pwc.taxtech.atms.invoice.OutputFpxxtbMapper;
 import pwc.taxtech.atms.invoice.OutputInvoiceDetailMapper;
 import pwc.taxtech.atms.invoice.OutputInvoiceMapper;
 import pwc.taxtech.atms.service.impl.Message;
@@ -72,24 +74,50 @@ public class OutputInvoiceServiceImpl {
     private OrganizationMapper organizationMapper;
     @Autowired
     private OutputInvoiceDetailMapper outputInvoiceDetailMapper;
+    @Autowired
+    private OutputFpxxtbMapper outputFpxxtbMapper;
 
     public List<OutputInvoice> getOutputInvoice(QueryOutputDto queryDto, String projectId) {
         Project project = projectMapper.selectByPrimaryKey(projectId);
         Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
+        List<OutputInvoice> outputInvoices;
+        if("off".equals(queryDto.getTag())){
+            OutputFpxxtbExample outputFpxxtbExample = new OutputFpxxtbExample();
+            if (organization.getTaxPayerNumber() == null) {
+                outputFpxxtbExample.createCriteria().andXFSHIsNull().
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils .getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            } else {
+                outputFpxxtbExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            }
+            List<OutputFpxxtb> outputFpxxtbs = outputFpxxtbMapper.selectByExample(outputFpxxtbExample);
+            outputInvoices = new ArrayList<>(outputFpxxtbs.size());
+            outputFpxxtbs.forEach(m->{
+                OutputInvoice outputInvoice = new OutputInvoice();
+                outputInvoices.add(CommonUtils.copyProperties(m,outputInvoice));
+            });
+        }else{
+            OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
+            if (organization.getTaxPayerNumber() == null) {
+                outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils .getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            } else {
+                outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            }
 
-        OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
-        if (organization.getTaxPayerNumber() == null) {
-            outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
-                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
-                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
-                    .andFPZTNotEqualTo("1");
-        } else {
-            outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
-                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
-                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
-                    .andFPZTNotEqualTo("1");
+            outputInvoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);
         }
-        return outputInvoiceMapper.selectByExample(outputInvoiceExample);
+
+        return outputInvoices;
     }
 
     public List<OutputInvoice> queryOutputInvoiceAllList(QueryOutputDto queryDto, String projectId) {
@@ -104,24 +132,48 @@ public class OutputInvoiceServiceImpl {
     }
 
     public PageInfo<OutputInvoice> queryOutputInvoiceList(QueryOutputDto queryDto, String projectId) {
-
         Project project = projectMapper.selectByPrimaryKey(projectId);
         Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
 
-        OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
-        if (organization.getTaxPayerNumber() == null) {
-            outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
-                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
-                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
-                    .andFPZTNotEqualTo("1");
-        } else {
-            outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
-                    andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
-                            DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
-                    .andFPZTNotEqualTo("1");
+        List<OutputInvoice> invoices;
+        if("off".equals(queryDto.getTag())){
+            OutputFpxxtbExample outputFpxxtbExample = new OutputFpxxtbExample();
+            if (organization.getTaxPayerNumber() == null) {
+                outputFpxxtbExample.createCriteria().andXFSHIsNull().
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            } else {
+                outputFpxxtbExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            }
+            PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
+            List<OutputFpxxtb> fpxxtbs = outputFpxxtbMapper.selectByExample(outputFpxxtbExample);
+            invoices =new ArrayList<>(fpxxtbs.size());
+            fpxxtbs.forEach(m->{
+                OutputInvoice invoice = new OutputInvoice();
+                invoices.add(CommonUtils.copyProperties(m,invoice));
+            });
+
+        }else {
+            OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
+            if (organization.getTaxPayerNumber() == null) {
+                outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            } else {
+                outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
+                        andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
+                                DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
+                        .andFPZTNotEqualTo("1");
+            }
+            PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
+            invoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);
         }
-        PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
-        List<OutputInvoice> invoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);
+
         DecimalFormat df = new DecimalFormat("#,###.00");
         invoices.stream().forEach(x -> {
                     x.setHJJE(df.format(new BigDecimal(x.getHJJE())));

atms-dao/etc/generator-oracle/vatGeneratorConfig.xml

@@ -258,7 +258,7 @@
         <!--</table>-->
 
         <table tableName="OUTPUT_FPXXTB" schema="pwc_invoice" domainObjectName="OutputFpxxtb">
-            <property name="useActualColumnNames" value="false"/>
+            <property name="useActualColumnNames" value="true"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
 

atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/QueryOutputDto.java

@@ -21,6 +21,7 @@ public class QueryOutputDto {
     private BigDecimal amountEnd;
     private BigDecimal taxAmountStart;
     private BigDecimal taxAmountEnd;
+    private String tag;
 
     public PagingDto getPageInfo() {
         return pageInfo;
@@ -133,4 +134,12 @@ public class QueryOutputDto {
     public void setTaxAmountEnd(BigDecimal taxAmountEnd) {
         this.taxAmountEnd = taxAmountEnd;
     }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/OutputFpxxtb.java

@@ -17,7 +17,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String id;
+    private String ID;
 
     /**
      *
@@ -26,7 +26,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fpqqlsh;
+    private String FPQQLSH;
 
     /**
      *
@@ -35,7 +35,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fpdm;
+    private String FPDM;
 
     /**
      *
@@ -44,7 +44,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fphm;
+    private String FPHM;
 
     /**
      *
@@ -53,7 +53,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String kprq;
+    private String KPRQ;
 
     /**
      *
@@ -62,7 +62,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fplxdm;
+    private String FPLXDM;
 
     /**
      *
@@ -71,7 +71,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String ewm;
+    private String EWM;
 
     /**
      *
@@ -80,7 +80,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String jqbh;
+    private String JQBH;
 
     /**
      *
@@ -89,7 +89,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String jym;
+    private String JYM;
 
     /**
      *
@@ -98,7 +98,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String gfmc;
+    private String GFMC;
 
     /**
      *
@@ -107,7 +107,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String gfsh;
+    private String GFSH;
 
     /**
      *
@@ -116,7 +116,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String gfdzdh;
+    private String GFDZDH;
 
     /**
      *
@@ -125,7 +125,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String gfyhzh;
+    private String GFYHZH;
 
     /**
      *
@@ -134,7 +134,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String xfsh;
+    private String XFSH;
 
     /**
      *
@@ -143,7 +143,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String xfmc;
+    private String XFMC;
 
     /**
      *
@@ -152,7 +152,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String xfdzdh;
+    private String XFDZDH;
 
     /**
      *
@@ -161,7 +161,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String xfyhzh;
+    private String XFYHZH;
 
     /**
      *
@@ -170,7 +170,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String bz;
+    private String BZ;
 
     /**
      *
@@ -179,7 +179,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String skr;
+    private String SKR;
 
     /**
      *
@@ -188,7 +188,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fhr;
+    private String FHR;
 
     /**
      *
@@ -197,7 +197,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String kpr;
+    private String KPR;
 
     /**
      *
@@ -206,7 +206,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fplx;
+    private String FPLX;
 
     /**
      *
@@ -215,7 +215,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String fpzt;
+    private String FPZT;
 
     /**
      *
@@ -224,7 +224,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String spbh;
+    private String SPBH;
 
     /**
      *
@@ -233,7 +233,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String xtly;
+    private String XTLY;
 
     /**
      *
@@ -242,7 +242,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String cjsj;
+    private String CJSJ;
 
     /**
      *
@@ -251,7 +251,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String hjje;
+    private String HJJE;
 
     /**
      *
@@ -260,7 +260,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String hjse;
+    private String HJSE;
 
     /**
      *
@@ -269,7 +269,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String jshj;
+    private String JSHJ;
 
     /**
      *
@@ -278,7 +278,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String zkjshj;
+    private String ZKJSHJ;
 
     /**
      *
@@ -287,7 +287,7 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    private String slv;
+    private String SLV;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -305,20 +305,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getId() {
-        return id;
+    public String getID() {
+        return ID;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.ID
      *
-     * @param id the value for PWC_INVOICE.OUTPUT_FPXXTB.ID
+     * @param ID the value for PWC_INVOICE.OUTPUT_FPXXTB.ID
      *
      * @mbg.generated
      */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
+    public void setID(String ID) {
+        this.ID = ID == null ? null : ID.trim();
     }
 
     /**
@@ -329,20 +329,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFpqqlsh() {
-        return fpqqlsh;
+    public String getFPQQLSH() {
+        return FPQQLSH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPQQLSH
      *
-     * @param fpqqlsh the value for PWC_INVOICE.OUTPUT_FPXXTB.FPQQLSH
+     * @param FPQQLSH the value for PWC_INVOICE.OUTPUT_FPXXTB.FPQQLSH
      *
      * @mbg.generated
      */
-    public void setFpqqlsh(String fpqqlsh) {
-        this.fpqqlsh = fpqqlsh == null ? null : fpqqlsh.trim();
+    public void setFPQQLSH(String FPQQLSH) {
+        this.FPQQLSH = FPQQLSH == null ? null : FPQQLSH.trim();
     }
 
     /**
@@ -353,20 +353,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFpdm() {
-        return fpdm;
+    public String getFPDM() {
+        return FPDM;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPDM
      *
-     * @param fpdm the value for PWC_INVOICE.OUTPUT_FPXXTB.FPDM
+     * @param FPDM the value for PWC_INVOICE.OUTPUT_FPXXTB.FPDM
      *
      * @mbg.generated
      */
-    public void setFpdm(String fpdm) {
-        this.fpdm = fpdm == null ? null : fpdm.trim();
+    public void setFPDM(String FPDM) {
+        this.FPDM = FPDM == null ? null : FPDM.trim();
     }
 
     /**
@@ -377,20 +377,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFphm() {
-        return fphm;
+    public String getFPHM() {
+        return FPHM;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPHM
      *
-     * @param fphm the value for PWC_INVOICE.OUTPUT_FPXXTB.FPHM
+     * @param FPHM the value for PWC_INVOICE.OUTPUT_FPXXTB.FPHM
      *
      * @mbg.generated
      */
-    public void setFphm(String fphm) {
-        this.fphm = fphm == null ? null : fphm.trim();
+    public void setFPHM(String FPHM) {
+        this.FPHM = FPHM == null ? null : FPHM.trim();
     }
 
     /**
@@ -401,20 +401,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getKprq() {
-        return kprq;
+    public String getKPRQ() {
+        return KPRQ;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.KPRQ
      *
-     * @param kprq the value for PWC_INVOICE.OUTPUT_FPXXTB.KPRQ
+     * @param KPRQ the value for PWC_INVOICE.OUTPUT_FPXXTB.KPRQ
      *
      * @mbg.generated
      */
-    public void setKprq(String kprq) {
-        this.kprq = kprq == null ? null : kprq.trim();
+    public void setKPRQ(String KPRQ) {
+        this.KPRQ = KPRQ == null ? null : KPRQ.trim();
     }
 
     /**
@@ -425,20 +425,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFplxdm() {
-        return fplxdm;
+    public String getFPLXDM() {
+        return FPLXDM;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPLXDM
      *
-     * @param fplxdm the value for PWC_INVOICE.OUTPUT_FPXXTB.FPLXDM
+     * @param FPLXDM the value for PWC_INVOICE.OUTPUT_FPXXTB.FPLXDM
      *
      * @mbg.generated
      */
-    public void setFplxdm(String fplxdm) {
-        this.fplxdm = fplxdm == null ? null : fplxdm.trim();
+    public void setFPLXDM(String FPLXDM) {
+        this.FPLXDM = FPLXDM == null ? null : FPLXDM.trim();
     }
 
     /**
@@ -449,20 +449,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getEwm() {
-        return ewm;
+    public String getEWM() {
+        return EWM;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.EWM
      *
-     * @param ewm the value for PWC_INVOICE.OUTPUT_FPXXTB.EWM
+     * @param EWM the value for PWC_INVOICE.OUTPUT_FPXXTB.EWM
      *
      * @mbg.generated
      */
-    public void setEwm(String ewm) {
-        this.ewm = ewm == null ? null : ewm.trim();
+    public void setEWM(String EWM) {
+        this.EWM = EWM == null ? null : EWM.trim();
     }
 
     /**
@@ -473,20 +473,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getJqbh() {
-        return jqbh;
+    public String getJQBH() {
+        return JQBH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.JQBH
      *
-     * @param jqbh the value for PWC_INVOICE.OUTPUT_FPXXTB.JQBH
+     * @param JQBH the value for PWC_INVOICE.OUTPUT_FPXXTB.JQBH
      *
      * @mbg.generated
      */
-    public void setJqbh(String jqbh) {
-        this.jqbh = jqbh == null ? null : jqbh.trim();
+    public void setJQBH(String JQBH) {
+        this.JQBH = JQBH == null ? null : JQBH.trim();
     }
 
     /**
@@ -497,20 +497,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getJym() {
-        return jym;
+    public String getJYM() {
+        return JYM;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.JYM
      *
-     * @param jym the value for PWC_INVOICE.OUTPUT_FPXXTB.JYM
+     * @param JYM the value for PWC_INVOICE.OUTPUT_FPXXTB.JYM
      *
      * @mbg.generated
      */
-    public void setJym(String jym) {
-        this.jym = jym == null ? null : jym.trim();
+    public void setJYM(String JYM) {
+        this.JYM = JYM == null ? null : JYM.trim();
     }
 
     /**
@@ -521,20 +521,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getGfmc() {
-        return gfmc;
+    public String getGFMC() {
+        return GFMC;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.GFMC
      *
-     * @param gfmc the value for PWC_INVOICE.OUTPUT_FPXXTB.GFMC
+     * @param GFMC the value for PWC_INVOICE.OUTPUT_FPXXTB.GFMC
      *
      * @mbg.generated
      */
-    public void setGfmc(String gfmc) {
-        this.gfmc = gfmc == null ? null : gfmc.trim();
+    public void setGFMC(String GFMC) {
+        this.GFMC = GFMC == null ? null : GFMC.trim();
     }
 
     /**
@@ -545,20 +545,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getGfsh() {
-        return gfsh;
+    public String getGFSH() {
+        return GFSH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.GFSH
      *
-     * @param gfsh the value for PWC_INVOICE.OUTPUT_FPXXTB.GFSH
+     * @param GFSH the value for PWC_INVOICE.OUTPUT_FPXXTB.GFSH
      *
      * @mbg.generated
      */
-    public void setGfsh(String gfsh) {
-        this.gfsh = gfsh == null ? null : gfsh.trim();
+    public void setGFSH(String GFSH) {
+        this.GFSH = GFSH == null ? null : GFSH.trim();
     }
 
     /**
@@ -569,20 +569,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getGfdzdh() {
-        return gfdzdh;
+    public String getGFDZDH() {
+        return GFDZDH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.GFDZDH
      *
-     * @param gfdzdh the value for PWC_INVOICE.OUTPUT_FPXXTB.GFDZDH
+     * @param GFDZDH the value for PWC_INVOICE.OUTPUT_FPXXTB.GFDZDH
      *
      * @mbg.generated
      */
-    public void setGfdzdh(String gfdzdh) {
-        this.gfdzdh = gfdzdh == null ? null : gfdzdh.trim();
+    public void setGFDZDH(String GFDZDH) {
+        this.GFDZDH = GFDZDH == null ? null : GFDZDH.trim();
     }
 
     /**
@@ -593,20 +593,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getGfyhzh() {
-        return gfyhzh;
+    public String getGFYHZH() {
+        return GFYHZH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.GFYHZH
      *
-     * @param gfyhzh the value for PWC_INVOICE.OUTPUT_FPXXTB.GFYHZH
+     * @param GFYHZH the value for PWC_INVOICE.OUTPUT_FPXXTB.GFYHZH
      *
      * @mbg.generated
      */
-    public void setGfyhzh(String gfyhzh) {
-        this.gfyhzh = gfyhzh == null ? null : gfyhzh.trim();
+    public void setGFYHZH(String GFYHZH) {
+        this.GFYHZH = GFYHZH == null ? null : GFYHZH.trim();
     }
 
     /**
@@ -617,20 +617,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getXfsh() {
-        return xfsh;
+    public String getXFSH() {
+        return XFSH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.XFSH
      *
-     * @param xfsh the value for PWC_INVOICE.OUTPUT_FPXXTB.XFSH
+     * @param XFSH the value for PWC_INVOICE.OUTPUT_FPXXTB.XFSH
      *
      * @mbg.generated
      */
-    public void setXfsh(String xfsh) {
-        this.xfsh = xfsh == null ? null : xfsh.trim();
+    public void setXFSH(String XFSH) {
+        this.XFSH = XFSH == null ? null : XFSH.trim();
     }
 
     /**
@@ -641,20 +641,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getXfmc() {
-        return xfmc;
+    public String getXFMC() {
+        return XFMC;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.XFMC
      *
-     * @param xfmc the value for PWC_INVOICE.OUTPUT_FPXXTB.XFMC
+     * @param XFMC the value for PWC_INVOICE.OUTPUT_FPXXTB.XFMC
      *
      * @mbg.generated
      */
-    public void setXfmc(String xfmc) {
-        this.xfmc = xfmc == null ? null : xfmc.trim();
+    public void setXFMC(String XFMC) {
+        this.XFMC = XFMC == null ? null : XFMC.trim();
     }
 
     /**
@@ -665,20 +665,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getXfdzdh() {
-        return xfdzdh;
+    public String getXFDZDH() {
+        return XFDZDH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.XFDZDH
      *
-     * @param xfdzdh the value for PWC_INVOICE.OUTPUT_FPXXTB.XFDZDH
+     * @param XFDZDH the value for PWC_INVOICE.OUTPUT_FPXXTB.XFDZDH
      *
      * @mbg.generated
      */
-    public void setXfdzdh(String xfdzdh) {
-        this.xfdzdh = xfdzdh == null ? null : xfdzdh.trim();
+    public void setXFDZDH(String XFDZDH) {
+        this.XFDZDH = XFDZDH == null ? null : XFDZDH.trim();
     }
 
     /**
@@ -689,20 +689,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getXfyhzh() {
-        return xfyhzh;
+    public String getXFYHZH() {
+        return XFYHZH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.XFYHZH
      *
-     * @param xfyhzh the value for PWC_INVOICE.OUTPUT_FPXXTB.XFYHZH
+     * @param XFYHZH the value for PWC_INVOICE.OUTPUT_FPXXTB.XFYHZH
      *
      * @mbg.generated
      */
-    public void setXfyhzh(String xfyhzh) {
-        this.xfyhzh = xfyhzh == null ? null : xfyhzh.trim();
+    public void setXFYHZH(String XFYHZH) {
+        this.XFYHZH = XFYHZH == null ? null : XFYHZH.trim();
     }
 
     /**
@@ -713,20 +713,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getBz() {
-        return bz;
+    public String getBZ() {
+        return BZ;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.BZ
      *
-     * @param bz the value for PWC_INVOICE.OUTPUT_FPXXTB.BZ
+     * @param BZ the value for PWC_INVOICE.OUTPUT_FPXXTB.BZ
      *
      * @mbg.generated
      */
-    public void setBz(String bz) {
-        this.bz = bz == null ? null : bz.trim();
+    public void setBZ(String BZ) {
+        this.BZ = BZ == null ? null : BZ.trim();
     }
 
     /**
@@ -737,20 +737,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getSkr() {
-        return skr;
+    public String getSKR() {
+        return SKR;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.SKR
      *
-     * @param skr the value for PWC_INVOICE.OUTPUT_FPXXTB.SKR
+     * @param SKR the value for PWC_INVOICE.OUTPUT_FPXXTB.SKR
      *
      * @mbg.generated
      */
-    public void setSkr(String skr) {
-        this.skr = skr == null ? null : skr.trim();
+    public void setSKR(String SKR) {
+        this.SKR = SKR == null ? null : SKR.trim();
     }
 
     /**
@@ -761,20 +761,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFhr() {
-        return fhr;
+    public String getFHR() {
+        return FHR;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FHR
      *
-     * @param fhr the value for PWC_INVOICE.OUTPUT_FPXXTB.FHR
+     * @param FHR the value for PWC_INVOICE.OUTPUT_FPXXTB.FHR
      *
      * @mbg.generated
      */
-    public void setFhr(String fhr) {
-        this.fhr = fhr == null ? null : fhr.trim();
+    public void setFHR(String FHR) {
+        this.FHR = FHR == null ? null : FHR.trim();
     }
 
     /**
@@ -785,20 +785,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getKpr() {
-        return kpr;
+    public String getKPR() {
+        return KPR;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.KPR
      *
-     * @param kpr the value for PWC_INVOICE.OUTPUT_FPXXTB.KPR
+     * @param KPR the value for PWC_INVOICE.OUTPUT_FPXXTB.KPR
      *
      * @mbg.generated
      */
-    public void setKpr(String kpr) {
-        this.kpr = kpr == null ? null : kpr.trim();
+    public void setKPR(String KPR) {
+        this.KPR = KPR == null ? null : KPR.trim();
     }
 
     /**
@@ -809,20 +809,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFplx() {
-        return fplx;
+    public String getFPLX() {
+        return FPLX;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPLX
      *
-     * @param fplx the value for PWC_INVOICE.OUTPUT_FPXXTB.FPLX
+     * @param FPLX the value for PWC_INVOICE.OUTPUT_FPXXTB.FPLX
      *
      * @mbg.generated
      */
-    public void setFplx(String fplx) {
-        this.fplx = fplx == null ? null : fplx.trim();
+    public void setFPLX(String FPLX) {
+        this.FPLX = FPLX == null ? null : FPLX.trim();
     }
 
     /**
@@ -833,20 +833,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getFpzt() {
-        return fpzt;
+    public String getFPZT() {
+        return FPZT;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.FPZT
      *
-     * @param fpzt the value for PWC_INVOICE.OUTPUT_FPXXTB.FPZT
+     * @param FPZT the value for PWC_INVOICE.OUTPUT_FPXXTB.FPZT
      *
      * @mbg.generated
      */
-    public void setFpzt(String fpzt) {
-        this.fpzt = fpzt == null ? null : fpzt.trim();
+    public void setFPZT(String FPZT) {
+        this.FPZT = FPZT == null ? null : FPZT.trim();
     }
 
     /**
@@ -857,20 +857,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getSpbh() {
-        return spbh;
+    public String getSPBH() {
+        return SPBH;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.SPBH
      *
-     * @param spbh the value for PWC_INVOICE.OUTPUT_FPXXTB.SPBH
+     * @param SPBH the value for PWC_INVOICE.OUTPUT_FPXXTB.SPBH
      *
      * @mbg.generated
      */
-    public void setSpbh(String spbh) {
-        this.spbh = spbh == null ? null : spbh.trim();
+    public void setSPBH(String SPBH) {
+        this.SPBH = SPBH == null ? null : SPBH.trim();
     }
 
     /**
@@ -881,20 +881,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getXtly() {
-        return xtly;
+    public String getXTLY() {
+        return XTLY;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.XTLY
      *
-     * @param xtly the value for PWC_INVOICE.OUTPUT_FPXXTB.XTLY
+     * @param XTLY the value for PWC_INVOICE.OUTPUT_FPXXTB.XTLY
      *
      * @mbg.generated
      */
-    public void setXtly(String xtly) {
-        this.xtly = xtly == null ? null : xtly.trim();
+    public void setXTLY(String XTLY) {
+        this.XTLY = XTLY == null ? null : XTLY.trim();
     }
 
     /**
@@ -905,20 +905,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getCjsj() {
-        return cjsj;
+    public String getCJSJ() {
+        return CJSJ;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.CJSJ
      *
-     * @param cjsj the value for PWC_INVOICE.OUTPUT_FPXXTB.CJSJ
+     * @param CJSJ the value for PWC_INVOICE.OUTPUT_FPXXTB.CJSJ
      *
      * @mbg.generated
      */
-    public void setCjsj(String cjsj) {
-        this.cjsj = cjsj == null ? null : cjsj.trim();
+    public void setCJSJ(String CJSJ) {
+        this.CJSJ = CJSJ == null ? null : CJSJ.trim();
     }
 
     /**
@@ -929,20 +929,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getHjje() {
-        return hjje;
+    public String getHJJE() {
+        return HJJE;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.HJJE
      *
-     * @param hjje the value for PWC_INVOICE.OUTPUT_FPXXTB.HJJE
+     * @param HJJE the value for PWC_INVOICE.OUTPUT_FPXXTB.HJJE
      *
      * @mbg.generated
      */
-    public void setHjje(String hjje) {
-        this.hjje = hjje == null ? null : hjje.trim();
+    public void setHJJE(String HJJE) {
+        this.HJJE = HJJE == null ? null : HJJE.trim();
     }
 
     /**
@@ -953,20 +953,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getHjse() {
-        return hjse;
+    public String getHJSE() {
+        return HJSE;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.HJSE
      *
-     * @param hjse the value for PWC_INVOICE.OUTPUT_FPXXTB.HJSE
+     * @param HJSE the value for PWC_INVOICE.OUTPUT_FPXXTB.HJSE
      *
      * @mbg.generated
      */
-    public void setHjse(String hjse) {
-        this.hjse = hjse == null ? null : hjse.trim();
+    public void setHJSE(String HJSE) {
+        this.HJSE = HJSE == null ? null : HJSE.trim();
     }
 
     /**
@@ -977,20 +977,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getJshj() {
-        return jshj;
+    public String getJSHJ() {
+        return JSHJ;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.JSHJ
      *
-     * @param jshj the value for PWC_INVOICE.OUTPUT_FPXXTB.JSHJ
+     * @param JSHJ the value for PWC_INVOICE.OUTPUT_FPXXTB.JSHJ
      *
      * @mbg.generated
      */
-    public void setJshj(String jshj) {
-        this.jshj = jshj == null ? null : jshj.trim();
+    public void setJSHJ(String JSHJ) {
+        this.JSHJ = JSHJ == null ? null : JSHJ.trim();
     }
 
     /**
@@ -1001,20 +1001,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getZkjshj() {
-        return zkjshj;
+    public String getZKJSHJ() {
+        return ZKJSHJ;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.ZKJSHJ
      *
-     * @param zkjshj the value for PWC_INVOICE.OUTPUT_FPXXTB.ZKJSHJ
+     * @param ZKJSHJ the value for PWC_INVOICE.OUTPUT_FPXXTB.ZKJSHJ
      *
      * @mbg.generated
      */
-    public void setZkjshj(String zkjshj) {
-        this.zkjshj = zkjshj == null ? null : zkjshj.trim();
+    public void setZKJSHJ(String ZKJSHJ) {
+        this.ZKJSHJ = ZKJSHJ == null ? null : ZKJSHJ.trim();
     }
 
     /**
@@ -1025,20 +1025,20 @@ public class OutputFpxxtb implements Serializable {
      *
      * @mbg.generated
      */
-    public String getSlv() {
-        return slv;
+    public String getSLV() {
+        return SLV;
     }
 
     /**
      * This method was generated by MyBatis Generator.
      * This method sets the value of the database column PWC_INVOICE.OUTPUT_FPXXTB.SLV
      *
-     * @param slv the value for PWC_INVOICE.OUTPUT_FPXXTB.SLV
+     * @param SLV the value for PWC_INVOICE.OUTPUT_FPXXTB.SLV
      *
      * @mbg.generated
      */
-    public void setSlv(String slv) {
-        this.slv = slv == null ? null : slv.trim();
+    public void setSLV(String SLV) {
+        this.SLV = SLV == null ? null : SLV.trim();
     }
 
     /**
@@ -1053,37 +1053,37 @@ public class OutputFpxxtb implements Serializable {
         sb.append(getClass().getSimpleName());
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", fpqqlsh=").append(fpqqlsh);
-        sb.append(", fpdm=").append(fpdm);
-        sb.append(", fphm=").append(fphm);
-        sb.append(", kprq=").append(kprq);
-        sb.append(", fplxdm=").append(fplxdm);
-        sb.append(", ewm=").append(ewm);
-        sb.append(", jqbh=").append(jqbh);
-        sb.append(", jym=").append(jym);
-        sb.append(", gfmc=").append(gfmc);
-        sb.append(", gfsh=").append(gfsh);
-        sb.append(", gfdzdh=").append(gfdzdh);
-        sb.append(", gfyhzh=").append(gfyhzh);
-        sb.append(", xfsh=").append(xfsh);
-        sb.append(", xfmc=").append(xfmc);
-        sb.append(", xfdzdh=").append(xfdzdh);
-        sb.append(", xfyhzh=").append(xfyhzh);
-        sb.append(", bz=").append(bz);
-        sb.append(", skr=").append(skr);
-        sb.append(", fhr=").append(fhr);
-        sb.append(", kpr=").append(kpr);
-        sb.append(", fplx=").append(fplx);
-        sb.append(", fpzt=").append(fpzt);
-        sb.append(", spbh=").append(spbh);
-        sb.append(", xtly=").append(xtly);
-        sb.append(", cjsj=").append(cjsj);
-        sb.append(", hjje=").append(hjje);
-        sb.append(", hjse=").append(hjse);
-        sb.append(", jshj=").append(jshj);
-        sb.append(", zkjshj=").append(zkjshj);
-        sb.append(", slv=").append(slv);
+        sb.append(", ID=").append(ID);
+        sb.append(", FPQQLSH=").append(FPQQLSH);
+        sb.append(", FPDM=").append(FPDM);
+        sb.append(", FPHM=").append(FPHM);
+        sb.append(", KPRQ=").append(KPRQ);
+        sb.append(", FPLXDM=").append(FPLXDM);
+        sb.append(", EWM=").append(EWM);
+        sb.append(", JQBH=").append(JQBH);
+        sb.append(", JYM=").append(JYM);
+        sb.append(", GFMC=").append(GFMC);
+        sb.append(", GFSH=").append(GFSH);
+        sb.append(", GFDZDH=").append(GFDZDH);
+        sb.append(", GFYHZH=").append(GFYHZH);
+        sb.append(", XFSH=").append(XFSH);
+        sb.append(", XFMC=").append(XFMC);
+        sb.append(", XFDZDH=").append(XFDZDH);
+        sb.append(", XFYHZH=").append(XFYHZH);
+        sb.append(", BZ=").append(BZ);
+        sb.append(", SKR=").append(SKR);
+        sb.append(", FHR=").append(FHR);
+        sb.append(", KPR=").append(KPR);
+        sb.append(", FPLX=").append(FPLX);
+        sb.append(", FPZT=").append(FPZT);
+        sb.append(", SPBH=").append(SPBH);
+        sb.append(", XTLY=").append(XTLY);
+        sb.append(", CJSJ=").append(CJSJ);
+        sb.append(", HJJE=").append(HJJE);
+        sb.append(", HJSE=").append(HJSE);
+        sb.append(", JSHJ=").append(JSHJ);
+        sb.append(", ZKJSHJ=").append(ZKJSHJ);
+        sb.append(", SLV=").append(SLV);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/resources/pwc/taxtech/atms/invoice/OutputFpxxtbMapper.xml

@@ -6,37 +6,37 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <result column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="FPQQLSH" jdbcType="VARCHAR" property="fpqqlsh" />
-    <result column="FPDM" jdbcType="VARCHAR" property="fpdm" />
-    <result column="FPHM" jdbcType="VARCHAR" property="fphm" />
-    <result column="KPRQ" jdbcType="VARCHAR" property="kprq" />
-    <result column="FPLXDM" jdbcType="VARCHAR" property="fplxdm" />
-    <result column="EWM" jdbcType="VARCHAR" property="ewm" />
-    <result column="JQBH" jdbcType="VARCHAR" property="jqbh" />
-    <result column="JYM" jdbcType="VARCHAR" property="jym" />
-    <result column="GFMC" jdbcType="VARCHAR" property="gfmc" />
-    <result column="GFSH" jdbcType="VARCHAR" property="gfsh" />
-    <result column="GFDZDH" jdbcType="VARCHAR" property="gfdzdh" />
-    <result column="GFYHZH" jdbcType="VARCHAR" property="gfyhzh" />
-    <result column="XFSH" jdbcType="VARCHAR" property="xfsh" />
-    <result column="XFMC" jdbcType="VARCHAR" property="xfmc" />
-    <result column="XFDZDH" jdbcType="VARCHAR" property="xfdzdh" />
-    <result column="XFYHZH" jdbcType="VARCHAR" property="xfyhzh" />
-    <result column="BZ" jdbcType="VARCHAR" property="bz" />
-    <result column="SKR" jdbcType="VARCHAR" property="skr" />
-    <result column="FHR" jdbcType="VARCHAR" property="fhr" />
-    <result column="KPR" jdbcType="VARCHAR" property="kpr" />
-    <result column="FPLX" jdbcType="VARCHAR" property="fplx" />
-    <result column="FPZT" jdbcType="VARCHAR" property="fpzt" />
-    <result column="SPBH" jdbcType="VARCHAR" property="spbh" />
-    <result column="XTLY" jdbcType="VARCHAR" property="xtly" />
-    <result column="CJSJ" jdbcType="VARCHAR" property="cjsj" />
-    <result column="HJJE" jdbcType="VARCHAR" property="hjje" />
-    <result column="HJSE" jdbcType="VARCHAR" property="hjse" />
-    <result column="JSHJ" jdbcType="VARCHAR" property="jshj" />
-    <result column="ZKJSHJ" jdbcType="VARCHAR" property="zkjshj" />
-    <result column="SLV" jdbcType="VARCHAR" property="slv" />
+    <result column="ID" jdbcType="VARCHAR" property="ID" />
+    <result column="FPQQLSH" jdbcType="VARCHAR" property="FPQQLSH" />
+    <result column="FPDM" jdbcType="VARCHAR" property="FPDM" />
+    <result column="FPHM" jdbcType="VARCHAR" property="FPHM" />
+    <result column="KPRQ" jdbcType="VARCHAR" property="KPRQ" />
+    <result column="FPLXDM" jdbcType="VARCHAR" property="FPLXDM" />
+    <result column="EWM" jdbcType="VARCHAR" property="EWM" />
+    <result column="JQBH" jdbcType="VARCHAR" property="JQBH" />
+    <result column="JYM" jdbcType="VARCHAR" property="JYM" />
+    <result column="GFMC" jdbcType="VARCHAR" property="GFMC" />
+    <result column="GFSH" jdbcType="VARCHAR" property="GFSH" />
+    <result column="GFDZDH" jdbcType="VARCHAR" property="GFDZDH" />
+    <result column="GFYHZH" jdbcType="VARCHAR" property="GFYHZH" />
+    <result column="XFSH" jdbcType="VARCHAR" property="XFSH" />
+    <result column="XFMC" jdbcType="VARCHAR" property="XFMC" />
+    <result column="XFDZDH" jdbcType="VARCHAR" property="XFDZDH" />
+    <result column="XFYHZH" jdbcType="VARCHAR" property="XFYHZH" />
+    <result column="BZ" jdbcType="VARCHAR" property="BZ" />
+    <result column="SKR" jdbcType="VARCHAR" property="SKR" />
+    <result column="FHR" jdbcType="VARCHAR" property="FHR" />
+    <result column="KPR" jdbcType="VARCHAR" property="KPR" />
+    <result column="FPLX" jdbcType="VARCHAR" property="FPLX" />
+    <result column="FPZT" jdbcType="VARCHAR" property="FPZT" />
+    <result column="SPBH" jdbcType="VARCHAR" property="SPBH" />
+    <result column="XTLY" jdbcType="VARCHAR" property="XTLY" />
+    <result column="CJSJ" jdbcType="VARCHAR" property="CJSJ" />
+    <result column="HJJE" jdbcType="VARCHAR" property="HJJE" />
+    <result column="HJSE" jdbcType="VARCHAR" property="HJSE" />
+    <result column="JSHJ" jdbcType="VARCHAR" property="JSHJ" />
+    <result column="ZKJSHJ" jdbcType="VARCHAR" property="ZKJSHJ" />
+    <result column="SLV" jdbcType="VARCHAR" property="SLV" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -155,15 +155,15 @@
       KPR, FPLX, FPZT, SPBH, 
       XTLY, CJSJ, HJJE, HJSE, 
       JSHJ, ZKJSHJ, SLV)
-    values (#{id,jdbcType=VARCHAR}, #{fpqqlsh,jdbcType=VARCHAR}, #{fpdm,jdbcType=VARCHAR}, 
-      #{fphm,jdbcType=VARCHAR}, #{kprq,jdbcType=VARCHAR}, #{fplxdm,jdbcType=VARCHAR}, 
-      #{ewm,jdbcType=VARCHAR}, #{jqbh,jdbcType=VARCHAR}, #{jym,jdbcType=VARCHAR}, #{gfmc,jdbcType=VARCHAR}, 
-      #{gfsh,jdbcType=VARCHAR}, #{gfdzdh,jdbcType=VARCHAR}, #{gfyhzh,jdbcType=VARCHAR}, 
-      #{xfsh,jdbcType=VARCHAR}, #{xfmc,jdbcType=VARCHAR}, #{xfdzdh,jdbcType=VARCHAR}, 
-      #{xfyhzh,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}, #{skr,jdbcType=VARCHAR}, #{fhr,jdbcType=VARCHAR}, 
-      #{kpr,jdbcType=VARCHAR}, #{fplx,jdbcType=VARCHAR}, #{fpzt,jdbcType=VARCHAR}, #{spbh,jdbcType=VARCHAR}, 
-      #{xtly,jdbcType=VARCHAR}, #{cjsj,jdbcType=VARCHAR}, #{hjje,jdbcType=VARCHAR}, #{hjse,jdbcType=VARCHAR}, 
-      #{jshj,jdbcType=VARCHAR}, #{zkjshj,jdbcType=VARCHAR}, #{slv,jdbcType=VARCHAR})
+    values (#{ID,jdbcType=VARCHAR}, #{FPQQLSH,jdbcType=VARCHAR}, #{FPDM,jdbcType=VARCHAR}, 
+      #{FPHM,jdbcType=VARCHAR}, #{KPRQ,jdbcType=VARCHAR}, #{FPLXDM,jdbcType=VARCHAR}, 
+      #{EWM,jdbcType=VARCHAR}, #{JQBH,jdbcType=VARCHAR}, #{JYM,jdbcType=VARCHAR}, #{GFMC,jdbcType=VARCHAR}, 
+      #{GFSH,jdbcType=VARCHAR}, #{GFDZDH,jdbcType=VARCHAR}, #{GFYHZH,jdbcType=VARCHAR}, 
+      #{XFSH,jdbcType=VARCHAR}, #{XFMC,jdbcType=VARCHAR}, #{XFDZDH,jdbcType=VARCHAR}, 
+      #{XFYHZH,jdbcType=VARCHAR}, #{BZ,jdbcType=VARCHAR}, #{SKR,jdbcType=VARCHAR}, #{FHR,jdbcType=VARCHAR}, 
+      #{KPR,jdbcType=VARCHAR}, #{FPLX,jdbcType=VARCHAR}, #{FPZT,jdbcType=VARCHAR}, #{SPBH,jdbcType=VARCHAR}, 
+      #{XTLY,jdbcType=VARCHAR}, #{CJSJ,jdbcType=VARCHAR}, #{HJJE,jdbcType=VARCHAR}, #{HJSE,jdbcType=VARCHAR}, 
+      #{JSHJ,jdbcType=VARCHAR}, #{ZKJSHJ,jdbcType=VARCHAR}, #{SLV,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.OutputFpxxtb">
     <!--
@@ -172,193 +172,193 @@
     -->
     insert into OUTPUT_FPXXTB
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+      <if test="ID != null">
         ID,
       </if>
-      <if test="fpqqlsh != null">
+      <if test="FPQQLSH != null">
         FPQQLSH,
       </if>
-      <if test="fpdm != null">
+      <if test="FPDM != null">
         FPDM,
       </if>
-      <if test="fphm != null">
+      <if test="FPHM != null">
         FPHM,
       </if>
-      <if test="kprq != null">
+      <if test="KPRQ != null">
         KPRQ,
       </if>
-      <if test="fplxdm != null">
+      <if test="FPLXDM != null">
         FPLXDM,
       </if>
-      <if test="ewm != null">
+      <if test="EWM != null">
         EWM,
       </if>
-      <if test="jqbh != null">
+      <if test="JQBH != null">
         JQBH,
       </if>
-      <if test="jym != null">
+      <if test="JYM != null">
         JYM,
       </if>
-      <if test="gfmc != null">
+      <if test="GFMC != null">
         GFMC,
       </if>
-      <if test="gfsh != null">
+      <if test="GFSH != null">
         GFSH,
       </if>
-      <if test="gfdzdh != null">
+      <if test="GFDZDH != null">
         GFDZDH,
       </if>
-      <if test="gfyhzh != null">
+      <if test="GFYHZH != null">
         GFYHZH,
       </if>
-      <if test="xfsh != null">
+      <if test="XFSH != null">
         XFSH,
       </if>
-      <if test="xfmc != null">
+      <if test="XFMC != null">
         XFMC,
       </if>
-      <if test="xfdzdh != null">
+      <if test="XFDZDH != null">
         XFDZDH,
       </if>
-      <if test="xfyhzh != null">
+      <if test="XFYHZH != null">
         XFYHZH,
       </if>
-      <if test="bz != null">
+      <if test="BZ != null">
         BZ,
       </if>
-      <if test="skr != null">
+      <if test="SKR != null">
         SKR,
       </if>
-      <if test="fhr != null">
+      <if test="FHR != null">
         FHR,
       </if>
-      <if test="kpr != null">
+      <if test="KPR != null">
         KPR,
       </if>
-      <if test="fplx != null">
+      <if test="FPLX != null">
         FPLX,
       </if>
-      <if test="fpzt != null">
+      <if test="FPZT != null">
         FPZT,
       </if>
-      <if test="spbh != null">
+      <if test="SPBH != null">
         SPBH,
       </if>
-      <if test="xtly != null">
+      <if test="XTLY != null">
         XTLY,
       </if>
-      <if test="cjsj != null">
+      <if test="CJSJ != null">
         CJSJ,
       </if>
-      <if test="hjje != null">
+      <if test="HJJE != null">
         HJJE,
       </if>
-      <if test="hjse != null">
+      <if test="HJSE != null">
         HJSE,
       </if>
-      <if test="jshj != null">
+      <if test="JSHJ != null">
         JSHJ,
       </if>
-      <if test="zkjshj != null">
+      <if test="ZKJSHJ != null">
         ZKJSHJ,
       </if>
-      <if test="slv != null">
+      <if test="SLV != null">
         SLV,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
+      <if test="ID != null">
+        #{ID,jdbcType=VARCHAR},
       </if>
-      <if test="fpqqlsh != null">
-        #{fpqqlsh,jdbcType=VARCHAR},
+      <if test="FPQQLSH != null">
+        #{FPQQLSH,jdbcType=VARCHAR},
       </if>
-      <if test="fpdm != null">
-        #{fpdm,jdbcType=VARCHAR},
+      <if test="FPDM != null">
+        #{FPDM,jdbcType=VARCHAR},
       </if>
-      <if test="fphm != null">
-        #{fphm,jdbcType=VARCHAR},
+      <if test="FPHM != null">
+        #{FPHM,jdbcType=VARCHAR},
       </if>
-      <if test="kprq != null">
-        #{kprq,jdbcType=VARCHAR},
+      <if test="KPRQ != null">
+        #{KPRQ,jdbcType=VARCHAR},
       </if>
-      <if test="fplxdm != null">
-        #{fplxdm,jdbcType=VARCHAR},
+      <if test="FPLXDM != null">
+        #{FPLXDM,jdbcType=VARCHAR},
       </if>
-      <if test="ewm != null">
-        #{ewm,jdbcType=VARCHAR},
+      <if test="EWM != null">
+        #{EWM,jdbcType=VARCHAR},
       </if>
-      <if test="jqbh != null">
-        #{jqbh,jdbcType=VARCHAR},
+      <if test="JQBH != null">
+        #{JQBH,jdbcType=VARCHAR},
       </if>
-      <if test="jym != null">
-        #{jym,jdbcType=VARCHAR},
+      <if test="JYM != null">
+        #{JYM,jdbcType=VARCHAR},
       </if>
-      <if test="gfmc != null">
-        #{gfmc,jdbcType=VARCHAR},
+      <if test="GFMC != null">
+        #{GFMC,jdbcType=VARCHAR},
       </if>
-      <if test="gfsh != null">
-        #{gfsh,jdbcType=VARCHAR},
+      <if test="GFSH != null">
+        #{GFSH,jdbcType=VARCHAR},
       </if>
-      <if test="gfdzdh != null">
-        #{gfdzdh,jdbcType=VARCHAR},
+      <if test="GFDZDH != null">
+        #{GFDZDH,jdbcType=VARCHAR},
       </if>
-      <if test="gfyhzh != null">
-        #{gfyhzh,jdbcType=VARCHAR},
+      <if test="GFYHZH != null">
+        #{GFYHZH,jdbcType=VARCHAR},
       </if>
-      <if test="xfsh != null">
-        #{xfsh,jdbcType=VARCHAR},
+      <if test="XFSH != null">
+        #{XFSH,jdbcType=VARCHAR},
       </if>
-      <if test="xfmc != null">
-        #{xfmc,jdbcType=VARCHAR},
+      <if test="XFMC != null">
+        #{XFMC,jdbcType=VARCHAR},
       </if>
-      <if test="xfdzdh != null">
-        #{xfdzdh,jdbcType=VARCHAR},
+      <if test="XFDZDH != null">
+        #{XFDZDH,jdbcType=VARCHAR},
       </if>
-      <if test="xfyhzh != null">
-        #{xfyhzh,jdbcType=VARCHAR},
+      <if test="XFYHZH != null">
+        #{XFYHZH,jdbcType=VARCHAR},
       </if>
-      <if test="bz != null">
-        #{bz,jdbcType=VARCHAR},
+      <if test="BZ != null">
+        #{BZ,jdbcType=VARCHAR},
       </if>
-      <if test="skr != null">
-        #{skr,jdbcType=VARCHAR},
+      <if test="SKR != null">
+        #{SKR,jdbcType=VARCHAR},
       </if>
-      <if test="fhr != null">
-        #{fhr,jdbcType=VARCHAR},
+      <if test="FHR != null">
+        #{FHR,jdbcType=VARCHAR},
       </if>
-      <if test="kpr != null">
-        #{kpr,jdbcType=VARCHAR},
+      <if test="KPR != null">
+        #{KPR,jdbcType=VARCHAR},
       </if>
-      <if test="fplx != null">
-        #{fplx,jdbcType=VARCHAR},
+      <if test="FPLX != null">
+        #{FPLX,jdbcType=VARCHAR},
       </if>
-      <if test="fpzt != null">
-        #{fpzt,jdbcType=VARCHAR},
+      <if test="FPZT != null">
+        #{FPZT,jdbcType=VARCHAR},
       </if>
-      <if test="spbh != null">
-        #{spbh,jdbcType=VARCHAR},
+      <if test="SPBH != null">
+        #{SPBH,jdbcType=VARCHAR},
       </if>
-      <if test="xtly != null">
-        #{xtly,jdbcType=VARCHAR},
+      <if test="XTLY != null">
+        #{XTLY,jdbcType=VARCHAR},
       </if>
-      <if test="cjsj != null">
-        #{cjsj,jdbcType=VARCHAR},
+      <if test="CJSJ != null">
+        #{CJSJ,jdbcType=VARCHAR},
       </if>
-      <if test="hjje != null">
-        #{hjje,jdbcType=VARCHAR},
+      <if test="HJJE != null">
+        #{HJJE,jdbcType=VARCHAR},
       </if>
-      <if test="hjse != null">
-        #{hjse,jdbcType=VARCHAR},
+      <if test="HJSE != null">
+        #{HJSE,jdbcType=VARCHAR},
       </if>
-      <if test="jshj != null">
-        #{jshj,jdbcType=VARCHAR},
+      <if test="JSHJ != null">
+        #{JSHJ,jdbcType=VARCHAR},
       </if>
-      <if test="zkjshj != null">
-        #{zkjshj,jdbcType=VARCHAR},
+      <if test="ZKJSHJ != null">
+        #{ZKJSHJ,jdbcType=VARCHAR},
       </if>
-      <if test="slv != null">
-        #{slv,jdbcType=VARCHAR},
+      <if test="SLV != null">
+        #{SLV,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -379,98 +379,98 @@
     -->
     update OUTPUT_FPXXTB
     <set>
-      <if test="record.id != null">
-        ID = #{record.id,jdbcType=VARCHAR},
+      <if test="record.ID != null">
+        ID = #{record.ID,jdbcType=VARCHAR},
       </if>
-      <if test="record.fpqqlsh != null">
-        FPQQLSH = #{record.fpqqlsh,jdbcType=VARCHAR},
+      <if test="record.FPQQLSH != null">
+        FPQQLSH = #{record.FPQQLSH,jdbcType=VARCHAR},
       </if>
-      <if test="record.fpdm != null">
-        FPDM = #{record.fpdm,jdbcType=VARCHAR},
+      <if test="record.FPDM != null">
+        FPDM = #{record.FPDM,jdbcType=VARCHAR},
       </if>
-      <if test="record.fphm != null">
-        FPHM = #{record.fphm,jdbcType=VARCHAR},
+      <if test="record.FPHM != null">
+        FPHM = #{record.FPHM,jdbcType=VARCHAR},
       </if>
-      <if test="record.kprq != null">
-        KPRQ = #{record.kprq,jdbcType=VARCHAR},
+      <if test="record.KPRQ != null">
+        KPRQ = #{record.KPRQ,jdbcType=VARCHAR},
       </if>
-      <if test="record.fplxdm != null">
-        FPLXDM = #{record.fplxdm,jdbcType=VARCHAR},
+      <if test="record.FPLXDM != null">
+        FPLXDM = #{record.FPLXDM,jdbcType=VARCHAR},
       </if>
-      <if test="record.ewm != null">
-        EWM = #{record.ewm,jdbcType=VARCHAR},
+      <if test="record.EWM != null">
+        EWM = #{record.EWM,jdbcType=VARCHAR},
       </if>
-      <if test="record.jqbh != null">
-        JQBH = #{record.jqbh,jdbcType=VARCHAR},
+      <if test="record.JQBH != null">
+        JQBH = #{record.JQBH,jdbcType=VARCHAR},
       </if>
-      <if test="record.jym != null">
-        JYM = #{record.jym,jdbcType=VARCHAR},
+      <if test="record.JYM != null">
+        JYM = #{record.JYM,jdbcType=VARCHAR},
       </if>
-      <if test="record.gfmc != null">
-        GFMC = #{record.gfmc,jdbcType=VARCHAR},
+      <if test="record.GFMC != null">
+        GFMC = #{record.GFMC,jdbcType=VARCHAR},
       </if>
-      <if test="record.gfsh != null">
-        GFSH = #{record.gfsh,jdbcType=VARCHAR},
+      <if test="record.GFSH != null">
+        GFSH = #{record.GFSH,jdbcType=VARCHAR},
       </if>
-      <if test="record.gfdzdh != null">
-        GFDZDH = #{record.gfdzdh,jdbcType=VARCHAR},
+      <if test="record.GFDZDH != null">
+        GFDZDH = #{record.GFDZDH,jdbcType=VARCHAR},
       </if>
-      <if test="record.gfyhzh != null">
-        GFYHZH = #{record.gfyhzh,jdbcType=VARCHAR},
+      <if test="record.GFYHZH != null">
+        GFYHZH = #{record.GFYHZH,jdbcType=VARCHAR},
       </if>
-      <if test="record.xfsh != null">
-        XFSH = #{record.xfsh,jdbcType=VARCHAR},
+      <if test="record.XFSH != null">
+        XFSH = #{record.XFSH,jdbcType=VARCHAR},
       </if>
-      <if test="record.xfmc != null">
-        XFMC = #{record.xfmc,jdbcType=VARCHAR},
+      <if test="record.XFMC != null">
+        XFMC = #{record.XFMC,jdbcType=VARCHAR},
       </if>
-      <if test="record.xfdzdh != null">
-        XFDZDH = #{record.xfdzdh,jdbcType=VARCHAR},
+      <if test="record.XFDZDH != null">
+        XFDZDH = #{record.XFDZDH,jdbcType=VARCHAR},
       </if>
-      <if test="record.xfyhzh != null">
-        XFYHZH = #{record.xfyhzh,jdbcType=VARCHAR},
+      <if test="record.XFYHZH != null">
+        XFYHZH = #{record.XFYHZH,jdbcType=VARCHAR},
       </if>
-      <if test="record.bz != null">
-        BZ = #{record.bz,jdbcType=VARCHAR},
+      <if test="record.BZ != null">
+        BZ = #{record.BZ,jdbcType=VARCHAR},
       </if>
-      <if test="record.skr != null">
-        SKR = #{record.skr,jdbcType=VARCHAR},
+      <if test="record.SKR != null">
+        SKR = #{record.SKR,jdbcType=VARCHAR},
       </if>
-      <if test="record.fhr != null">
-        FHR = #{record.fhr,jdbcType=VARCHAR},
+      <if test="record.FHR != null">
+        FHR = #{record.FHR,jdbcType=VARCHAR},
       </if>
-      <if test="record.kpr != null">
-        KPR = #{record.kpr,jdbcType=VARCHAR},
+      <if test="record.KPR != null">
+        KPR = #{record.KPR,jdbcType=VARCHAR},
       </if>
-      <if test="record.fplx != null">
-        FPLX = #{record.fplx,jdbcType=VARCHAR},
+      <if test="record.FPLX != null">
+        FPLX = #{record.FPLX,jdbcType=VARCHAR},
       </if>
-      <if test="record.fpzt != null">
-        FPZT = #{record.fpzt,jdbcType=VARCHAR},
+      <if test="record.FPZT != null">
+        FPZT = #{record.FPZT,jdbcType=VARCHAR},
       </if>
-      <if test="record.spbh != null">
-        SPBH = #{record.spbh,jdbcType=VARCHAR},
+      <if test="record.SPBH != null">
+        SPBH = #{record.SPBH,jdbcType=VARCHAR},
       </if>
-      <if test="record.xtly != null">
-        XTLY = #{record.xtly,jdbcType=VARCHAR},
+      <if test="record.XTLY != null">
+        XTLY = #{record.XTLY,jdbcType=VARCHAR},
       </if>
-      <if test="record.cjsj != null">
-        CJSJ = #{record.cjsj,jdbcType=VARCHAR},
+      <if test="record.CJSJ != null">
+        CJSJ = #{record.CJSJ,jdbcType=VARCHAR},
       </if>
-      <if test="record.hjje != null">
-        HJJE = #{record.hjje,jdbcType=VARCHAR},
+      <if test="record.HJJE != null">
+        HJJE = #{record.HJJE,jdbcType=VARCHAR},
       </if>
-      <if test="record.hjse != null">
-        HJSE = #{record.hjse,jdbcType=VARCHAR},
+      <if test="record.HJSE != null">
+        HJSE = #{record.HJSE,jdbcType=VARCHAR},
       </if>
-      <if test="record.jshj != null">
-        JSHJ = #{record.jshj,jdbcType=VARCHAR},
+      <if test="record.JSHJ != null">
+        JSHJ = #{record.JSHJ,jdbcType=VARCHAR},
       </if>
-      <if test="record.zkjshj != null">
-        ZKJSHJ = #{record.zkjshj,jdbcType=VARCHAR},
+      <if test="record.ZKJSHJ != null">
+        ZKJSHJ = #{record.ZKJSHJ,jdbcType=VARCHAR},
       </if>
-      <if test="record.slv != null">
-        SLV = #{record.slv,jdbcType=VARCHAR},
+      <if test="record.SLV != null">
+        SLV = #{record.SLV,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -483,37 +483,37 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update OUTPUT_FPXXTB
-    set ID = #{record.id,jdbcType=VARCHAR},
-      FPQQLSH = #{record.fpqqlsh,jdbcType=VARCHAR},
-      FPDM = #{record.fpdm,jdbcType=VARCHAR},
-      FPHM = #{record.fphm,jdbcType=VARCHAR},
-      KPRQ = #{record.kprq,jdbcType=VARCHAR},
-      FPLXDM = #{record.fplxdm,jdbcType=VARCHAR},
-      EWM = #{record.ewm,jdbcType=VARCHAR},
-      JQBH = #{record.jqbh,jdbcType=VARCHAR},
-      JYM = #{record.jym,jdbcType=VARCHAR},
-      GFMC = #{record.gfmc,jdbcType=VARCHAR},
-      GFSH = #{record.gfsh,jdbcType=VARCHAR},
-      GFDZDH = #{record.gfdzdh,jdbcType=VARCHAR},
-      GFYHZH = #{record.gfyhzh,jdbcType=VARCHAR},
-      XFSH = #{record.xfsh,jdbcType=VARCHAR},
-      XFMC = #{record.xfmc,jdbcType=VARCHAR},
-      XFDZDH = #{record.xfdzdh,jdbcType=VARCHAR},
-      XFYHZH = #{record.xfyhzh,jdbcType=VARCHAR},
-      BZ = #{record.bz,jdbcType=VARCHAR},
-      SKR = #{record.skr,jdbcType=VARCHAR},
-      FHR = #{record.fhr,jdbcType=VARCHAR},
-      KPR = #{record.kpr,jdbcType=VARCHAR},
-      FPLX = #{record.fplx,jdbcType=VARCHAR},
-      FPZT = #{record.fpzt,jdbcType=VARCHAR},
-      SPBH = #{record.spbh,jdbcType=VARCHAR},
-      XTLY = #{record.xtly,jdbcType=VARCHAR},
-      CJSJ = #{record.cjsj,jdbcType=VARCHAR},
-      HJJE = #{record.hjje,jdbcType=VARCHAR},
-      HJSE = #{record.hjse,jdbcType=VARCHAR},
-      JSHJ = #{record.jshj,jdbcType=VARCHAR},
-      ZKJSHJ = #{record.zkjshj,jdbcType=VARCHAR},
-      SLV = #{record.slv,jdbcType=VARCHAR}
+    set ID = #{record.ID,jdbcType=VARCHAR},
+      FPQQLSH = #{record.FPQQLSH,jdbcType=VARCHAR},
+      FPDM = #{record.FPDM,jdbcType=VARCHAR},
+      FPHM = #{record.FPHM,jdbcType=VARCHAR},
+      KPRQ = #{record.KPRQ,jdbcType=VARCHAR},
+      FPLXDM = #{record.FPLXDM,jdbcType=VARCHAR},
+      EWM = #{record.EWM,jdbcType=VARCHAR},
+      JQBH = #{record.JQBH,jdbcType=VARCHAR},
+      JYM = #{record.JYM,jdbcType=VARCHAR},
+      GFMC = #{record.GFMC,jdbcType=VARCHAR},
+      GFSH = #{record.GFSH,jdbcType=VARCHAR},
+      GFDZDH = #{record.GFDZDH,jdbcType=VARCHAR},
+      GFYHZH = #{record.GFYHZH,jdbcType=VARCHAR},
+      XFSH = #{record.XFSH,jdbcType=VARCHAR},
+      XFMC = #{record.XFMC,jdbcType=VARCHAR},
+      XFDZDH = #{record.XFDZDH,jdbcType=VARCHAR},
+      XFYHZH = #{record.XFYHZH,jdbcType=VARCHAR},
+      BZ = #{record.BZ,jdbcType=VARCHAR},
+      SKR = #{record.SKR,jdbcType=VARCHAR},
+      FHR = #{record.FHR,jdbcType=VARCHAR},
+      KPR = #{record.KPR,jdbcType=VARCHAR},
+      FPLX = #{record.FPLX,jdbcType=VARCHAR},
+      FPZT = #{record.FPZT,jdbcType=VARCHAR},
+      SPBH = #{record.SPBH,jdbcType=VARCHAR},
+      XTLY = #{record.XTLY,jdbcType=VARCHAR},
+      CJSJ = #{record.CJSJ,jdbcType=VARCHAR},
+      HJJE = #{record.HJJE,jdbcType=VARCHAR},
+      HJSE = #{record.HJSE,jdbcType=VARCHAR},
+      JSHJ = #{record.JSHJ,jdbcType=VARCHAR},
+      ZKJSHJ = #{record.ZKJSHJ,jdbcType=VARCHAR},
+      SLV = #{record.SLV,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -2668,6 +2668,34 @@
             $scope.voucherFileName = evidence.fileName;
             $scope.voucherFileID = evidence.fileID;
         };
+
+        $scope.upLoadManual = function(){
+          var text= $(".li").find(".active").text();
+          $log.debug(text);
+          if(text == '海关专用缴款书' || text =='代扣代缴税收通用缴款书取数'){
+            var excelIo = new GC.Spread.Excel.IO();
+                var excelFilePath = 'resources/Excel/importExcel.xlsx';
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', excelFilePath, true);
+                xhr.responseType = 'blob';
+                xhr.onload = function(e) {
+                  if (this.status == 200) {
+                    // get binary data as a response
+                    var blob = this.response;
+                    // convert Excel to JSON
+                    excelIo.open(blob, function (json) {
+                        var workbookObj = json;
+                        spread.fromJSON(workbookObj);
+                    }, function (e) {
+                        // process error
+                        alert(e.errorMessage);
+                    }, {});
+                  }
+                };
+          }else{
+             SweetAlert.warning("仅支持海关专用缴款书或代扣代缴税收通用缴款书取数");
+          }
+        };
         /****************************************证据文件function Ended*************************************************/
         /****************************************证据文件function Ended*************************************************/
         /****************************************证据文件function Ended*************************************************/

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.html

@@ -6,6 +6,8 @@
                 class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>
         <span ng-if="!isBSPL" ng-click="doApprove();"><i
                 class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>
+        <span ng-if="!isBSPL" ng-click="upLoadManual();"><i
+                class="fa fa-floppy-o"></i>&nbsp;{{'上传手工数据'}}</span>
         <!--<span ng-if="!isBSPL" ng-click="saveReportCache();"><i-->
                 <!--class="fa fa-floppy-o"></i>&nbsp;{{'Save' | translate}}</span>-->
     </div>

atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js

@@ -21,6 +21,7 @@
                 AmountEnd: param.amountEnd,
                 TaxAmountStart: param.taxAmountStart,
                 TaxAmountEnd: param.taxAmountEnd,
+                Tag: param.tag,
             }, apiConfig.createVat());
         },
 
@@ -40,6 +41,7 @@
                 AmountEnd: param.amountEnd,
                 TaxAmountStart: param.taxAmountStart,
                 TaxAmountEnd: param.taxAmountEnd,
+                Tag: param.tag,
             }, apiConfig.createVat());
         },
 

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -62,7 +62,8 @@
                 amountEnd: null,
                 invoiceType: null,
                 taxAmountStart: null,
-                taxAmountEnd: null
+                taxAmountEnd: null,
+                tag: null
             };
             $scope.queryParams.periodStart = vatSessionService.month;
             $scope.queryParams.periodEnd = vatSessionService.month;

atms-web/src/main/webapp/app/vat/preview/vat-preview-outputoff-invoice/vat-preview-outputoff-invoice.ctrl.js

@@ -410,7 +410,8 @@
                 amountEnd: null,
                 invoiceType: null,
                 taxAmountStart: null,
-                taxAmountEnd: null
+                taxAmountEnd: null,
+                tag: 'off'
             };
             $scope.criteriaList = [];
             $scope.queryParams.periodStart = startMonth;