Skip to content

T
traffic-front
Commit 959341d2 authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent 2cae0400
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 45 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogFileTypeController.java
View file @ 959341d2
......@@ -95,17 +95,12 @@ public class OperationLogFileTypeController {
try {
Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id");
// headers.put("operation_content", "操作内容");
// headers.put("module_name", "模块名称");
// headers.put("operation_object", "操作对象");
headers.put("operation_action", "操作action");
// headers.put("original_state", "原始状态");
// headers.put("update_state", "更新状态");
headers.put("operation_action", "操作");
headers.put("update_state", "操作内容");
headers.put("operation_user", "操作者");
headers.put("operation_user", "操作人员");
headers.put("ip", "操作ip");
headers.put("comment", "内容");
headers.put("create_time", "创建时间");
headers.put("comment", "备注");
headers.put("create_time", "操作时间");
List<OperationLogFileType> fileTypes = operationLogFileTypeService.selectFileTypesList();
// List<OperationLogFileType> operationLogFileTypes = operationLogFileTypeService.selectListForLog(operationLogFileType.getFileTypeIds());
response.setContentType("multipart/form-data");
......
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogTaxDocController.java
View file @ 959341d2
......@@ -74,13 +74,13 @@ public class OperationLogTaxDocController {
public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) {
try {
Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id");
headers.put("operation_action", "操作action");
headers.put("id", "序号");
headers.put("operation_action", "操作");
headers.put("update_state", "操作内容");
headers.put("operation_user", "操作者");
headers.put("operation_user", "操作人员");
headers.put("ip", "操作ip");
headers.put("comment", "内容");
headers.put("create_time", "创建时间");
headers.put("comment", "备注");
headers.put("create_time", "操作时间");
List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids);
response.setContentType("multipart/form-data");
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogFileType.java
View file @ 959341d2
......@@ -58,7 +58,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=2)
@ExcelCell(index=3)
private String operationAction;
/**
......@@ -77,7 +77,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=3)
@ExcelCell(index=4)
private String updateState;
/**
......@@ -87,7 +87,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=4)
@ExcelCell(index=5)
private String operationUser;
/**
......@@ -97,7 +97,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=5)
@ExcelCell(index=6)
private String ip;
/**
......@@ -107,7 +107,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=5)
@ExcelCell(index=7)
private String comment;
/**
......@@ -117,7 +117,7 @@ public class OperationLogFileType implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=6)
@ExcelCell(index=2)
private Date createTime;
private List<String> fileTypeIds;
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogTaxDocument.java
View file @ 959341d2
......@@ -58,7 +58,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=2)
@ExcelCell(index=3)
private String operationAction;
/**
......@@ -77,7 +77,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=3)
@ExcelCell(index=4)
private String updateState;
/**
......@@ -87,7 +87,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=4)
@ExcelCell(index=5)
private String operationUser;
/**
......@@ -97,7 +97,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=5)
@ExcelCell(index=6)
private String ip;
/**
......@@ -107,7 +107,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=6)
@ExcelCell(index=7)
private String comment;
/**
......@@ -117,7 +117,7 @@ public class OperationLogTaxDocument implements Serializable {
*
* @mbg.generated
*/
@ExcelCell(index=7)
@ExcelCell(index=2)
private Date createTime;
List<String> ids;
......
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
View file @ 959341d2
......@@ -19,6 +19,10 @@ frameworkModule.controller('appUsrOperateLogController',
}
});
}
if($scope.thisModuleId.length===0){
SweetAlert.warning($translate.instant("NeedChecked"));
return;
}
var config = {
// params: {
"ids":$scope.thisModuleId
......@@ -32,6 +36,11 @@ frameworkModule.controller('appUsrOperateLogController',
$scope.dataGridUpdate(data);
$scope.thisModuleId=[];//清空查询id
})
if(!$("#usrOperateLogPop").length){
var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
$("body").append($compile(usrOperateLogPopTemp)($scope));
}
$("#usrOperateLogPop").modal("show");
};
// $scope.sniffHelpPopRadio = function(){
// taxDocumentListService.getDocumentsAttrAndType({params: {}}).then(function (data) {
......@@ -182,11 +191,6 @@ frameworkModule.controller('appUsrOperateLogController',
$scope.openUsrOperateLogPop = function(){
$scope.loadMainData();
if(!$("#usrOperateLogPop").length){
var usrOperateLogPopTemp = $($("#usrOperateLogPopContainer").html());
$("body").append($compile(usrOperateLogPopTemp)($scope));
}
$("#usrOperateLogPop").modal("show");
};
$scope.hideUsrOperateLogPop = function(){
$("#usrOperateLogPop").modal("hide");
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 959341d2
......@@ -329,7 +329,54 @@ taxDocumentManageModule.controller('taxDocumentListController',
}
};
};
$scope.changeDateRangeError=function(){
var items=$scope.queryFieldModel;
if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
items.fileBeginTime > items.fileEndTTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
items.ownBeginTime > items.ownEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
items.effectiveBeginTime > items.effectiveEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
items.uploadBeginTime > items.uploadEndTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('DateWarningSearch'));
}
};
$scope.changeFieldModel=function(){
//新建记录
items=$scope.editFieldModel;
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
}
};
$scope.changeFieldItem=function(){
//批量上传
items=$scope.editFieldItem;
if (!PWC.isNullOrEmpty(items.fileTime) && !PWC.isNullOrEmpty(items.effectiveTime) &&
items.fileTime > items.effectiveTime)
{
SweetAlert.warning($translate.instant('FileTimeDateRangeError'));
}
};
//弹出框
$scope.isCreatePop = false;
var openSimpleUploadPop = function (rowId) {
......@@ -370,7 +417,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
var simpleUploadSubmit = function () {
var params = angular.copy($scope.editFieldModel);
if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.fileTime) &&
if (!PWC.isNullOrEmpty(params.fileTime) && !PWC.isNullOrEmpty(params.effectiveTime) &&
params.fileTime > params.effectiveTime)
{
window.swal($translate.instant('FileTimeDateRangeError'));
......@@ -494,7 +541,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
params.filePositionUrl = encodeURIComponent(params.filePositionUrl);
taxDocumentListService.verifyDuplicate(params).then(function (result) {
// 例如 修改1为1 不用弹框 修改1本身就好 但是修改1为2 ,就要去掉1并修改2(保留2的id)
if (result.id==fieldModel.id) {
if ((result.id==null|| result.id==undefined)|| (result.id==fieldModel.id)) {
editRecord_Post(fieldModel,type);
}else{
var hisCellId=result.id;
......@@ -1094,6 +1141,12 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
// $scope.isRequired = function (IT8nField) {
// return $scope.requiredField.indexOf($translate.instant(IT8nField)) > -1;
// };
if (!PWC.isNullOrEmpty(modelItem.fileTime) && !PWC.isNullOrEmpty(modelItem.effectiveTime) &&
modelItem.fileTime > modelItem.effectiveTime)
{
alertText = $translate.instant("Document") + (i + 1) + "," + "【"+$translate.instant('FileTimeDateRangeError')+"】";
break;
}
if(!modelItem.companyName && $scope.isRequired($translate.instant("CompanyName"))){
alertText += "【"+$translate.instant("CompanyName")+"】"
}
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 959341d2
......@@ -415,11 +415,11 @@
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.AvailabilityDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker1"/>-->
<input type='text' placeholder="From"
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileBeginTime"
data-min-view-mode="0" />
<input type='text' placeholder="To"
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.fileEndTTime"
data-min-view-mode="0" />
......@@ -433,11 +433,11 @@
<div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.Duration"/>-->
<input type='text' placeholder="From"
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownBeginTime"
data-min-view-mode="1"/>
<input type='text' placeholder="To"
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyymm" ng-model="queryFieldModel.ownEndTime"
data-min-view-mode="1"/>
......@@ -497,11 +497,11 @@
<div class="TDL-query-val">
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.DueDate"/>-->
<input type='text' placeholder="From"
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveBeginTime"
data-min-view-mode="0"/>
<input type='text' placeholder="To"
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.effectiveEndTime"
data-min-view-mode="0"/>
......@@ -583,11 +583,11 @@
<!--<input type="text" class="form-control radius3"-->
<!--ng-model="queryFieldModel.UploadDate"/>-->
<!--<input type="text" class="form-control radius3" id="period-picker4" />-->
<input type='text' placeholder="From"
<input type='text' placeholder="From" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadBeginTime"
data-min-view-mode="0"/>
<input type='text' placeholder="To"
<input type='text' placeholder="To" ng-change="changeDateRangeError()"
date-time-picker class="form-control TDL-query-val-multi"
data-date-format="yyyy/mm/dd" ng-model="queryFieldModel.uploadEndTime"
data-min-view-mode="0"/>
......@@ -817,7 +817,7 @@
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd"
data-date-format="yyyy/mm/dd" ng-change="changeFieldModel()"
ng-required="isRequired('AvailabilityDate')"
class="form-control" ng-model="editFieldModel.fileTime"/>
</div>
......@@ -830,7 +830,7 @@
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker
data-date-format="yyyy/mm/dd"
ng-required="isRequired('DueDate')"
ng-required="isRequired('DueDate')" ng-change="changeFieldModel()"
class="form-control" ng-model="editFieldModel.effectiveTime"/>
</div>
</div>
......@@ -1057,7 +1057,7 @@
{{'AvailabilityDate' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}"
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
ng-class="{'upload-fail-mark':isRequired('AvailabilityDate') && !editFieldItem.fileTime}"
date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.fileTime"/>
......@@ -1069,7 +1069,7 @@
{{'DueDate' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%">
<input type='text' placeholder="{{'PleaseSelected' | translate}}"
<input type='text' placeholder="{{'PleaseSelected' | translate}}" ng-change="changeFieldItem()"
ng-class="{'upload-fail-mark':isRequired('DueDate') && !editFieldItem.effectiveTime}"
date-time-picker data-date-format="yyyy/mm/dd"
class="form-control" ng-model="editFieldItem.effectiveTime"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment