CIT数据导入试算平衡表自动生成功能及整体优化

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -135,6 +135,17 @@ public class DateUtils {
         return period;
     }
 
+    /**
+     * 将yyyy- 等字符串转换为区间格式 yyyy
+     * @param dateStr
+     * @return
+     */
+    public static Integer strToPeriodY(String dateStr) {
+        dateStr = dateStr.replace(" ","");
+        Integer period = Integer.valueOf(dateStr.substring(0, 4));
+        return period;
+    }
+
 
     /**
      * 将yyyymm 字符串转换为区间格式 yyyyMM

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.java

@@ -107,4 +107,6 @@ public interface CitJournalEntryAdjustMapper extends MyMapper {
     int updateByPrimaryKey(CitJournalEntryAdjust record);
 
     int insertBatch(List<CitJournalEntryAdjust> citJournalAdjustList);
+
+    List<CitJournalEntryAdjust> sumAmountByCondition(@Param("period") String period, @Param("orgList") List<String> orgList);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitJournalEntryAdjust.java

@@ -248,44 +248,44 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
      *   主体代码 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment1
+     * This field corresponds to the database column cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    private String segment1;
+    private String orgCode;
 
     /**
      * Database Column Remarks:
      *   科目代码 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment3
+     * This field corresponds to the database column cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    private String segment3;
+    private String subjectCode;
 
     /**
      * Database Column Remarks:
      *   主体说明 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment1_name
+     * This field corresponds to the database column cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    private String segment1Name;
+    private String orgName;
 
     /**
      * Database Column Remarks:
      *   科目说明 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment3_name
+     * This field corresponds to the database column cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    private String segment3Name;
+    private String subjectName;
 
     /**
      * Database Column Remarks:
@@ -889,98 +889,98 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment1
+     * This method returns the value of the database column cit_journal_entry_adjust.org_code
      *
-     * @return the value of cit_journal_entry_adjust.segment1
+     * @return the value of cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    public String getSegment1() {
-        return segment1;
+    public String getOrgCode() {
+        return orgCode;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment1
+     * This method sets the value of the database column cit_journal_entry_adjust.org_code
      *
-     * @param segment1 the value for cit_journal_entry_adjust.segment1
+     * @param orgCode the value for cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    public void setSegment1(String segment1) {
-        this.segment1 = segment1 == null ? null : segment1.trim();
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment3
+     * This method returns the value of the database column cit_journal_entry_adjust.subject_code
      *
-     * @return the value of cit_journal_entry_adjust.segment3
+     * @return the value of cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    public String getSegment3() {
-        return segment3;
+    public String getSubjectCode() {
+        return subjectCode;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment3
+     * This method sets the value of the database column cit_journal_entry_adjust.subject_code
      *
-     * @param segment3 the value for cit_journal_entry_adjust.segment3
+     * @param subjectCode the value for cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    public void setSegment3(String segment3) {
-        this.segment3 = segment3 == null ? null : segment3.trim();
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode == null ? null : subjectCode.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment1_name
+     * This method returns the value of the database column cit_journal_entry_adjust.org_name
      *
-     * @return the value of cit_journal_entry_adjust.segment1_name
+     * @return the value of cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    public String getSegment1Name() {
-        return segment1Name;
+    public String getOrgName() {
+        return orgName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment1_name
+     * This method sets the value of the database column cit_journal_entry_adjust.org_name
      *
-     * @param segment1Name the value for cit_journal_entry_adjust.segment1_name
+     * @param orgName the value for cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    public void setSegment1Name(String segment1Name) {
-        this.segment1Name = segment1Name == null ? null : segment1Name.trim();
+    public void setOrgName(String orgName) {
+        this.orgName = orgName == null ? null : orgName.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment3_name
+     * This method returns the value of the database column cit_journal_entry_adjust.subject_name
      *
-     * @return the value of cit_journal_entry_adjust.segment3_name
+     * @return the value of cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    public String getSegment3Name() {
-        return segment3Name;
+    public String getSubjectName() {
+        return subjectName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment3_name
+     * This method sets the value of the database column cit_journal_entry_adjust.subject_name
      *
-     * @param segment3Name the value for cit_journal_entry_adjust.segment3_name
+     * @param subjectName the value for cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    public void setSegment3Name(String segment3Name) {
-        this.segment3Name = segment3Name == null ? null : segment3Name.trim();
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName == null ? null : subjectName.trim();
     }
 
     /**
@@ -1208,10 +1208,10 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
         sb.append(", name=").append(name);
         sb.append(", voucherNum=").append(voucherNum);
         sb.append(", description=").append(description);
-        sb.append(", segment1=").append(segment1);
-        sb.append(", segment3=").append(segment3);
-        sb.append(", segment1Name=").append(segment1Name);
-        sb.append(", segment3Name=").append(segment3Name);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", subjectCode=").append(subjectCode);
+        sb.append(", orgName=").append(orgName);
+        sb.append(", subjectName=").append(subjectName);
         sb.append(", accountedDr=").append(accountedDr);
         sb.append(", accountedCr=").append(accountedCr);
         sb.append(", createdBy=").append(createdBy);

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitTrialBalance.java

@@ -111,6 +111,28 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
      */
     private Integer accountPeriod;
 
+    /**
+     * Database Column Remarks:
+     *   借方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal debitAmount;
+
+    /**
+     * Database Column Remarks:
+     *   贷方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal creditAmount;
+
     /**
      * Database Column Remarks:
      *   期初余额
@@ -134,6 +156,8 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
     private BigDecimal endingBalance;
 
     /**
+     * Database Column Remarks:
+     *   创建人
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cit_trial_balance.create_by
@@ -388,6 +412,54 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
         this.accountPeriod = accountPeriod;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_trial_balance.debit_amount
+     *
+     * @return the value of cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDebitAmount() {
+        return debitAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_trial_balance.debit_amount
+     *
+     * @param debitAmount the value for cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    public void setDebitAmount(BigDecimal debitAmount) {
+        this.debitAmount = debitAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_trial_balance.credit_amount
+     *
+     * @return the value of cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getCreditAmount() {
+        return creditAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_trial_balance.credit_amount
+     *
+     * @param creditAmount the value for cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    public void setCreditAmount(BigDecimal creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cit_trial_balance.beginning_balance
@@ -529,6 +601,8 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
         sb.append(", accountCode=").append(accountCode);
         sb.append(", accountDescription=").append(accountDescription);
         sb.append(", accountPeriod=").append(accountPeriod);
+        sb.append(", debitAmount=").append(debitAmount);
+        sb.append(", creditAmount=").append(creditAmount);
         sb.append(", beginningBalance=").append(beginningBalance);
         sb.append(", endingBalance=").append(endingBalance);
         sb.append(", createBy=").append(createBy);

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitTrialBalanceExample.java

@@ -786,6 +786,126 @@ public class CitTrialBalanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andDebitAmountIsNull() {
+            addCriterion("debit_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountIsNotNull() {
+            addCriterion("debit_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountEqualTo(BigDecimal value) {
+            addCriterion("debit_amount =", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotEqualTo(BigDecimal value) {
+            addCriterion("debit_amount <>", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountGreaterThan(BigDecimal value) {
+            addCriterion("debit_amount >", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("debit_amount >=", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountLessThan(BigDecimal value) {
+            addCriterion("debit_amount <", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("debit_amount <=", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountIn(List<BigDecimal> values) {
+            addCriterion("debit_amount in", values, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotIn(List<BigDecimal> values) {
+            addCriterion("debit_amount not in", values, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("debit_amount between", value1, value2, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("debit_amount not between", value1, value2, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIsNull() {
+            addCriterion("credit_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIsNotNull() {
+            addCriterion("credit_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountEqualTo(BigDecimal value) {
+            addCriterion("credit_amount =", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotEqualTo(BigDecimal value) {
+            addCriterion("credit_amount <>", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountGreaterThan(BigDecimal value) {
+            addCriterion("credit_amount >", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("credit_amount >=", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountLessThan(BigDecimal value) {
+            addCriterion("credit_amount <", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("credit_amount <=", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIn(List<BigDecimal> values) {
+            addCriterion("credit_amount in", values, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotIn(List<BigDecimal> values) {
+            addCriterion("credit_amount not in", values, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("credit_amount between", value1, value2, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("credit_amount not between", value1, value2, "creditAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andBeginningBalanceIsNull() {
             addCriterion("beginning_balance is null");
             return (Criteria) this;

atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.xml

@@ -27,10 +27,10 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="voucher_num" jdbcType="VARCHAR" property="voucherNum" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="segment1" jdbcType="VARCHAR" property="segment1" />
-    <result column="segment3" jdbcType="VARCHAR" property="segment3" />
-    <result column="segment1_name" jdbcType="VARCHAR" property="segment1Name" />
-    <result column="segment3_name" jdbcType="VARCHAR" property="segment3Name" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="subject_code" jdbcType="VARCHAR" property="subjectCode" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="subject_name" jdbcType="VARCHAR" property="subjectName" />
     <result column="accounted_dr" jdbcType="DECIMAL" property="accountedDr" />
     <result column="accounted_cr" jdbcType="DECIMAL" property="accountedCr" />
     <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
@@ -113,8 +113,8 @@
     -->
     id, organization_id, project_id, period, date, source, ledger_id, ledger_name, currency_code, 
     status, header_id, line_num, approval_status, posted_status, account_period, accounting_date, 
-    journal_source, category, name, voucher_num, description, segment1, segment3, segment1_name, 
-    segment3_name, accounted_dr, accounted_cr, created_by, created_date, late_updated_by, 
+    journal_source, category, name, voucher_num, description, org_code, subject_code, 
+    org_name, subject_name, accounted_dr, accounted_cr, created_by, created_date, late_updated_by, 
     late_updated_date, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitJournalEntryAdjustExample" resultMap="BaseResultMap">
@@ -175,8 +175,8 @@
       approval_status, posted_status, account_period, 
       accounting_date, journal_source, category, 
       name, voucher_num, description, 
-      segment1, segment3, segment1_name, 
-      segment3_name, accounted_dr, accounted_cr, 
+      org_code, subject_code, org_name, 
+      subject_name, accounted_dr, accounted_cr, 
       created_by, created_date, late_updated_by, 
       late_updated_date, create_time, update_time
       )
@@ -187,8 +187,8 @@
       #{approvalStatus,jdbcType=VARCHAR}, #{postedStatus,jdbcType=VARCHAR}, #{accountPeriod,jdbcType=INTEGER}, 
       #{accountingDate,jdbcType=TIMESTAMP}, #{journalSource,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{voucherNum,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{segment1,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, #{segment1Name,jdbcType=VARCHAR}, 
-      #{segment3Name,jdbcType=VARCHAR}, #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, 
+      #{orgCode,jdbcType=VARCHAR}, #{subjectCode,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, 
+      #{subjectName,jdbcType=VARCHAR}, #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, 
       #{createdBy,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP}, #{lateUpdatedBy,jdbcType=VARCHAR}, 
       #{lateUpdatedDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
@@ -263,17 +263,17 @@
       <if test="description != null">
         description,
       </if>
-      <if test="segment1 != null">
-        segment1,
+      <if test="orgCode != null">
+        org_code,
       </if>
-      <if test="segment3 != null">
-        segment3,
+      <if test="subjectCode != null">
+        subject_code,
       </if>
-      <if test="segment1Name != null">
-        segment1_name,
+      <if test="orgName != null">
+        org_name,
       </if>
-      <if test="segment3Name != null">
-        segment3_name,
+      <if test="subjectName != null">
+        subject_name,
       </if>
       <if test="accountedDr != null">
         accounted_dr,
@@ -364,17 +364,17 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="segment1 != null">
-        #{segment1,jdbcType=VARCHAR},
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment3 != null">
-        #{segment3,jdbcType=VARCHAR},
+      <if test="subjectCode != null">
+        #{subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment1Name != null">
-        #{segment1Name,jdbcType=VARCHAR},
+      <if test="orgName != null">
+        #{orgName,jdbcType=VARCHAR},
       </if>
-      <if test="segment3Name != null">
-        #{segment3Name,jdbcType=VARCHAR},
+      <if test="subjectName != null">
+        #{subjectName,jdbcType=VARCHAR},
       </if>
       <if test="accountedDr != null">
         #{accountedDr,jdbcType=DECIMAL},
@@ -482,17 +482,17 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment1 != null">
-        segment1 = #{record.segment1,jdbcType=VARCHAR},
+      <if test="record.orgCode != null">
+        org_code = #{record.orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment3 != null">
-        segment3 = #{record.segment3,jdbcType=VARCHAR},
+      <if test="record.subjectCode != null">
+        subject_code = #{record.subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment1Name != null">
-        segment1_name = #{record.segment1Name,jdbcType=VARCHAR},
+      <if test="record.orgName != null">
+        org_name = #{record.orgName,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment3Name != null">
-        segment3_name = #{record.segment3Name,jdbcType=VARCHAR},
+      <if test="record.subjectName != null">
+        subject_name = #{record.subjectName,jdbcType=VARCHAR},
       </if>
       <if test="record.accountedDr != null">
         accounted_dr = #{record.accountedDr,jdbcType=DECIMAL},
@@ -550,10 +550,10 @@
       name = #{record.name,jdbcType=VARCHAR},
       voucher_num = #{record.voucherNum,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      segment1 = #{record.segment1,jdbcType=VARCHAR},
-      segment3 = #{record.segment3,jdbcType=VARCHAR},
-      segment1_name = #{record.segment1Name,jdbcType=VARCHAR},
-      segment3_name = #{record.segment3Name,jdbcType=VARCHAR},
+      org_code = #{record.orgCode,jdbcType=VARCHAR},
+      subject_code = #{record.subjectCode,jdbcType=VARCHAR},
+      org_name = #{record.orgName,jdbcType=VARCHAR},
+      subject_name = #{record.subjectName,jdbcType=VARCHAR},
       accounted_dr = #{record.accountedDr,jdbcType=DECIMAL},
       accounted_cr = #{record.accountedCr,jdbcType=DECIMAL},
       created_by = #{record.createdBy,jdbcType=VARCHAR},
@@ -633,17 +633,17 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="segment1 != null">
-        segment1 = #{segment1,jdbcType=VARCHAR},
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment3 != null">
-        segment3 = #{segment3,jdbcType=VARCHAR},
+      <if test="subjectCode != null">
+        subject_code = #{subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment1Name != null">
-        segment1_name = #{segment1Name,jdbcType=VARCHAR},
+      <if test="orgName != null">
+        org_name = #{orgName,jdbcType=VARCHAR},
       </if>
-      <if test="segment3Name != null">
-        segment3_name = #{segment3Name,jdbcType=VARCHAR},
+      <if test="subjectName != null">
+        subject_name = #{subjectName,jdbcType=VARCHAR},
       </if>
       <if test="accountedDr != null">
         accounted_dr = #{accountedDr,jdbcType=DECIMAL},
@@ -698,10 +698,10 @@
       name = #{name,jdbcType=VARCHAR},
       voucher_num = #{voucherNum,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      segment1 = #{segment1,jdbcType=VARCHAR},
-      segment3 = #{segment3,jdbcType=VARCHAR},
-      segment1_name = #{segment1Name,jdbcType=VARCHAR},
-      segment3_name = #{segment3Name,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      subject_code = #{subjectCode,jdbcType=VARCHAR},
+      org_name = #{orgName,jdbcType=VARCHAR},
+      subject_name = #{subjectName,jdbcType=VARCHAR},
       accounted_dr = #{accountedDr,jdbcType=DECIMAL},
       accounted_cr = #{accountedCr,jdbcType=DECIMAL},
       created_by = #{createdBy,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitTrialBalanceMapper.xml

@@ -15,6 +15,8 @@
     <result column="account_code" jdbcType="VARCHAR" property="accountCode" />
     <result column="account_description" jdbcType="VARCHAR" property="accountDescription" />
     <result column="account_period" jdbcType="INTEGER" property="accountPeriod" />
+    <result column="debit_amount" jdbcType="DECIMAL" property="debitAmount" />
+    <result column="credit_amount" jdbcType="DECIMAL" property="creditAmount" />
     <result column="beginning_balance" jdbcType="DECIMAL" property="beginningBalance" />
     <result column="ending_balance" jdbcType="DECIMAL" property="endingBalance" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -93,7 +95,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, organization_id, project_id, date, source, period, account_code, account_description, 
-    account_period, beginning_balance, ending_balance, create_by, create_time, update_time
+    account_period, debit_amount, credit_amount, beginning_balance, ending_balance, create_by, 
+    create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitTrialBalanceExample" resultMap="BaseResultMap">
     <!--
@@ -149,13 +152,15 @@
     insert into cit_trial_balance (id, organization_id, project_id, 
       date, source, period, 
       account_code, account_description, account_period, 
-      beginning_balance, ending_balance, create_by, 
-      create_time, update_time)
+      debit_amount, credit_amount, beginning_balance, 
+      ending_balance, create_by, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, 
       #{accountCode,jdbcType=VARCHAR}, #{accountDescription,jdbcType=VARCHAR}, #{accountPeriod,jdbcType=INTEGER}, 
-      #{beginningBalance,jdbcType=DECIMAL}, #{endingBalance,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{debitAmount,jdbcType=DECIMAL}, #{creditAmount,jdbcType=DECIMAL}, #{beginningBalance,jdbcType=DECIMAL}, 
+      #{endingBalance,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitTrialBalance">
     <!--
@@ -191,6 +196,12 @@
       <if test="accountPeriod != null">
         account_period,
       </if>
+      <if test="debitAmount != null">
+        debit_amount,
+      </if>
+      <if test="creditAmount != null">
+        credit_amount,
+      </if>
       <if test="beginningBalance != null">
         beginning_balance,
       </if>
@@ -235,6 +246,12 @@
       <if test="accountPeriod != null">
         #{accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="debitAmount != null">
+        #{debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="creditAmount != null">
+        #{creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="beginningBalance != null">
         #{beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -296,6 +313,12 @@
       <if test="record.accountPeriod != null">
         account_period = #{record.accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="record.debitAmount != null">
+        debit_amount = #{record.debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.creditAmount != null">
+        credit_amount = #{record.creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="record.beginningBalance != null">
         beginning_balance = #{record.beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -331,6 +354,8 @@
       account_code = #{record.accountCode,jdbcType=VARCHAR},
       account_description = #{record.accountDescription,jdbcType=VARCHAR},
       account_period = #{record.accountPeriod,jdbcType=INTEGER},
+      debit_amount = #{record.debitAmount,jdbcType=DECIMAL},
+      credit_amount = #{record.creditAmount,jdbcType=DECIMAL},
       beginning_balance = #{record.beginningBalance,jdbcType=DECIMAL},
       ending_balance = #{record.endingBalance,jdbcType=DECIMAL},
       create_by = #{record.createBy,jdbcType=VARCHAR},
@@ -371,6 +396,12 @@
       <if test="accountPeriod != null">
         account_period = #{accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="debitAmount != null">
+        debit_amount = #{debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="creditAmount != null">
+        credit_amount = #{creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="beginningBalance != null">
         beginning_balance = #{beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -403,6 +434,8 @@
       account_code = #{accountCode,jdbcType=VARCHAR},
       account_description = #{accountDescription,jdbcType=VARCHAR},
       account_period = #{accountPeriod,jdbcType=INTEGER},
+      debit_amount = #{debitAmount,jdbcType=DECIMAL},
+      credit_amount = #{creditAmount,jdbcType=DECIMAL},
       beginning_balance = #{beginningBalance,jdbcType=DECIMAL},
       ending_balance = #{endingBalance,jdbcType=DECIMAL},
       create_by = #{createBy,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml

@@ -93,19 +93,19 @@
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment1 != null">#{item.segment1,jdbcType=VARCHAR},</when>
+                    <when test="item.orgCode != null">#{item.orgCode,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment3 != null">#{item.segment3,jdbcType=VARCHAR},</when>
+                    <when test="item.subjectCode != null">#{item.subjectCode,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment1Name != null">#{item.segment1Name,jdbcType=VARCHAR},</when>
+                    <when test="item.orgName != null">#{item.orgName,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment3Name != null">#{item.segment3Name,jdbcType=VARCHAR},</when>
+                    <when test="item.subjectName != null">#{item.subjectName,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
@@ -141,8 +141,50 @@
                     <otherwise>CURRENT_TIMESTAMP,</otherwise>
                 </choose>
             </trim>
-    </foreach>;
+        </foreach>
+        ;
         SELECT 1 FROM DUAL;
     </insert>
 
+    <select id="sumAmountByCondition" parameterType="map" resultMap="BaseResultMap">
+        SELECT
+        subject_code as subject_code,
+        sum(jfinal.accounted_dr) as accounted_dr,
+        sum(jfinal.accounted_cr) as accounted_cr
+        from
+        (
+        select
+        cj.accounted_dr as accounted_dr,
+        cj.accounted_cr as accounted_cr ,
+        cj.subject_code as subject_code
+        from
+        cit_journal_entry_adjust cj
+        where
+        cj.period like #{period}
+        <if test="orgList != null and orgList.size > 0">
+            AND organization_id in
+            <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        UNION ALL
+
+        select
+        j.accounted_dr as accounted_dr,
+        j.accounted_cr as accounted_cr,
+        j.segment3 as subject_code
+        from
+        journal_entry j
+        where
+        j.period like #{period}
+        <if test="orgList != null and orgList.size > 0">
+            AND organization_id in
+            <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) as jfinal
+        group by jfinal.subject_code
+    </select>
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTrialBalanceExtendsMapper.xml

@@ -44,7 +44,14 @@
           <when test="item.accountPeriod != null">#{item.accountPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>
         </choose>
-
+        <choose>
+          <when test="item.debitAmount != null">#{item.debitAmount,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.creditAmount != null">#{item.creditAmount,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.beginningBalance != null">#{item.beginningBalance,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>
@@ -69,5 +76,46 @@
     </foreach>;
     SELECT 1 FROM DUAL;
   </insert>
+  <select id="selectLastYearBegBla" parameterType="map" resultMap="BaseResultMap">
+    SELECT
+    subject_code as subject_code,
+    sum(jfinal.accounted_dr) as accounted_dr,
+    sum(jfinal.accounted_cr) as accounted_cr
+    from
+    (
+    select
+    cj.accounted_dr as accounted_dr,
+    cj.accounted_cr as accounted_cr ,
+    cj.subject_code as subject_code
+    from
+    cit_journal_entry_adjust cj
+    where
+    cj.period like #{period}
+    <if test="orgList != null and orgList.size > 0">
+      AND organization_id in
+      <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+
+    UNION ALL
+
+    select
+    j.accounted_dr as accounted_dr,
+    j.accounted_cr as accounted_cr,
+    j.segment3 as subject_code
+    from
+    journal_entry j
+    where
+    j.period like #{period}
+    <if test="orgList != null and orgList.size > 0">
+      AND organization_id in
+      <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    ) as jfinal
+    group by jfinal.subject_code
+  </select>
 
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -328,11 +328,11 @@
     "InvoiceStatistics":"Invoice Statistics",
     "CITAdjustmentJournal":"CIT Adjustment Journal",
     "CITTrialBalance":"CIT TrialBalance",
-    "CITDocumentSubjectMappingTable":"CIT Document Subject Mapping Table",
+    "CITDocumentSubjectMappingTable":"CIT Draft Subject Mapping",
     "CITBalanceSheetPRC":"CIT Balance Sheet PRC",
     "CITProfitStatementPRC":"CIT Profit Statement PRC",
-    "CITEAMAssetDisposalAmountRecord":"CIT EAM Asset Disposal Amount Record",
-    "CITPreClassifiedDataSource":"CIT PreClassified DataSource",
+    "CITEAMAssetDisposalAmountRecord":"CIT EAM Disposal Amount",
+    "CITPreClassifiedDataSource":"CIT PreClassified",
     "Configuration":"Configuration",
     "RevenueTypeConfiguration":"Revenue Type Config",
 

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -876,10 +876,10 @@
     "InvoiceStatistics":"发票统计资料",
     "CITAdjustmentJournal":"CIT-调整日记账",
     "CITTrialBalance":"CIT-试算平衡表",
-    "CITDocumentSubjectMappingTable":"CIT-底稿&科目Mapping表",
+    "CITDocumentSubjectMappingTable":"CIT-底稿科目Mapping",
     "CITBalanceSheetPRC":"CIT-资产负债表(单家PRC)",
     "CITProfitStatementPRC":"CIT-利润表(单家PRC)",
-    "CITEAMAssetDisposalAmountRecord":"CIT-EAM资产处置金额记录表",
+    "CITEAMAssetDisposalAmountRecord":"CIT-EAM处置金额记录表",
     "CITPreClassifiedDataSource":"CIT-预提重分类数据源",
     "Configuration":"配置",
     "RevenueTypeConfiguration":"收入类型配置",

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

@@ -32,6 +32,11 @@
         $scope.importExcelFile = null;
         $scope.UploadPeriodTime = null;
 
+        $scope.companyList = [];
+        $scope.checkedCompanyList = [];
+        $scope.checkedCompanyCodeList = [];
+        $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
         //写日志
         var logDto = {
@@ -143,7 +148,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {
@@ -397,6 +403,53 @@
             });
         };
 
+
+        $scope.selectOne = function () {
+            $scope.checkedCompanyList = [];
+            angular.forEach($scope.companyList , function (i) {
+                var index = $scope.checkedCompanyList.indexOf(i.id);
+                if(i.checked && index === -1) {
+                    $scope.checkedCompanyList.push(i);
+                } else if (!i.checked && index !== -1){
+                    $scope.checkedCompanyList.splice(index, 1);
+                }
+            });
+
+            $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
+
+            $scope.checkedCompanyTypeList = "";
+            $scope.checkedCompanyCodeList = [];
+            angular.forEach($scope.checkedCompanyList,function (i) {
+                $scope.checkedCompanyTypeList += i.name+";";
+                $scope.checkedCompanyCodeList.push(i.id);
+            });
+            console.log($scope.checkedCompanyList);
+        };
+
+        $scope.selectAll = function () {
+            if($scope.selectedAll) {
+                $scope.selectedOne = true;
+                $scope.checkedCompanyList = [];
+                angular.forEach($scope.companyList, function (i, index) {
+                    $scope.checkedCompanyList.push(i);
+                    i.checked = true;
+                })
+            }else {
+                $scope.selectedOne = false;
+                $scope.checkedCompanyList = [];
+                angular.forEach($scope.companyList, function (i, index) {
+                    i.checked = false;
+                })
+            }
+            $scope.checkedCompanyTypeList = "";
+            $scope.checkedCompanyCodeList = [];
+            angular.forEach($scope.checkedCompanyList,function (i) {
+                $scope.checkedCompanyTypeList += i.name;
+                $scope.checkedCompanyCodeList.push(i.id);
+            });
+            console.log($scope.checkedCompanyList);
+        };
+
         $scope.downloadTemplate = function () {
             debugger;
             templateService.citDownloadTemplate(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data, status, headers) {

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

@@ -140,6 +140,8 @@
                 SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
                 return;
             }
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
 
             Upload.upload({
                 url: uploadUrl,

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

@@ -140,7 +140,8 @@
                 SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
                 return;
             }
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
 
 
@@ -151,7 +152,8 @@
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {
@@ -173,7 +175,7 @@
                 debugger;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
-                if (resp.result) {
+                if (resp.result || resp.data) {
                     debugger;
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
         //写日志
         var logDto = {
@@ -147,7 +148,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
 
         //写日志
@@ -148,7 +149,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -38,6 +38,8 @@
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
 
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
+
 
         //写日志
         var logDto = {
@@ -149,7 +151,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1428,6 +1428,17 @@ constant.importFileType = {
     ExtractInvoiceData: 11
 };
 
+constant.citImportFileType = {
+    undefined: 0,
+    JournalAdjust: 1,
+    TrialBalance: 2,
+    DraftAccountMapping: 3,
+    BalanceSheetPrcAdjust: 4,
+    ProfitPrcAdjust: 5,
+    EAMAssetsDisposal: 6,
+    SalaryAdvance: 7
+};
+
 constant.fileTypeList = [
     {code:0,type:"月度科目余额表"},
     {code:1,type:"日记账"},

atms-web/src/main/webapp/app/common/webservices/citImportData.svc.js

@@ -9,5 +9,8 @@ webservices.factory('citImportDataService', ['$http', 'apiConfig', function ($ht
         },
         /***************************************批量数据导入服务(真) end**************************************************************/
 
+        autoGeneTB: function () {
+            return $http.post('/citImport/getCitDataImportLog', apiConfig.create());
+        },
     };
 }]);
\ No newline at end of file