1、fix red info tab

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/dd/RedLetterInfoTableDto.java

@@ -50,6 +50,17 @@ public class RedLetterInfoTableDto implements Serializable {
      */
     private String projectId;
 
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
     /**
      * Database Column Remarks:
      *   税务系统期间
@@ -70,7 +81,7 @@ public class RedLetterInfoTableDto implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer fillInDate;
+    private Date fillInDate;
 
     /**
      * Database Column Remarks:
@@ -295,6 +306,30 @@ public class RedLetterInfoTableDto implements Serializable {
         this.projectId = projectId == null ? null : projectId.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column red_letter_info_table.period
+     *
+     * @return the value of red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column red_letter_info_table.period
+     *
+     * @param period the value for red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column red_letter_info_table.tms_period
@@ -327,7 +362,7 @@ public class RedLetterInfoTableDto implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getFillInDate() {
+    public Date getFillInDate() {
         return fillInDate;
     }
 
@@ -339,7 +374,7 @@ public class RedLetterInfoTableDto implements Serializable {
      *
      * @mbg.generated
      */
-    public void setFillInDate(Integer fillInDate) {
+    public void setFillInDate(Date fillInDate) {
         this.fillInDate = fillInDate;
     }
 
@@ -670,6 +705,7 @@ public class RedLetterInfoTableDto implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
         sb.append(", tmsPeriod=").append(tmsPeriod);
         sb.append(", fillInDate=").append(fillInDate);
         sb.append(", subjectNum=").append(subjectNum);

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

@@ -973,7 +973,7 @@ public class DataImportService extends BaseService {
         OrganizationExample organizationExample = new OrganizationExample();
         organizationExample.createCriteria().andCodeEqualTo(companyCode);
 
-        Integer period = rlits.get(0).getFillInDate();
+        Integer period = rlits.get(0).getPeriod();
 
         List<Organization> orgs = organizationMapper.selectByExample(organizationExample);
         DataImportLog dataImportLog = generalDataImportLog(rlits.get(0).getSubjectNum(),"", "",
@@ -1536,7 +1536,8 @@ public class DataImportService extends BaseService {
             rlit.setSubjectNum(getCellStringValue(row.getCell(0)));
             rlit.setSubjectName(getCellStringValue(row.getCell(1)));
             rlit.setRedLetterInvoiceInfoTableNum(getCellStringValue(row.getCell(2)));
-            rlit.setFillInDate(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
+            rlit.setPeriod(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
+            rlit.setFillInDate(row.getCell(3).getDateCellValue());
             rlit.setSalesTaxNumber(getCellStringValue(row.getCell(4)));
             rlit.setSalespersonName(getCellStringValue(row.getCell(5)));
             rlit.setTotalAmount(getCellBigDecimalValue(row.getCell(6)));

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

@@ -46,6 +46,17 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
      */
     private String projectId;
 
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
     /**
      * Database Column Remarks:
      *   税务系统期间
@@ -66,7 +77,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer fillInDate;
+    private Date fillInDate;
 
     /**
      * Database Column Remarks:
@@ -291,6 +302,30 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
         this.projectId = projectId == null ? null : projectId.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column red_letter_info_table.period
+     *
+     * @return the value of red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column red_letter_info_table.period
+     *
+     * @param period the value for red_letter_info_table.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column red_letter_info_table.tms_period
@@ -323,7 +358,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getFillInDate() {
+    public Date getFillInDate() {
         return fillInDate;
     }
 
@@ -335,7 +370,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setFillInDate(Integer fillInDate) {
+    public void setFillInDate(Date fillInDate) {
         this.fillInDate = fillInDate;
     }
 
@@ -666,6 +701,7 @@ public class RedLetterInfoTable extends BaseEntity implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
         sb.append(", tmsPeriod=").append(tmsPeriod);
         sb.append(", fillInDate=").append(fillInDate);
         sb.append(", subjectNum=").append(subjectNum);

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

@@ -396,6 +396,66 @@ public class RedLetterInfoTableExample {
             return (Criteria) this;
         }
 
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
         public Criteria andTmsPeriodIsNull() {
             addCriterion("tms_period is null");
             return (Criteria) this;
@@ -466,52 +526,52 @@ public class RedLetterInfoTableExample {
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateEqualTo(Integer value) {
+        public Criteria andFillInDateEqualTo(Date value) {
             addCriterion("fill_in_date =", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateNotEqualTo(Integer value) {
+        public Criteria andFillInDateNotEqualTo(Date value) {
             addCriterion("fill_in_date <>", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateGreaterThan(Integer value) {
+        public Criteria andFillInDateGreaterThan(Date value) {
             addCriterion("fill_in_date >", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateGreaterThanOrEqualTo(Integer value) {
+        public Criteria andFillInDateGreaterThanOrEqualTo(Date value) {
             addCriterion("fill_in_date >=", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateLessThan(Integer value) {
+        public Criteria andFillInDateLessThan(Date value) {
             addCriterion("fill_in_date <", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateLessThanOrEqualTo(Integer value) {
+        public Criteria andFillInDateLessThanOrEqualTo(Date value) {
             addCriterion("fill_in_date <=", value, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateIn(List<Integer> values) {
+        public Criteria andFillInDateIn(List<Date> values) {
             addCriterion("fill_in_date in", values, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateNotIn(List<Integer> values) {
+        public Criteria andFillInDateNotIn(List<Date> values) {
             addCriterion("fill_in_date not in", values, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateBetween(Integer value1, Integer value2) {
+        public Criteria andFillInDateBetween(Date value1, Date value2) {
             addCriterion("fill_in_date between", value1, value2, "fillInDate");
             return (Criteria) this;
         }
 
-        public Criteria andFillInDateNotBetween(Integer value1, Integer value2) {
+        public Criteria andFillInDateNotBetween(Date value1, Date value2) {
             addCriterion("fill_in_date not between", value1, value2, "fillInDate");
             return (Criteria) this;
         }

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/RedLetterInfoTableMapper.xml

@@ -9,8 +9,9 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="period" jdbcType="INTEGER" property="period" />
     <result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
-    <result column="fill_in_date" jdbcType="INTEGER" property="fillInDate" />
+    <result column="fill_in_date" jdbcType="TIMESTAMP" property="fillInDate" />
     <result column="subject_num" jdbcType="VARCHAR" property="subjectNum" />
     <result column="subject_name" jdbcType="VARCHAR" property="subjectName" />
     <result column="red_letter_invoice_info_table_num" jdbcType="VARCHAR" property="redLetterInvoiceInfoTableNum" />
@@ -96,7 +97,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, organization_id, project_id, tms_period, fill_in_date, subject_num, subject_name, 
+    id, organization_id, project_id, period, tms_period, fill_in_date, subject_num, subject_name, 
     red_letter_invoice_info_table_num, sales_tax_number, salesperson_name, total_amount, 
     total_tax_amount, application_description, applicant_manager, invoice_code, invoice_number, 
     create_time, update_time
@@ -153,15 +154,15 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into red_letter_info_table (id, organization_id, project_id, 
-      tms_period, fill_in_date, subject_num, 
-      subject_name, red_letter_invoice_info_table_num, 
+      period, tms_period, fill_in_date, 
+      subject_num, subject_name, red_letter_invoice_info_table_num, 
       sales_tax_number, salesperson_name, total_amount, 
       total_tax_amount, application_description, 
       applicant_manager, invoice_code, invoice_number, 
       create_time, update_time)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
-      #{tmsPeriod,jdbcType=INTEGER}, #{fillInDate,jdbcType=INTEGER}, #{subjectNum,jdbcType=VARCHAR}, 
-      #{subjectName,jdbcType=VARCHAR}, #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR}, 
+      #{period,jdbcType=INTEGER}, #{tmsPeriod,jdbcType=INTEGER}, #{fillInDate,jdbcType=TIMESTAMP}, 
+      #{subjectNum,jdbcType=VARCHAR}, #{subjectName,jdbcType=VARCHAR}, #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR}, 
       #{salesTaxNumber,jdbcType=VARCHAR}, #{salespersonName,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
       #{totalTaxAmount,jdbcType=DECIMAL}, #{applicationDescription,jdbcType=VARCHAR}, 
       #{applicantManager,jdbcType=VARCHAR}, #{invoiceCode,jdbcType=VARCHAR}, #{invoiceNumber,jdbcType=VARCHAR}, 
@@ -183,6 +184,9 @@
       <if test="projectId != null">
         project_id,
       </if>
+      <if test="period != null">
+        period,
+      </if>
       <if test="tmsPeriod != null">
         tms_period,
       </if>
@@ -239,11 +243,14 @@
       <if test="projectId != null">
         #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
       <if test="tmsPeriod != null">
         #{tmsPeriod,jdbcType=INTEGER},
       </if>
       <if test="fillInDate != null">
-        #{fillInDate,jdbcType=INTEGER},
+        #{fillInDate,jdbcType=TIMESTAMP},
       </if>
       <if test="subjectNum != null">
         #{subjectNum,jdbcType=VARCHAR},
@@ -312,11 +319,14 @@
       <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
       <if test="record.tmsPeriod != null">
         tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
       </if>
       <if test="record.fillInDate != null">
-        fill_in_date = #{record.fillInDate,jdbcType=INTEGER},
+        fill_in_date = #{record.fillInDate,jdbcType=TIMESTAMP},
       </if>
       <if test="record.subjectNum != null">
         subject_num = #{record.subjectNum,jdbcType=VARCHAR},
@@ -371,8 +381,9 @@
     set id = #{record.id,jdbcType=BIGINT},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR},
+      period = #{record.period,jdbcType=INTEGER},
       tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
-      fill_in_date = #{record.fillInDate,jdbcType=INTEGER},
+      fill_in_date = #{record.fillInDate,jdbcType=TIMESTAMP},
       subject_num = #{record.subjectNum,jdbcType=VARCHAR},
       subject_name = #{record.subjectName,jdbcType=VARCHAR},
       red_letter_invoice_info_table_num = #{record.redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},
@@ -403,11 +414,14 @@
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=VARCHAR},
       </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
       <if test="tmsPeriod != null">
         tms_period = #{tmsPeriod,jdbcType=INTEGER},
       </if>
       <if test="fillInDate != null">
-        fill_in_date = #{fillInDate,jdbcType=INTEGER},
+        fill_in_date = #{fillInDate,jdbcType=TIMESTAMP},
       </if>
       <if test="subjectNum != null">
         subject_num = #{subjectNum,jdbcType=VARCHAR},
@@ -459,8 +473,9 @@
     update red_letter_info_table
     set organization_id = #{organizationId,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR},
+      period = #{period,jdbcType=INTEGER},
       tms_period = #{tmsPeriod,jdbcType=INTEGER},
-      fill_in_date = #{fillInDate,jdbcType=INTEGER},
+      fill_in_date = #{fillInDate,jdbcType=TIMESTAMP},
       subject_num = #{subjectNum,jdbcType=VARCHAR},
       subject_name = #{subjectName,jdbcType=VARCHAR},
       red_letter_invoice_info_table_num = #{redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},