Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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

@@ -22,6 +22,8 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
@@ -60,8 +62,8 @@ public class CitPreviewDataController extends  BaseController {
     }
     //预提重分类数据源
     @RequestMapping(value = "exportDataSalaryAdvance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public void exportDataSalaryAdvance(@RequestBody CitEAMAssetsDisposalDto citEAMAssetsDisposalDto, HttpServletResponse response) {
-        int count = citPreviewDataService.exportDataSalaryAdvance(citEAMAssetsDisposalDto, response);
+    public void exportDataSalaryAdvance(@RequestBody CitSalaryDataDto citSalaryDataDto, HttpServletResponse response) {
+        int count = citPreviewDataService.exportDataSalaryAdvance(citSalaryDataDto, response);
         if (count == 0) {
             response.setStatus(SC_NO_CONTENT);
         } else {

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

@@ -148,9 +148,9 @@ public class CitPreviewDataServiceImpl extends  BaseService {
         return  1;
     }
 
-    public int exportDataSalaryAdvance(CitEAMAssetsDisposalDto citEAMAssetsDisposalDto, HttpServletResponse response) {
+    public int exportDataSalaryAdvance(CitSalaryDataDto citSalaryDataDto , HttpServletResponse response) {
         CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
-        List<CitEAMAssetsDisposal> list = citEAMAssetsDisposalMapper.selectByCondition(citEAMAssetsDisposalDto);
+        List<CitSalaryAdvance> list = citSalaryAdvanceMapper.selectByCondition(citSalaryDataDto);
         if(list.size()==0){
             return  0;
         }

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

@@ -110,5 +110,4 @@ public interface CitEAMAssetsDisposalMapper extends MyMapper {
     int insertBatch(List<CitEAMAssetsDisposal> citEAMAssetsDisposalList);
 
     List<CitEAMAssetsDisposal> selectByCondition(@Param("citEAMAssetsDisposal") CitEAMAssetsDisposal citEAMAssetsDisposal);
-    List<CitSalaryAdvance> selectByCondition(@Param("citPreviewSalaryAdvance") CitSalaryAdvance citEAMAssetsDisposal);
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyMapper;
+import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
 import pwc.taxtech.atms.entity.CitSalaryAdvance;
 import pwc.taxtech.atms.entity.CitSalaryAdvanceExample;
 
@@ -107,4 +108,6 @@ public interface CitSalaryAdvanceMapper extends MyMapper {
     int updateByPrimaryKey(CitSalaryAdvance record);
 
     int insertBatch(List<CitSalaryAdvance> list);
+
+    List<CitSalaryAdvance> selectByCondition(@Param("citPreviewSalaryAdvance") CitSalaryAdvance citSalaryAdvance);
 }
\ No newline at end of file

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

@@ -473,7 +473,6 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      * @mbg.generated
      */
     @JsonSerialize(using = CustomDateSerializer.class)
-
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -3,9 +3,9 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
   <sql id="QueryCondition">
     1 = 1
-<!--    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)">
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)">
       AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
-    </if>-->
+    </if>
     <if test="citEAMAssetsDisposal.compensationSaleAmount!=null and citEAMAssetsDisposal.compensationSaleAmount != '' ">
       AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
     </if>

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

@@ -3,23 +3,20 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitSalaryAdvanceMapper">
   <sql id="QueryCondition">
     1 = 1
-    <!--    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)">
-          AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
-        </if>-->
-    <if test="citPreviewSalaryAdvance.compensationSaleAmount!=null and citPreviewSalaryAdvance.compensationSaleAmount != '' ">
-      AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
+        <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citPreviewSalaryAdvance.period)">
+          AND period= #{citPreviewSalaryAdvance.period,jdbcType=VARCHAR}
         </if>
-    <if test="citPreviewSalaryAdvance.assetLabelNumber!=null and citPreviewSalaryAdvance.assetLabelNumber!='' ">
-      AND asset_label_number &lt;= #{citEAMAssetsDisposal.assetLabelNumber,jdbcType=INTEGER}
+    <if test="citPreviewSalaryAdvance.poSubjectName!=null and citPreviewSalaryAdvance.poSubjectName != '' ">
+      AND po_subject_name &gt;= #{citPreviewSalaryAdvance.poSubjectName,jdbcType=INTEGER}
     </if>
     <if test="citPreviewSalaryAdvance.periodStart!=null and citPreviewSalaryAdvance.periodStart!= '' and citPreviewSalaryAdvance.periodEnd!= null and citPreviewSalaryAdvance.periodEnd!= ''">
-      AND period  between  ${citEAMAssetsDisposal.periodStart} and ${citEAMAssetsDisposal.periodEnd}
+      AND period  between  ${citPreviewSalaryAdvance.periodStart} and ${citPreviewSalaryAdvance.periodEnd}
     </if>
-    <if test="citEAMAssetsDisposal.periodStart == null and citEAMAssetsDisposal.periodStart != '' and citEAMAssetsDisposal.periodEnd != null and citEAMAssetsDisposal.periodEnd != ''">
-      AND period  &lt; ${citEAMAssetsDisposal.periodEnd} or period = ${citEAMAssetsDisposal.periodEnd}
+    <if test="citPreviewSalaryAdvance.periodStart == null and citPreviewSalaryAdvance.periodStart != '' and citPreviewSalaryAdvance.periodEnd != null and citPreviewSalaryAdvance.periodEnd != ''">
+      AND period  &lt; ${citPreviewSalaryAdvance.periodEnd} or period = ${citPreviewSalaryAdvance.periodEnd}
     </if>
-    <if test="citEAMAssetsDisposal.periodStart != null and citEAMAssetsDisposal.periodStart != '' and citEAMAssetsDisposal.periodEnd == null and citEAMAssetsDisposal.periodEnd  != '' ">
-      AND period  &gt; ${citEAMAssetsDisposal.periodStart} or period = ${citEAMAssetsDisposal.periodStart}
+    <if test="citPreviewSalaryAdvance.periodStart != null and citPreviewSalaryAdvance.periodStart != '' and citPreviewSalaryAdvance.periodEnd == null and citPreviewSalaryAdvance.periodEnd  != '' ">
+      AND period  &gt; ${citPreviewSalaryAdvance.periodStart} or period = ${citPreviewSalaryAdvance.periodStart}
     </if>
   </sql>
 
@@ -94,7 +91,18 @@
 
   <select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance" resultType="pwc.taxtech.atms.entity.CitSalaryAdvance">
     select
-     *
+    organization_id  organizationId,
+    project_id projectId,
+    period ,
+    source,
+    po_no  poNo,
+    po_subject_code poSubjectCode,
+    po_subject_name poSubjectName,
+    advance advance,
+    approved_standard_invoice_amount approvedStandardInvoiceAmount,
+    created_by createdBy,
+    create_time createTime
+    from cit_salary_advance
     WHERE
     <include refid="QueryCondition"/>
   </select>

atms-web/src/main/webapp/app/cit/preview/cit-preview-asset-list/cit-preview-asset-list.html

@@ -18,37 +18,6 @@
             <button class="btn btn-vat-primary" translate="AssetClassification" ng-click="setAssetsGroup()"></button>
         </div>
         <form class="form-inline">
-            <!--<div class="form-group" ng-style="setButtonWrapStyle()">-->
-            <!--<div class="import-wrapper">-->
-            <!--<button type="button" ng-show="hasEditPermission" -->
-            <!--ngf-select="" ng-model="fileNameWrapper" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx,.xlsm"-->
-            <!--ngf-multiple="false" ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px">-->
-            <!--{{'SelectFile' | translate}}-->
-            <!--</button>-->
-            <!--<div class="import-info-wrapper" ng-show="fileName">-->
-            <!--<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|-->
-            <!--<span translate="WorkSheet"></span>-->
-            <!--<div class="ui-select-no-border">-->
-            <!--<ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">-->
-            <!--<ui-select-match placeholder="{{'SelectASheet' | translate}}">{{$select.selected.name}}</ui-select-match>-->
-            <!--<ui-select-choices repeat="sheetName in sheetData.sheetNameList | propsFilter: {name: $select.search}">-->
-            <!--<div title="{{sheetName.name}}" ng-bind-html="sheetName.name | limitString:9"></div>-->
-            <!--</ui-select-choices>-->
-            <!--</ui-select>-->
-            <!--</div>-->
-            <!--&nbsp;&nbsp;&nbsp;&nbsp;|-->
-            <!--<span translate="StartRowNum"></span>-->
-            <!--<input id="StartRowNum" ng-model="StartRowNum" type="text"-->
-            <!--onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
-            <!--onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" />-->
-            <!--</div>-->
-            <!--<button class="btn btn-vat-primary" style="float:right; margin-right: 10px;" ng-if="isShowImportTotalBtn && hasEditPermission" translate="ImportBtn" ng-click="importData(importEnum.Import)"></button>-->
-            <!--<div class="btn-wrapper" ng-if="!isShowImportTotalBtn && hasEditPermission">-->
-            <!--<button class="btn btn-vat-primary" translate="ConverImportBtn"  ng-click="importData(importEnum.CoverImport)"></button>|<button class="btn btn-vat-primary" translate="AddImportBtn" ng-click="importData(importEnum.AddImport)"></button>-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--</div>-->
-
             <div class="form-group">
                 <div class="col-sm-5">
                     <input class="form-control" type="text" name="fileName"
@@ -65,13 +34,6 @@
                 </div>
 
             </div>
-
-            <!--分页栏-->
-            <!--<div class="form-group page-form-group" ng-show="!showImportTable">-->
-            <!--<div class="page-footer">-->
-            <!--<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshInvoiceDataGrid()" hide-page-size-selector="true"></ack-pagination>-->
-            <!--</div>-->
-            <!--</div>-->
         </form>
 
         <!--导入数据界面-->

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;    width: 200px;" id="input-invoice-period-picker" />
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;    width: 200px;" id="input-invoice-period-picker" />
         <span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
 
         <div class="dt-init-wrapper" style="    position: relative; top: -41px;">

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js

@@ -30,15 +30,15 @@
         function initAssetResultDxGrid() {
             var dupColumns = [
                 { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
-                { caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: '30%', allowEditing: false, fixed: true },
                 /*  { caption: $translate.instant('organizationId'), dataField: "organizationId", width: 120, allowEditing: false, fixed: true },
                   { caption: $translate.instant('ProjectNameCol'), dataField: "projectName", width: 120, allowEditing: false, fixed: true },*/
-                { caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('advancePrice'), dataField: "advance", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('period'), dataField: "period", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('source'), dataField: "source", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('advancePrice'), dataField: "advance", width: '15%', allowEditing: false, fixed: true },
                 { caption: $translate.instant('approvedPrice'), dataField: "approvedStandardInvoiceAmount", width: 200, allowEditing: false, fixed: true },
                 /*   { caption: $translate.instant('createBy'), dataField: "createdBy", width: 200, allowEditing: false, fixed: true },*/
-                { caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true }
+                { caption: $translate.instant('createTime'), dataField: "createTime", width: '15%', allowEditing: false, fixed: true }
             ];
 
             $scope.assetsResultGridOptions = {
@@ -87,7 +87,7 @@
 
         //导出数据
         $scope.downloadTB = function () {
-            citPreviewDataService.exportData( $scope.queryParams).success(function (data, status, headers) {
+            citPreviewDataService.exportDataSalaryAdvance( $scope.queryParams).success(function (data, status, headers) {
                 if(status===204){
                     SweetAlert.warning("没有数据可以下载");
                     return;
@@ -101,8 +101,7 @@
 
         $scope.doDataReset = function () {
             $scope.queryParams.period = null;
-            $scope.queryParams.compensationSaleAmount = null;
-            $scope.queryParams.assetLabelNumber = null;
+            $scope.queryParams.poSubjectName = null;
             $scope.refreshConfigGrid();
         }
         $scope.doSearch = function () {
@@ -110,7 +109,7 @@
         }
 
         var initListData = function(){
-            citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope).success(function (res) {
+            citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope.queryParams).success(function (res) {
 
                 $scope.listData = commonWebService._index(res.list);
                 $scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
@@ -163,13 +162,15 @@
                 $scope.queryParams.periodEnd = commonWebService._dateByPicker(start, end).end;
                 $scope.refreshConfigGrid();
             });
+            $scope.queryParams = {};
+            $scope.formParam = {};
+
             //分页的设置
             $scope.queryParams.pagingOptions = {
                 pageIndex: 1,  //当前页码
                 totalItems: 0,  //总数据
                 pageSize: 20,  //每页多少条数据
             };
-            $scope.formParam = {};
             initAssetResultDxGrid();
             initListData();
         })();

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html

@@ -9,12 +9,12 @@
         <i class="fa fa-filter" aria-hidden="true"></i>
     </button>
     <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：-->
-    <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;    width: 200px;" id="input-invoice-period-picker" />
+    <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;    width: 200px;" id="input-invoice-period-picker" />
     <span ng-click="downloadTB()" style="    position: absolute;    z-index: 99999999;    top: 14px;    right: 2%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
         <div class="dt-init-wrapper" style="    position: relative; top: -20px;">
     <div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
     <div class="page-footer">
-        <ack-pagination page-options="pagingOptions"
+        <ack-pagination page-options="queryParams.pagingOptions"
                         refresh-table="refreshConfigGrid()"></ack-pagination>
     </div>
     </div>

atms-web/src/main/webapp/app/common/controls/mention-input/mention-input.js

@@ -48,7 +48,6 @@ commonModule
                         txt = txt.replace(/\xA0/g, ' ').replace(/\n/g, '').replace(/\r/g, '');
                         txt = _.unescape(txt);
                     }
-
                     ngModel.$setViewValue(txt);
                 };
 
@@ -117,7 +116,6 @@ commonModule
                             }
                         });
                     }
-
                     element.html(viewValue || '');
                 };
 
@@ -897,7 +895,6 @@ commonModule
 
                         var txtNode = document.createTextNode(text);
                         range.insertNode(txtNode);
-
                         // Preserve the selection
                         range = range.cloneRange();
                         range.setStart(txtNode, txtNode.length);