Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -109,6 +109,21 @@ public class DateUtils {
         return dateString;
     }
 
+    /**
+     * 根据yyyyMMdd时间格式字符串,格式化为date类型
+     *
+     * @param dateStr
+     * @return
+     */
+    public static Date stringToDate4yyyyMMdd(String dateStr) {
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            Date date = formatter.parse(dateStr);
+            return date;
+        } catch (ParseException e) {
+            return null;
+        }
+    }
     /**
      * 将短时间格式字符串转换为区间格式 yyyyMM
      *

atms-api/src/main/java/pwc/taxtech/atms/controller/TaxDocumentController.java

@@ -105,6 +105,13 @@ public class TaxDocumentController {
         }
         return taxDocumentService.editFilesType(taxDocument);
     }
+
+    @GetMapping("/multipalInitData")
+    @ResponseBody
+    public Map<String,Object> multipalInitData(String address){
+        //地址示例: D://multipaiInitData
+        return taxDocumentService.multipalInitData(address);
+    }
     @RequestMapping("exportExcel")
     @ResponseBody
     public void exportExcelFile(HttpServletResponse response, @RequestBody TaxDocumentDto taxDocumentDto) {

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

@@ -62,6 +62,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
     public PageInfo<CitJournalAdjustDto> getJournalMergeData(CitJournalAdjustDto citJournalAdjustDto) {
         CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
         Page page = PageHelper.startPage(citJournalAdjustDto.getPageInfo().getPageIndex(), citJournalAdjustDto.getPageInfo().getPageSize());
+
         List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMerge(citJournalEntryAdjust);
         List<CitJournalAdjustDto> journalAdjustDtos = Lists.newArrayList();
         journalMerges.forEach(journal -> {

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

@@ -1191,6 +1191,7 @@ public class CitReportServiceImpl extends BaseService {
     private CitJournalEntryAdjustMapper citJournalEntryAdjustMapper;
 
     public OperationResultDto addCellManualDataSource(ManualDataSourceDto data, String projectId) {
+        data.setPeriod(0);
         OperationResultDto operationResultDto = new OperationResultDto();
         try {
             if (data.getCellId() == null) {
@@ -1247,29 +1248,29 @@ public class CitReportServiceImpl extends BaseService {
 
 
                 /*kevin insert  */ // TODO: 3/21/2019  需要验证
-                PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
-                PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
-                criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
-                criteria.andProjectIdEqualTo(data.getProjectId());
-                PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
-                periodCellTemplateConfig.setParsedFormula(sumValue);
-                periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
-                //更改选中行相关数据
-                CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
-                citJournalEntryAdjust.setIsSelect("1");
-                CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
-                CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
-                criteria1.andProjectIdEqualTo(data.getProjectId());
-                criteria1.andSubjectCodeEqualTo(data.getAccountCode());
-                citJournalEntryAdjustMapper.updateByExample(citJournalEntryAdjust, example1);
-
-                JournalEntry journalEntry = new JournalEntry();
-                journalEntry.setIsSelect("1");
-                JournalEntryExample example2 = new JournalEntryExample();
-                JournalEntryExample.Criteria criteria2 = example2.createCriteria();
-                criteria2.andProjectIdEqualTo(data.getProjectId());
-                criteria2.andSegment3EqualTo(data.getAccountCode());
-                journalEntryMapper.updateByExample(journalEntry, example2);
+//                PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
+//                PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
+//                criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
+//                criteria.andProjectIdEqualTo(data.getProjectId());
+//                PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
+//                periodCellTemplateConfig.setParsedFormula(sumValue);
+//                periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
+//                //更改选中行相关数据
+//                CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
+//                citJournalEntryAdjust.setIsSelect("1");
+//                CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
+//                CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
+//                criteria1.andProjectIdEqualTo(data.getProjectId());
+//                criteria1.andSubjectCodeEqualTo(data.getAccountCode());
+//                citJournalEntryAdjustMapper.updateByExample(citJournalEntryAdjust, example1);
+//
+//                JournalEntry journalEntry = new JournalEntry();
+//                journalEntry.setIsSelect("1");
+//                JournalEntryExample example2 = new JournalEntryExample();
+//                JournalEntryExample.Criteria criteria2 = example2.createCriteria();
+//                criteria2.andProjectIdEqualTo(data.getProjectId());
+//                criteria2.andSegment3EqualTo(data.getAccountCode());
+//                journalEntryMapper.updateByExample(journalEntry, example2);
             }
 
             List<DataSourceExtendDto> dataSourceExtendDtos = periodDataSourceMapper.getManualDataSource(data.getCellId());

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

@@ -352,16 +352,16 @@
         created_by, created_date, late_updated_by,
         late_updated_date, create_time, update_time,is_select
         from cit_journal_entry_adjust where project_id = #{projectId,jdbcType=VARCHAR}
-        <if test="orgCode != null">
+        <if test="orgCode != null and orgCode != ''">
             and org_code = #{orgCode,jdbcType=VARCHAR}
         </if>
-        <if test="subjectCode != null">
+        <if test="subjectCode != null and subjectCode != ''">
             and subject_code = #{subjectCode,jdbcType=VARCHAR}
         </if>
-        <if test="orgName != null">
+        <if test="orgName != null and orgName != ''">
             and org_name = #{orgName,jdbcType=VARCHAR}
         </if>
-        <if test="subjectName != null">
+        <if test="subjectName != null and subjectName != ''">
             and subject_name = #{subjectName,jdbcType=VARCHAR}
         </if>
         <if test="periodStart!=null">
@@ -381,16 +381,16 @@
         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, is_select
         from journal_entry where project_id = #{projectId,jdbcType=VARCHAR}
-        <if test="orgCode != null">
+        <if test="orgCode != null and orgCode != ''">
             and segment1 = #{orgCode,jdbcType=VARCHAR}
         </if>
-        <if test="subjectCode != null">
+        <if test="subjectCode != null and subjectCode != ''">
             and segment3 = #{subjectCode,jdbcType=VARCHAR}
         </if>
-        <if test="orgName != null">
+        <if test="orgName != null and orgName != ''">
             and segment1_name = #{orgName,jdbcType=VARCHAR}
         </if>
-        <if test="subjectName != null">
+        <if test="subjectName != null and subjectName != ''">
             and segment3_name = #{subjectName,jdbcType=VARCHAR}
         </if>
         <if test="periodStart!=null">

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

@@ -360,13 +360,13 @@
       on
         tb.account_code=dam.acct_code
       where tb.project_id = #{projectId,jdbcType=VARCHAR}
-    <if test="accountCode != null">
+    <if test="accountCode != null and accountCode != ''">
       and tb.account_code = #{accountCode,jdbcType=VARCHAR}
     </if>
-    <if test="accountDescription != null">
+    <if test="accountDescription != null and accountDescription != ''">
       and tb.account_description = #{accountDescription,jdbcType=VARCHAR}
     </if>
-    <if test="attribute != null">
+    <if test="attribute != null and attribute != ''">
       and dam.account_description = #{attribute,jdbcType=VARCHAR}
     </if>
 

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

@@ -67,7 +67,6 @@
                     </trim>
                 </if>
             </foreach>
-            and enable = 'T'
         </where>
     </sql>
     <sql id="Update_By_Example_Where_Clause">
@@ -151,13 +150,16 @@
         where id = #{id,jdbcType=BIGINT}
     </delete>
 
-    <delete id="batchDelete">
-        DELETE FROM tax_document
+    <update id="batchDelete">
+        UPDATE tax_document
+        SET
+        enable = 'F'
         WHERE id IN
         <foreach collection="list" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-    </delete>
+        AND enable = 'T'
+    </update>
 
     <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.TaxDocumentExample">
         <!--

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

@@ -56,5 +56,6 @@
   "PreviewFile":"PreviewFile",
   "UploadSuccessCount":"UploadSuccessCount",
   "UploadFailCount":"UploadFailCount",
-  "DeleteConfirm":"DeleteConfirm"
+  "DeleteConfirm":"DeleteConfirm",
+  "FileTimeDateRangeError":"FileTimeDateRangeError"
 }
\ No newline at end of file

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

@@ -55,7 +55,8 @@
   "Edit":"编辑",
   "DocumentPath":"档案路径",
   "PreviewFile":"预览文件",
-  "UploadSuccessCount":"个档案上传成功",
-  "UploadFailCount":"个档案上传失败",
-  "DeleteConfirm":"是否确认删除记录？"
+  "UploadSuccessCount":"个档案上传成功:",
+  "UploadFailCount":"个档案上传失败:",
+  "DeleteConfirm":"是否确认删除记录？",
+  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2443,7 +2443,7 @@
                     //加载用户权限list
                     loadUserRoleList(org.id);
                     generalSelectCompanyText();
-
+                    cancelWebChange();
                 });
 
 

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -38,7 +38,7 @@
             //分页的设置
             $scope.pagingOptions = {
                 pageIndex: 1,  //当前页码
-                totalItems: 1,  //总数据
+                totalItems: 4187,  //总数据
                 pageSize: 100,  //每页多少条数据
                 pageSizeString: "100"
             };

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html

@@ -15,13 +15,13 @@
                         <input class="form-control input-width-middle" type="text" id="subjectName" ng-model="queryParams.subjectName" />
                     </td>
                 </tr>
-                <tr>
+                <tr style="display: none">
                     <td>
                         <span translate="orgCode"></span>
                         <input class="form-control input-width-middle" type="text" id="orgCode" ng-model="queryParams.orgCode" />
                     </td>
                 </tr>
-                <tr>
+                <tr style="display: none">
                     <td>
                         <span translate="orgName"></span>
                         <input class="form-control input-width-middle" type="text" id="orgName" ng-model="queryParams.orgName" />

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -178,13 +178,13 @@
             }
 
             loadJournalEntryDataFromDB(1);
-            if ($scope.criteriaList.length > 6) {
-                $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
-                $scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
-            }
-            else {
-                $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
-            }
+            // if ($scope.criteriaList.length > 6) {
+            //     $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
+            //     $scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
+            // }
+            // else {
+            //     $scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
+            // }
             $('.filter-button').popover("hide");
         };
 
@@ -201,8 +201,8 @@
                 documentDate: null,
                 projectId: vatSessionService.project.id
             };
-            $scope.queryParams.periodStart = $scope.startMonth;
-            $scope.queryParams.periodEnd = $scope.endMonth;
+            $scope.queryParams.periodStart = vatSessionService.year * 100 + 1;
+            $scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
             loadJournalEntryDataFromDB(1);
             $('.filter-button').popover("hide");
         };

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver-search.html

@@ -8,7 +8,7 @@
 
                         <div class="input-group">
                             <input class="form-control " type="text" id="accountCode" placeholder=""
-                                   ng-model="filterData.accountCode">
+                                   ng-model="queryParams.accountCode">
                             <!--<a class="input-group-addon btn btn-sm" ng-click="popTheParentCode()"><i-->
                                     <!--class="fa fa-columns" aria-hidden="true"></i></a>-->
 
@@ -19,7 +19,7 @@
                 <tr>
                     <td><span translate="AccountName"></span></td>
                     <td><input class="form-control " type="text" id="accountDescription" placeholder=""
-                               ng-model="filterData.accountDescription"></td>
+                               ng-model="queryParams.accountDescription"></td>
                 </tr>
 
                 <!--<tr>-->

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js

@@ -182,6 +182,8 @@
                 pageInfo: {},
                 periodStart: '',
                 periodEnd: '',
