modify

atms-api/src/main/java/pwc/taxtech/atms/dao/InputInvoiceMapper.java

@@ -50,22 +50,6 @@ public interface InputInvoiceMapper extends MyMapper {
      */
     int insertSelective(InputInvoice record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table input_invoice
-     *
-     * @mbg.generated
-     */
-    List<InputInvoice> selectByExampleWithBLOBsWithRowbounds(InputInvoiceExample example, RowBounds rowBounds);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table input_invoice
-     *
-     * @mbg.generated
-     */
-    List<InputInvoice> selectByExampleWithBLOBs(InputInvoiceExample example);
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table input_invoice
@@ -98,14 +82,6 @@ public interface InputInvoiceMapper extends MyMapper {
      */
     int updateByExampleSelective(@Param("record") InputInvoice record, @Param("example") InputInvoiceExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table input_invoice
-     *
-     * @mbg.generated
-     */
-    int updateByExampleWithBLOBs(@Param("record") InputInvoice record, @Param("example") InputInvoiceExample example);
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table input_invoice
@@ -122,14 +98,6 @@ public interface InputInvoiceMapper extends MyMapper {
      */
     int updateByPrimaryKeySelective(InputInvoice record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table input_invoice
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeyWithBLOBs(InputInvoice record);
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table input_invoice

atms-api/src/main/java/pwc/taxtech/atms/entitiy/InputInvoice.java

@@ -30,7 +30,7 @@ public class InputInvoice extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private String invoiceFileId;
+    private Long invoiceFileId;
 
     /**
      * Database Column Remarks:
@@ -340,6 +340,17 @@ public class InputInvoice extends BaseEntity implements Serializable {
      */
     private Integer status;
 
+    /**
+     * Database Column Remarks:
+     *   备注
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column input_invoice.remark
+     *
+     * @mbg.generated
+     */
+    private String remark;
+
     /**
      * Database Column Remarks:
      *   抵扣区间
@@ -433,17 +444,6 @@ public class InputInvoice extends BaseEntity implements Serializable {
      */
     private Boolean isRedInvoice;
 
-    /**
-     * Database Column Remarks:
-     *   备注
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column input_invoice.remark
-     *
-     * @mbg.generated
-     */
-    private String remark;
-
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table input_invoice
@@ -484,7 +484,7 @@ public class InputInvoice extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public String getInvoiceFileId() {
+    public Long getInvoiceFileId() {
         return invoiceFileId;
     }
 
@@ -496,8 +496,8 @@ public class InputInvoice extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setInvoiceFileId(String invoiceFileId) {
-        this.invoiceFileId = invoiceFileId == null ? null : invoiceFileId.trim();
+    public void setInvoiceFileId(Long invoiceFileId) {
+        this.invoiceFileId = invoiceFileId;
     }
 
     /**
@@ -1172,6 +1172,30 @@ public class InputInvoice extends BaseEntity implements Serializable {
         this.status = status;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column input_invoice.remark
+     *
+     * @return the value of input_invoice.remark
+     *
+     * @mbg.generated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column input_invoice.remark
+     *
+     * @param remark the value for input_invoice.remark
+     *
+     * @mbg.generated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column input_invoice.deductible_period
@@ -1388,30 +1412,6 @@ public class InputInvoice extends BaseEntity implements Serializable {
         this.isRedInvoice = isRedInvoice;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column input_invoice.remark
-     *
-     * @return the value of input_invoice.remark
-     *
-     * @mbg.generated
-     */
-    public String getRemark() {
-        return remark;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column input_invoice.remark
-     *
-     * @param remark the value for input_invoice.remark
-     *
-     * @mbg.generated
-     */
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table input_invoice
@@ -1454,6 +1454,7 @@ public class InputInvoice extends BaseEntity implements Serializable {
         sb.append(", staffId=").append(staffId);
         sb.append(", orderIdentifier=").append(orderIdentifier);
         sb.append(", status=").append(status);
+        sb.append(", remark=").append(remark);
         sb.append(", deductiblePeriod=").append(deductiblePeriod);
         sb.append(", deductibleDate=").append(deductibleDate);
         sb.append(", deductible=").append(deductible);
@@ -1463,7 +1464,6 @@ public class InputInvoice extends BaseEntity implements Serializable {
         sb.append(", serialNo=").append(serialNo);
         sb.append(", deductibleResult=").append(deductibleResult);
         sb.append(", isRedInvoice=").append(isRedInvoice);
-        sb.append(", remark=").append(remark);
         sb.append("]");
         return sb.toString();
     }

atms-api/src/main/java/pwc/taxtech/atms/entitiy/InputInvoiceExample.java

@@ -266,62 +266,52 @@ public class InputInvoiceExample {
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdEqualTo(String value) {
+        public Criteria andInvoiceFileIdEqualTo(Long value) {
             addCriterion("invoice_file_id =", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdNotEqualTo(String value) {
+        public Criteria andInvoiceFileIdNotEqualTo(Long value) {
             addCriterion("invoice_file_id <>", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdGreaterThan(String value) {
+        public Criteria andInvoiceFileIdGreaterThan(Long value) {
             addCriterion("invoice_file_id >", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdGreaterThanOrEqualTo(String value) {
+        public Criteria andInvoiceFileIdGreaterThanOrEqualTo(Long value) {
             addCriterion("invoice_file_id >=", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdLessThan(String value) {
+        public Criteria andInvoiceFileIdLessThan(Long value) {
             addCriterion("invoice_file_id <", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdLessThanOrEqualTo(String value) {
+        public Criteria andInvoiceFileIdLessThanOrEqualTo(Long value) {
             addCriterion("invoice_file_id <=", value, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdLike(String value) {
-            addCriterion("invoice_file_id like", value, "invoiceFileId");
-            return (Criteria) this;
-        }
-
-        public Criteria andInvoiceFileIdNotLike(String value) {
-            addCriterion("invoice_file_id not like", value, "invoiceFileId");
-            return (Criteria) this;
-        }
-
-        public Criteria andInvoiceFileIdIn(List<String> values) {
+        public Criteria andInvoiceFileIdIn(List<Long> values) {
             addCriterion("invoice_file_id in", values, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdNotIn(List<String> values) {
+        public Criteria andInvoiceFileIdNotIn(List<Long> values) {
             addCriterion("invoice_file_id not in", values, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdBetween(String value1, String value2) {
+        public Criteria andInvoiceFileIdBetween(Long value1, Long value2) {
             addCriterion("invoice_file_id between", value1, value2, "invoiceFileId");
             return (Criteria) this;
         }
 
-        public Criteria andInvoiceFileIdNotBetween(String value1, String value2) {
+        public Criteria andInvoiceFileIdNotBetween(Long value1, Long value2) {
             addCriterion("invoice_file_id not between", value1, value2, "invoiceFileId");
             return (Criteria) this;
         }
@@ -2127,62 +2117,132 @@ public class InputInvoiceExample {
         }
 
         public Criteria andStatusIsNull() {
-            addCriterion("status is null");
+            addCriterion("`status` is null");
             return (Criteria) this;
         }
 
         public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
+            addCriterion("`status` is not null");
             return (Criteria) this;
         }
 
         public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("status =", value, "status");
+            addCriterion("`status` =", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("status <>", value, "status");
+            addCriterion("`status` <>", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("status >", value, "status");
+            addCriterion("`status` >", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("status >=", value, "status");
+            addCriterion("`status` >=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThan(Integer value) {
-            addCriterion("status <", value, "status");
+            addCriterion("`status` <", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("status <=", value, "status");
+            addCriterion("`status` <=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("status in", values, "status");
+            addCriterion("`status` in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("status not in", values, "status");
+            addCriterion("`status` not in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("status between", value1, value2, "status");
+            addCriterion("`status` between", value1, value2, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("status not between", value1, value2, "status");
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
 

atms-api/src/main/resources/sqlMapConfig.xml

@@ -4,14 +4,14 @@
 
  <configuration>
      <!-- 全局setting配置，根据需要添加 -->
-     <settings>
-         <setting name="logImpl" value="LOG4J" />  
-     </settings>
+     <!--<settings>-->
+         <!--<setting name="logImpl" value="LOG4J" />  -->
+     <!--</settings>-->
 
     <!-- 配置别名 -->
-    <typeAliases>
-        <package name="pwc.taxtech.atms.entitiy"/>
-    </typeAliases>
+    <!--<typeAliases>-->
+        <!--<package name="pwc.taxtech.atms.entitiy"/>-->
+    <!--</typeAliases>-->
 
     <!-- 插件 -->
     <plugins>

atms-api/src/test/resources/generatorConfig.xml

@@ -9,6 +9,8 @@
   <context id="contextId" targetRuntime="MyBatis3">
     <!-- 考虑需要兼容DB2与ORCAL数据库, 大部份字段不需要加双引号，autoDelimitKeywords设置为false -->
     <property name="autoDelimitKeywords" value="true" />
+    <property name="beginningDelimiter" value="`"/>
+    <property name="endingDelimiter" value="`"/>
     <property name="javaFileEncoding" value="UTF-8" />
     <plugin type="org.mybatis.generator.plugins.MapperAnnotationPlugin" />
     <plugin type="org.mybatis.generator.plugins.RowBoundsPlugin" />