update cashFlow search contion---Ken

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

@@ -247,7 +247,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         JournalEntry journalEntry = new JournalEntry();
         if (journalEntryList.size() == 1) {
-            logger.debug("exit and update journalEntry headerId:{},lineNum:{},taskId:{}", item.getHeaderId(), item.getLineNum(),item.getTaskId());
+            logger.debug("exist and update journalEntry headerId:{},lineNum:{},taskId:{}", item.getHeaderId(), item.getLineNum(),item.getTaskId());
             journalEntry = journalEntryList.get(0);
             populateFieldsJE(item, journalEntry);
             journalEntry.setId(journalEntryList.get(0).getId());
@@ -272,7 +272,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         TrialBalance result = new TrialBalance();
         if (itemList.size() >0) {
-            logger.debug("exit and delete TrialBalance EntityCode:{},Period:{},taskId:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()),item.getTaskId());
+            logger.debug("exist and delete TrialBalance EntityCode:{},Period:{},taskId:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()),item.getTaskId());
             trialBalanceMapper.deleteByExample(example);
         }
         logger.debug("insert TrialBalance EntityCode:{},Period:{},taskId:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()),item.getTaskId());
@@ -292,7 +292,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         CashFlow result = new CashFlow();
         if (itemList.size() >0) {
-            logger.debug("exit and delete CashFlow EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
+            logger.debug("exist and delete CashFlow EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             cashFlowMapper.deleteByExample(example);
         }
         logger.debug("insert CashFlow EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
@@ -313,7 +313,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         BalanceSheet result = new BalanceSheet();
         if (itemList.size() >0) {
-            logger.debug("exit and delete BalanceSheet EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
+            logger.debug("exist and delete BalanceSheet EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             balanceSheetMapper.deleteByExample(example);
         }
         logger.debug("insert BalanceSheet EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
@@ -342,7 +342,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         BalanceSheetPrc result = new BalanceSheetPrc();
         if (itemList.size() >0) {
-            logger.debug("exit and delete BalanceSheetPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
+            logger.debug("exist and delete BalanceSheetPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             balanceSheetPrcMapper.deleteByExample(example);
         }
         logger.debug("insert BalanceSheetPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
@@ -370,7 +370,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         ProfitLossStatement result = new ProfitLossStatement();
         if (itemList.size() >0) {
-            logger.debug("exit and delete ProfitLossStatement EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
+            logger.debug("exist and delete ProfitLossStatement EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             profitLossStatementMapper.deleteByExample(example);
         }
         logger.debug("insert ProfitLossStatement EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
@@ -398,7 +398,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         ProfitLossStatementPrc result = new ProfitLossStatementPrc();
         if (itemList.size() >0) {
-            logger.debug("exit and delete ProfitLossStatementPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
+            logger.debug("exist and delete ProfitLossStatementPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             profitLossStatementPrcMapper.deleteByExample(example);
         }
         logger.debug("insert ProfitLossStatementPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
@@ -426,7 +426,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         //唯一则更新否则插入
         OrganizationAccountingRate result = new OrganizationAccountingRate();
         if (itemList.size() >0) {
-            logger.debug("exit and update OrganizationAccountingRate Period:{},taskId:{}", item.getPeriod(),item.getTaskId());
+            logger.debug("exist and update OrganizationAccountingRate Period:{},taskId:{}", item.getPeriod(),item.getTaskId());
             result = itemList.get(0);
             populateFieldsOAR(item, result);
             result.setId(itemList.get(0).getId());

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.POIUtil;
@@ -399,6 +400,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 List<PeriodDataSource> periodDataSourceList = Lists.newArrayList();
                 for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                     Row row = sheet.getRow(r);
+                    Assert.notNull(row,"Excel 文档为空");
                     for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
                         Cell cell = row.getCell(c);
                         if (cell == null) {

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

@@ -5,7 +5,7 @@
   <sql id="QueryCondition">
     1 = 1
     <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
-      AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
+      AND organization_id= #{cfCondition.orgId,jdbcType=VARCHAR}
     </if>
     <if test="cfCondition.periodStart!=null">
       AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}

atms-web/src/main/webapp/app/common/controls/edit-template-modal/edit-template-modal.html

@@ -18,7 +18,6 @@
                     <label for="fileName" class="col-sm-3 control-label">{{'TemplateFile' | translate}}: </label>
                     <div class="col-sm-5">
                         <input class="form-control" type="text" name="fileName" ng-model="editModel.file.name" readonly placeholder="">
-                        </input>
                     </div>
                     <div class="col-sm-2">
                         <button type="button" type="file" ngf-select ng-model="editModel.file" accept=".xls,.xlsx" ngf-change="getSheetList()" class="btn btn-secondary browse">{{'Browse' | translate }}</button>