+                accountCode:'',
+                accountDescription:'',
                 // segment3: null,
                 // segment3Name: null,
                 // segment5: null,

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver-search.html

@@ -8,7 +8,7 @@
 
                         <div class="input-group">
                             <input class="form-control " type="text" id="accountCode" placeholder=""
-                                   ng-model="filterData.accountCode">
+                                   ng-model="queryParams.accountCode">
                         </div>
                     </td>
                 </tr>
@@ -16,13 +16,13 @@
                 <tr>
                     <td><span translate="AccountName"></span></td>
                     <td><input class="form-control " type="text" id="accountDescription" placeholder=""
-                               ng-model="filterData.accountDescription"></td>
+                               ng-model="queryParams.accountDescription"></td>
                 </tr>
 
                 <tr>
                     <td><span translate="Attribute"></span></td>
                     <td><input class="form-control " type="text" id="attribute" placeholder=""
-                               ng-model="filterData.attribute"></td>
+                               ng-model="queryParams.attribute"></td>
                 </tr>
 
                 <!--<tr>-->

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

@@ -527,6 +527,7 @@
 
                     //设置手工输入保存时需要的信息
                     $scope.handInputModel = {
+                        cellId:jsonTagInfo.cellID,
                         cellID: jsonTagInfo.cellID,
                         cellTemplateID: jsonTagInfo.cellTemplateID,
                         reportID: jsonTagInfo.reportID
@@ -1560,7 +1561,7 @@
             
             if (vatSessionService.month)
                 vatSessionService.project.period = vatSessionService.month;
-            vatApproveService.approvalStatus(vatSessionService.project.id, vatSessionService.project.period).success(function (result) {
+            vatApproveService.approvalStatus(vatSessionService.project.id, 0).success(function (result) {
                 $scope.handInputModel.name = $scope.taxCellDetail.inputMemo;
                 $scope.handInputModel.description = $scope.taxCellDetail.inputMemo;
                 $scope.handInputModel.projectID = vatSessionService.project.id;

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -125,6 +125,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 }
             }
 
+            //事业部
+            if ($scope.selectBusinessUnit) {
+                editModel.businessUnitID = $scope.selectBusinessUnit.ID;
+            }
+            //区域
+            if ($scope.componentSelectedArea) {
+                editModel.areaID = $scope.selectedAreaId;
+            }
             if ($scope.isAdd) {
                 editModel.isActive = true;
                 orgService.addOrg(editModel).success(function (orgId) {
@@ -158,7 +166,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                         return;
                     }
                 }
-                editModel.isActive = !editModel.isActive;
+                // editModel.isActive = !editModel.isActive;
                 orgService.updateOrg(editModel).success(function (data) {
                     if (data && !data.result) {
                         //SweetAlert.info("Disable", orgId);
@@ -338,7 +346,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                         return;
                     }
                 };
-                editModel.isActive = !editModel.isActive;
+                // editModel.isActive = !editModel.isActive;
                 orgService.updateOrg(editModel).success(function (data) {
                     if (data && !data.result) {
                         //SweetAlert.info("Disable", orgId);

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js

@@ -11,6 +11,14 @@ frameworkModule.controller('appUsrOperateLogController',
 
             $scope.loadMainData = function () {
                 $scope.thisModuleId = $scope.thisModuleId ? $scope.thisModuleId : [];
+                if($scope.thisModuleId.length===0){
+                    $("input[name='dataGridCheckBox']").each(function (index, item) {
+                        if (item.checked) {
+                            var cellId = $(item).attr("data-id");
+                            $scope.thisModuleId.push(cellId);
+                        }
+                    });
+                }
                 var config = {
                     // params: {
                     "ids":$scope.thisModuleId
@@ -21,6 +29,7 @@ frameworkModule.controller('appUsrOperateLogController',
                         SweetAlert.warning("没有数据可以下载");
                         return;
                     }
+                    $scope.thisModuleId=[];//清空查询id
                     $scope.dataGridUpdate(data);
                 })
             };