1、je + tmsPeriod

atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/JournalEntryQueryDto.java

@@ -764,6 +764,17 @@ public class JournalEntryQueryDto {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *    税务系统期间 yyyyMM
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
     public Long getId() {
         return id;
     }
@@ -1315,4 +1326,12 @@ public class JournalEntryQueryDto {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
 }

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

@@ -160,6 +160,17 @@ public class JournalEntryDto implements Serializable {
      */
     private String postedStatus;
 
+    /**
+     * Database Column Remarks:
+     *    税务系统期间 yyyyMM
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
     /**
      * Database Column Remarks:
      *   会计期间 yyyymm
@@ -1096,6 +1107,30 @@ public class JournalEntryDto implements Serializable {
         this.postedStatus = postedStatus == null ? null : postedStatus.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column journal_entry.tms_period
+     *
+     * @return the value of journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column journal_entry.tms_period
+     *
+     * @param tmsPeriod the value for journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.period
@@ -2465,6 +2500,7 @@ public class JournalEntryDto implements Serializable {
         sb.append(", lineNum=").append(lineNum);
         sb.append(", approvalStatus=").append(approvalStatus);
         sb.append(", postedStatus=").append(postedStatus);
+        sb.append(", tmsPeriod=").append(tmsPeriod);
         sb.append(", period=").append(period);
         sb.append(", accountingDate=").append(accountingDate);
         sb.append(", journalSource=").append(journalSource);

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

@@ -212,6 +212,9 @@ public class JournalEntryExportDto {
     @ExcelCell(index=64)
     private Date lateUpdatedDate;
 
+    @ExcelCell(index=65)
+    private Integer tmsPeriod;
+
     private Date createTime;
 
     private Date updateTime;

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

@@ -685,6 +685,7 @@ public class DataPreviewSerivceImpl extends BaseService {
         header.put("CreatedDate","创建日期");
         header.put("LateUpdatedBy","最后更新人");
         header.put("LateUpdatedDate","最后更新日期");
+        header.put("tmsPeriod","税务系统期间");
         return header;
     }
 

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

@@ -156,6 +156,17 @@ public class JournalEntry extends BaseEntity implements Serializable {
      */
     private String postedStatus;
 
+    /**
+     * Database Column Remarks:
+     *    税务系统期间 yyyyMM
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
     /**
      * Database Column Remarks:
      *   会计期间 yyyymm
@@ -221,15 +232,6 @@ public class JournalEntry extends BaseEntity implements Serializable {
      * @mbg.generated
      */
     private String voucherNum;
-    private BigDecimal  periodJrMinDr;
-
-    public BigDecimal getPeriodJrMinDr() {
-        return periodJrMinDr;
-    }
-
-    public void setPeriodJrMinDr(BigDecimal periodJrMinDr) {
-        this.periodJrMinDr = periodJrMinDr;
-    }
 
     /**
      * Database Column Remarks:
@@ -1101,6 +1103,30 @@ public class JournalEntry extends BaseEntity implements Serializable {
         this.postedStatus = postedStatus == null ? null : postedStatus.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column journal_entry.tms_period
+     *
+     * @return the value of journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column journal_entry.tms_period
+     *
+     * @param tmsPeriod the value for journal_entry.tms_period
+     *
+     * @mbg.generated
+     */
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.period
@@ -2470,6 +2496,7 @@ public class JournalEntry extends BaseEntity implements Serializable {
         sb.append(", lineNum=").append(lineNum);
         sb.append(", approvalStatus=").append(approvalStatus);
         sb.append(", postedStatus=").append(postedStatus);
+        sb.append(", tmsPeriod=").append(tmsPeriod);
         sb.append(", period=").append(period);
         sb.append(", accountingDate=").append(accountingDate);
         sb.append(", journalSource=").append(journalSource);

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

@@ -1086,6 +1086,66 @@ public class JournalEntryExample {
             return (Criteria) this;
         }
 
+        public Criteria andTmsPeriodIsNull() {
+            addCriterion("tms_period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodIsNotNull() {
+            addCriterion("tms_period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodEqualTo(Integer value) {
+            addCriterion("tms_period =", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotEqualTo(Integer value) {
+            addCriterion("tms_period <>", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodGreaterThan(Integer value) {
+            addCriterion("tms_period >", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tms_period >=", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodLessThan(Integer value) {
+            addCriterion("tms_period <", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("tms_period <=", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodIn(List<Integer> values) {
+            addCriterion("tms_period in", values, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotIn(List<Integer> values) {
+            addCriterion("tms_period not in", values, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("tms_period between", value1, value2, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("tms_period not between", value1, value2, "tmsPeriod");
+            return (Criteria) this;
+        }
+
         public Criteria andPeriodIsNull() {
             addCriterion("period is null");
             return (Criteria) this;

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

@@ -19,6 +19,7 @@
     <result column="line_num" jdbcType="VARCHAR" property="lineNum" />
     <result column="approval_status" jdbcType="VARCHAR" property="approvalStatus" />
     <result column="posted_status" jdbcType="VARCHAR" property="postedStatus" />
+    <result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
     <result column="period" jdbcType="INTEGER" property="period" />
     <result column="accounting_date" jdbcType="TIMESTAMP" property="accountingDate" />
     <result column="journal_source" jdbcType="VARCHAR" property="journalSource" />
@@ -148,15 +149,16 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, organization_id, project_id, `date`, `source`, ledger_id, ledger_name, currency_code, 
-    `status`, header_id, line_num, approval_status, posted_status, period, accounting_date, 
-    journal_source, category, `name`, voucher_num, description, segment1, segment2, segment3, 
-    segment4, segment5, segment6, segment7, segment8, segment9, segment10, segment1_name, 
-    segment2_name, segment3_name, segment4_name, segment5_name, segment6_name, segment7_name, 
-    segment8_name, segment9_name, segment10_name, journal_currency_code, sob_currency_code, 
-    accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, attribute2, 
-    attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, attribute9, 
-    attribute10, attribute11, attribute12, attribute13, attribute14, attribute15, attribute16, 
-    created_by, created_date, late_updated_by, late_updated_date, create_time, update_time
+    `status`, header_id, line_num, approval_status, posted_status, tms_period, period, 
+    accounting_date, journal_source, category, `name`, voucher_num, description, segment1, 
+    segment2, segment3, segment4, segment5, segment6, segment7, segment8, segment9, segment10, 
+    segment1_name, segment2_name, segment3_name, segment4_name, segment5_name, segment6_name, 
+    segment7_name, segment8_name, segment9_name, segment10_name, journal_currency_code, 
+    sob_currency_code, accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, 
+    attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, 
+    attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15, 
+    attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.JournalEntryExample" resultMap="BaseResultMap">
     <!--
@@ -213,50 +215,50 @@
       `date`, `source`, ledger_id, 
       ledger_name, currency_code, `status`, 
       header_id, line_num, approval_status, 
-      posted_status, period, accounting_date, 
-      journal_source, category, `name`, 
-      voucher_num, description, segment1, 
-      segment2, segment3, segment4, 
-      segment5, segment6, segment7, 
-      segment8, segment9, segment10, 
-      segment1_name, segment2_name, segment3_name, 
-      segment4_name, segment5_name, segment6_name, 
-      segment7_name, segment8_name, segment9_name, 
-      segment10_name, journal_currency_code, sob_currency_code, 
-      accounted_dr, accounted_cr, entered_dr, 
-      entered_cr, cf_item, attribute1, 
-      attribute2, attribute3, attribute4, 
-      attribute5, attribute6, attribute7, 
-      attribute8, attribute9, attribute10, 
-      attribute11, attribute12, attribute13, 
-      attribute14, attribute15, attribute16, 
-      created_by, created_date, late_updated_by, 
-      late_updated_date, create_time, update_time
-      )
+      posted_status, tms_period, period, 
+      accounting_date, journal_source, category, 
+      `name`, voucher_num, description, 
+      segment1, segment2, segment3, 
+      segment4, segment5, segment6, 
+      segment7, segment8, segment9, 
+      segment10, segment1_name, segment2_name, 
+      segment3_name, segment4_name, segment5_name, 
+      segment6_name, segment7_name, segment8_name, 
+      segment9_name, segment10_name, journal_currency_code, 
+      sob_currency_code, accounted_dr, accounted_cr, 
+      entered_dr, entered_cr, cf_item, 
+      attribute1, attribute2, attribute3, 
+      attribute4, attribute5, attribute6, 
+      attribute7, attribute8, attribute9, 
+      attribute10, attribute11, attribute12, 
+      attribute13, attribute14, attribute15, 
+      attribute16, created_by, created_date, 
+      late_updated_by, late_updated_date, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
       #{ledgerName,jdbcType=VARCHAR}, #{currencyCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
       #{headerId,jdbcType=VARCHAR}, #{lineNum,jdbcType=VARCHAR}, #{approvalStatus,jdbcType=VARCHAR}, 
-      #{postedStatus,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{accountingDate,jdbcType=TIMESTAMP}, 
-      #{journalSource,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{voucherNum,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR}, 
-      #{segment2,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, #{segment4,jdbcType=VARCHAR}, 
-      #{segment5,jdbcType=VARCHAR}, #{segment6,jdbcType=VARCHAR}, #{segment7,jdbcType=VARCHAR}, 
-      #{segment8,jdbcType=VARCHAR}, #{segment9,jdbcType=VARCHAR}, #{segment10,jdbcType=VARCHAR}, 
-      #{segment1Name,jdbcType=VARCHAR}, #{segment2Name,jdbcType=VARCHAR}, #{segment3Name,jdbcType=VARCHAR}, 
-      #{segment4Name,jdbcType=VARCHAR}, #{segment5Name,jdbcType=VARCHAR}, #{segment6Name,jdbcType=VARCHAR}, 
-      #{segment7Name,jdbcType=VARCHAR}, #{segment8Name,jdbcType=VARCHAR}, #{segment9Name,jdbcType=VARCHAR}, 
-      #{segment10Name,jdbcType=VARCHAR}, #{journalCurrencyCode,jdbcType=VARCHAR}, #{sobCurrencyCode,jdbcType=VARCHAR}, 
-      #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, #{enteredDr,jdbcType=DECIMAL}, 
-      #{enteredCr,jdbcType=DECIMAL}, #{cfItem,jdbcType=VARCHAR}, #{attribute1,jdbcType=VARCHAR}, 
-      #{attribute2,jdbcType=TIMESTAMP}, #{attribute3,jdbcType=VARCHAR}, #{attribute4,jdbcType=VARCHAR}, 
-      #{attribute5,jdbcType=VARCHAR}, #{attribute6,jdbcType=VARCHAR}, #{attribute7,jdbcType=VARCHAR}, 
-      #{attribute8,jdbcType=VARCHAR}, #{attribute9,jdbcType=VARCHAR}, #{attribute10,jdbcType=VARCHAR}, 
-      #{attribute11,jdbcType=VARCHAR}, #{attribute12,jdbcType=VARCHAR}, #{attribute13,jdbcType=VARCHAR}, 
-      #{attribute14,jdbcType=VARCHAR}, #{attribute15,jdbcType=VARCHAR}, #{attribute16,jdbcType=VARCHAR}, 
-      #{createdBy,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP}, #{lateUpdatedBy,jdbcType=VARCHAR}, 
-      #{lateUpdatedDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{postedStatus,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, #{period,jdbcType=INTEGER}, 
+      #{accountingDate,jdbcType=TIMESTAMP}, #{journalSource,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{voucherNum,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
+      #{segment1,jdbcType=VARCHAR}, #{segment2,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, 
+      #{segment4,jdbcType=VARCHAR}, #{segment5,jdbcType=VARCHAR}, #{segment6,jdbcType=VARCHAR}, 
+      #{segment7,jdbcType=VARCHAR}, #{segment8,jdbcType=VARCHAR}, #{segment9,jdbcType=VARCHAR}, 
+      #{segment10,jdbcType=VARCHAR}, #{segment1Name,jdbcType=VARCHAR}, #{segment2Name,jdbcType=VARCHAR}, 
+      #{segment3Name,jdbcType=VARCHAR}, #{segment4Name,jdbcType=VARCHAR}, #{segment5Name,jdbcType=VARCHAR}, 
+      #{segment6Name,jdbcType=VARCHAR}, #{segment7Name,jdbcType=VARCHAR}, #{segment8Name,jdbcType=VARCHAR}, 
+      #{segment9Name,jdbcType=VARCHAR}, #{segment10Name,jdbcType=VARCHAR}, #{journalCurrencyCode,jdbcType=VARCHAR}, 
+      #{sobCurrencyCode,jdbcType=VARCHAR}, #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, 
+      #{enteredDr,jdbcType=DECIMAL}, #{enteredCr,jdbcType=DECIMAL}, #{cfItem,jdbcType=VARCHAR}, 
+      #{attribute1,jdbcType=VARCHAR}, #{attribute2,jdbcType=TIMESTAMP}, #{attribute3,jdbcType=VARCHAR}, 
+      #{attribute4,jdbcType=VARCHAR}, #{attribute5,jdbcType=VARCHAR}, #{attribute6,jdbcType=VARCHAR}, 
+      #{attribute7,jdbcType=VARCHAR}, #{attribute8,jdbcType=VARCHAR}, #{attribute9,jdbcType=VARCHAR}, 
+      #{attribute10,jdbcType=VARCHAR}, #{attribute11,jdbcType=VARCHAR}, #{attribute12,jdbcType=VARCHAR}, 
+      #{attribute13,jdbcType=VARCHAR}, #{attribute14,jdbcType=VARCHAR}, #{attribute15,jdbcType=VARCHAR}, 
+      #{attribute16,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP}, 
+      #{lateUpdatedBy,jdbcType=VARCHAR}, #{lateUpdatedDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.JournalEntry">
     <!--
@@ -304,6 +306,9 @@
       <if test="postedStatus != null">
         posted_status,
       </if>
+      <if test="tmsPeriod != null">
+        tms_period,
+      </if>
       <if test="period != null">
         period,
       </if>
@@ -513,6 +518,9 @@
       <if test="postedStatus != null">
         #{postedStatus,jdbcType=VARCHAR},
       </if>
+      <if test="tmsPeriod != null">
+        #{tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
@@ -739,6 +747,9 @@
       <if test="record.postedStatus != null">
         posted_status = #{record.postedStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.tmsPeriod != null">
+        tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
@@ -931,6 +942,7 @@
       line_num = #{record.lineNum,jdbcType=VARCHAR},
       approval_status = #{record.approvalStatus,jdbcType=VARCHAR},
       posted_status = #{record.postedStatus,jdbcType=VARCHAR},
+      tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
       period = #{record.period,jdbcType=INTEGER},
       accounting_date = #{record.accountingDate,jdbcType=TIMESTAMP},
       journal_source = #{record.journalSource,jdbcType=VARCHAR},
@@ -1034,6 +1046,9 @@
       <if test="postedStatus != null">
         posted_status = #{postedStatus,jdbcType=VARCHAR},
       </if>
+      <if test="tmsPeriod != null">
+        tms_period = #{tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
@@ -1223,6 +1238,7 @@
       line_num = #{lineNum,jdbcType=VARCHAR},
       approval_status = #{approvalStatus,jdbcType=VARCHAR},
       posted_status = #{postedStatus,jdbcType=VARCHAR},
+      tms_period = #{tmsPeriod,jdbcType=INTEGER},
       period = #{period,jdbcType=INTEGER},
       accounting_date = #{accountingDate,jdbcType=TIMESTAMP},
       journal_source = #{journalSource,jdbcType=VARCHAR},
@@ -1300,7 +1316,7 @@
     </if>
   </select>
 
-  <select id ="selectNowAdjustData" parameterType="java.util.Map" resultType="pwc.taxtech.atms.vat.entity.JournalEntry">
+  <select id="selectNowAdjustData" parameterType="java.util.Map" resultType="pwc.taxtech.atms.vat.entity.JournalEntry">
         SELECT
     max(t.entered_dr - t.entered_cr) as periodJrMinDr,
     max(t.period),