Skip to content

T
traffic-front
Commit 948c5553 authored by kevin's avatar kevin
Browse files
Options

Merge branch 'dev_mysql' of https://gitee.com/Memorydoc/atms into dev_mysql

parents feb5086b 6ee4f878
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 34 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessageCN.java
View file @ 948c5553
......@@ -18,5 +18,6 @@ public class ErrorMessageCN {
public static final String NoLedgerID = "该机构未同步主数据账套ID!";
public static final String NoCompanyCode = "该机构缺少机构代码字段!";
public static final String ErrorFileFormat="文件样式错误";
public static final String NotOrgException = "表格企业名称为空";
}
atms-api/src/main/java/pwc/taxtech/atms/controller/AccountController.java
View file @ 948c5553
......@@ -19,7 +19,7 @@ public class AccountController {
@Autowired
private UserAccountServiceImpl userAccountService;
// @ApiOperation(value = "修改密码")
// @ApiOperation(value = "修改密码")
@RequestMapping(value = "userPassword", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<LoginOutputDto> changeExternalUserPassword(
@RequestBody(required = false) UserPasswordDto userPasswordDto) {
......@@ -28,7 +28,7 @@ public class AccountController {
return result;
}
// @ApiOperation(value = "忘记密码")
// @ApiOperation(value = "忘记密码")
@RequestMapping(value = "ForgetPassword", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<Object> forgetPassword(@RequestParam(name = "mail") String mail) {
logger.debug("enter forgetPassword");
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 948c5553
......@@ -43,6 +43,7 @@ import pwc.taxtech.atms.dto.vatdto.DataImportResponseDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.exception.Exceptions;
import pwc.taxtech.atms.exception.ServiceException;
import pwc.taxtech.atms.security.dd.DtsTokenService;
import pwc.taxtech.atms.vat.dao.*;
......@@ -736,6 +737,7 @@ public class DataImportService extends BaseService {
*/
public OperationResultDto importIDExcelFile(MultipartFile file, List<String> orgIds, String periodDate, Integer importType) throws ServiceException {
try {
String errorMsg = null;
InputStream inputStream = file.getInputStream();
Workbook workbook = WorkbookFactory.create(inputStream);
FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
......@@ -789,10 +791,10 @@ public class DataImportService extends BaseService {
// 根据机构ID和年份获取卡片
String projId = getProjId(orgId, tmsPeriod);
if (StringUtils.isEmpty(projId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotExistProject);
errorMsg = ErrorMessageCN.DoNotExistProject;
dataImportLogs.add(dataImportLog);
continue;
}
......@@ -800,6 +802,7 @@ public class DataImportService extends BaseService {
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
errorMsg = ErrorMessageCN.DoNotSelectCompany;
dataImportLogs.add(dataImportLog);
continue;
}
......@@ -808,6 +811,7 @@ public class DataImportService extends BaseService {
if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
errorMsg = ErrorMessageCN.ExistDataPeriodsError;
dataImportLogs.add(dataImportLog);
continue;
}
......@@ -825,6 +829,7 @@ public class DataImportService extends BaseService {
Cell cell1 = sheet.getRow(1).getCell(j);
if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
errorMsg = ErrorMessageCN.NotOrgException;
continue;
}
iData.setCompanyName(getCellStringValue(cell1));
......@@ -931,10 +936,10 @@ public class DataImportService extends BaseService {
}
}
if (addDataImportLog(dataImportLogs) < 1) {
return OperationResultDto.error(ErrorMessage.SystemError);
return OperationResultDto.error(errorMsg);
}
if (!dataImportLogs.stream().filter(dil -> !dil.getImportResult()).collect(Collectors.toList()).isEmpty()) {
return OperationResultDto.error();
return OperationResultDto.error(errorMsg);
}
return OperationResultDto.success();
} catch (ServiceException e) {
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 948c5553
......@@ -16,11 +16,11 @@
"AccountMappingSubmit": "提交",
"AccountMappingSubmitComplete": "科目对应提交完成",
"AccountMappingTitle": "科目对应",
"AccountMappingUndo": "撤销",
"AccountMappingUndo": "取消",
"AccountName": "科目名称",
"AccountPeriod": "会计期间",
"Save": "保存",
"Undo": "撤销",
"Undo": "取消",
"AssetListImport": "资产导入",
"AssetList": "资产清单",
"FixedAssets": "固定资产",
......@@ -660,7 +660,7 @@
"InvoiceTypeErrorMsg": "的发票类型错误",
"InvoiceTypeErrorType": "发票类型错误",
"IsComfirmToSubmitReport": "是否确认提交报表审核?",
"IsComfirmToWithdrawSubmitReport": "是否确认撤销报表提交?",
"IsComfirmToWithdrawSubmitReport": "是否确认取消报表提交?",
"IsConfirmCancelMap": "系统已到达{status}状态，是否确认取消对应?",
"IsConfirmManualReClassify": "系统已到达{status}状态，是否确认保存手工重分类?",
"IsConfirmReCalcuate": "系统已到达{status}状态，是否确认重新计算?",
......@@ -673,8 +673,8 @@
"IsConfirmToRejectReport": "是否确认驳回审核?",
"IsConfirmToRejectReportTitle": "是否确认驳回审核?",
"IsConfirmToSubmitReportTitle": "是否确认提交报表审核?",
"IsConfirmToWithdrawSubmitReportTitle": "是否确认撤销提交报表审核?",
"IsConfirmUndoMap": "系统已到达{status}状态，是否确认撤销对应?",
"IsConfirmToWithdrawSubmitReportTitle": "是否确认取消提交报表审核?",
"IsConfirmUndoMap": "系统已到达{status}状态，是否确认取消对应?",
"IsConfirmVoucherReClassify": "系统已到达{status}状态，是否确认保存凭证重分类?",
"IsDelete": "是否确定删除？",
"IsInputNecessary": "是否必填",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 948c5553
......@@ -147,7 +147,7 @@
"OrganizationMsgProjectIndustryRequired": "请选择行业",
"ComfirmUpdate": "确认修改？",
"UpdateOrgExtraInfoTips": "将修改机构-其他信息，是否确认修改？",
"CancelChangeEquityInfoTips": "将撤销变更-股权信息，是否确认修改？",
"CancelChangeEquityInfoTips": "将取消变更-股权信息，是否确认修改？",
"BusinessUnitTitleName": "业务线",
"AreaTitleName": "区域",
"IndustryTitleName": "行业",
......@@ -177,8 +177,8 @@
"EditOrganizationExtra": "修改机构-其他信息",
"EditEquity": "修改股权",
"AlterEquity": "变更股权",
"CancelChangeEquitySuccess": "撤销变更股权成功",
"CancelChangeEquityFailed": "撤销变更股权失败",
"CancelChangeEquitySuccess": "取消变更股权成功",
"CancelChangeEquityFailed": "取消变更股权失败",
"ClientCodeIsExist": "客户编码已经存在!",
"OrgNameOrCodeIsExist": "机构名称或机构编码在该客户下已经存在！",
"OrgNameOrCodeTaxPaymentNoIsExist": "机构名称,机构编码和纳税人识别号已经存在！",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 948c5553
......@@ -17,7 +17,7 @@
"AccountMappingSubmit": "提交科目对应",
"AccountMappingSubmitComplete": "科目对应提交完成",
"AccountMappingTitle": "科目重分类",
"AccountMappingUndo": "撤销",
"AccountMappingUndo": "取消",
"AccountName": "科目名称",
"AccountPeriod": "会计期间",
"AccountReMapVoucherDetailTitle": "凭证信息",
......@@ -952,7 +952,7 @@
"InvoiceVerifyFailure": "验真失败",
"InvoiceXFSBH": "供货方税号",
"IsComfirmToSubmitReport": "是否确认提交报表审核?",
"IsComfirmToWithdrawSubmitReport": "是否确认撤销报表提交?",
"IsComfirmToWithdrawSubmitReport": "是否确认取消报表提交?",
"IsConfirmCancelMap": "系统已到达{status}状态，是否确认取消对应?",
"IsConfirmManualReClassify": "系统已到达{status}状态，是否确认保存手工重分类?",
"IsConfirmReCalcuate": "系统已到达{status}状态，是否确认重新计算?",
......@@ -966,8 +966,8 @@
"IsConfirmToRejectReport": "是否确认拒绝审核?",
"IsConfirmToRejectReportTitle": "是否确定拒绝审核?",
"IsConfirmToSubmitReportTitle": "是否确定提交报表审核?",
"IsConfirmToWithdrawSubmitReportTitle": "是否确定撤销提交报表审核?",
"IsConfirmUndoMap": "系统已到达{status}状态，是否确认撤销对应?",
"IsConfirmToWithdrawSubmitReportTitle": "是否确定取消提交报表审核?",
"IsConfirmUndoMap": "系统已到达{status}状态，是否确认取消对应?",
"IsConfirmVoucherReClassify": "系统已到达{status}状态，是否确认保存凭证重分类?",
"IsDelete": "是否确认要删除？",
"IsIncludedInTaxAmount": "是否计入进项税额",
......@@ -1424,7 +1424,7 @@
"ReportSubmitToApprove": "提交审核",
"ReportUnissuedTaxAmount": "已申报未开票税额",
"ReportUpdateStatus": "已生成",
"ReportWithdrawToApprove": "撤销审核",
"ReportWithdrawToApprove": "取消审核",
"Reports": "查看报表",
"Required": "不能为空",
"RequiredColumnNotSelect": "请选择必选字段: {errorMsg} 再导入数据",
......@@ -1626,10 +1626,10 @@
"Unbalance": "不平",
"UnbilledInvoiceTitle": "未开票销售",
"UnbilledMappingConfigTitle": "未开票智能对应配置",
"Undo": "撤销",
"UndoAccountMap": "撤销科目对应",
"UndoAccountMapToMap": "请先撤销科目对应后再进行对应",
"UndoAccountMappingComplete": "撤销科目对应完成",
"Undo": "取消",
"UndoAccountMap": "取消科目对应",
"UndoAccountMapToMap": "请先取消科目对应后再进行对应",
"UndoAccountMappingComplete": "取消科目对应完成",
"UninvoiceLastMonth": "截止上月末未开票收入",
"UninvoiceTaxableThisMonth": "截止本月末未开票收入",
"UninvoiceThisMonth": "本月未开票收入",
......@@ -1710,7 +1710,7 @@
"WarningTitle": "警告!",
"Warranty14": "14年质保",
"Warranty14Colon": "Warranty14:",
"WithdrawReportStatusCheck": "请先提交报表审核，只有已提交状态时才可以撤销报表审核",
"WithdrawReportStatusCheck": "请先提交报表审核，只有已提交状态时才可以取消报表审核",
"WorkSheet": "工作表：",
"WuHan": "武汉",
"YearDimension": "年份",
......@@ -1958,7 +1958,7 @@
"Currency": "货币",
"Bill": "账单",
"Paid": "已付款",
"Cancel": "撤销",
"Cancel": "取消",
"Prepayments": "预付款",
"ReviewReason": "审核原因",
"Commodity": "商品",
......@@ -2163,6 +2163,7 @@
"RevenueNoOrgData": "没有机构权限",
"RevenueGetOrgError": "获取机构信息失败",
"RevenueAddSuccess": "添加成功",
"Configuration relationship needs to be processed" : "配置关系修改需要重新执行数据处理",
"RevenueDelSuccess": "删除成功",
"RevenueUpdateSuccess": "更新成功",
"dataValidate": "数据校验",
......
atms-web/src/main/webapp/app/common/utils/pwc-util.js
View file @ 948c5553
......@@ -1235,6 +1235,16 @@
if (exp)
_.extend(scope.selectOrgOptions, exp);
};
PWC.objIsEmpty = function (params) {
var flag = true;
for(var key in params){
if(params[key]){
flag = false;
return flag
}
}
return flag;
}
/*-----------------------------------------------------------------------------------------*/
})(window)
\ No newline at end of file
atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.ctrl.js
View file @ 948c5553
......@@ -96,14 +96,17 @@
}
})
};
//添加配置
$scope.saveConfig = function () {
if(PWC.objIsEmpty($scope.formParam)){
SweetAlert.error("表单不能为空")
return;
}
if ($scope.isEdit) {
$http.post('/revenueConfMapping/update',$scope.formParam, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
SweetAlert.success($translate.instant('RevenueAddSuccess'));
SweetAlert.success($translate.instant('Configuration relationship needs to be processed'));
$scope.refreshConfigGrid();
$($scope.revenueConfAddDiv).modal('hide');
$scope.cancelModal();
......@@ -115,7 +118,7 @@
$http.post('/revenueConfMapping/add',$scope.formParam, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
SweetAlert.success($translate.instant('RevenueAddSuccess'));
SweetAlert.success($translate.instant('Configuration relationship needs to be processed'));
$scope.refreshConfigGrid();
$($scope.revenueConfAddDiv).modal('hide');
$scope.cancelModal();
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-conf-mapping/vat-revenue-conf-mapping.html
View file @ 948c5553
......@@ -49,17 +49,17 @@
<div class="form-group">
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevenueColOrg' | translate}}：</label>
<div class="col-sm-4">
<div dx-tag-box="selectOrgOptions"></div>
<div dx-tag-box="selectOrgOptions" required></div>
</div>
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevCMApplyBU' | translate}}：</label>
<div class="col-sm-4">
<input class="form-control" name="name" ng-model="formParam.ouName" maxlength="255">
<input class="form-control" required name="name" ng-model="formParam.ouName" maxlength="255">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevCMInvoiceCTX' | translate}}：</label>
<div class="col-sm-4">
<input class="form-control" name="name" ng-model="formParam.content" maxlength="255">
<input class="form-control" required name="name" ng-model="formParam.content" maxlength="255">
</div>
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevenueColTaxRate' | translate}}:</label>
<div class="col-sm-4">
......@@ -69,21 +69,21 @@
<div class="form-group">
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevDetailType' | translate}}:</label>
<div class="col-sm-4">
<input class="form-control" name="name" ng-model="formParam.revenueTypeName" maxlength="255">
<input class="form-control" required name="name" ng-model="formParam.revenueTypeName" maxlength="255">
</div>
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevenueColStatus' | translate}}:</label>
<div class="col-sm-4">
<div dx-select-box="selectStatusOptions"></div>
<div dx-select-box="selectStatusOptions" required></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevenueColEnable' | translate}}:</label>
<div class="col-sm-4">
<div dx-date-box="dateBoxStart"></div>
<div dx-date-box="dateBoxStart" required></div>
</div>
<label class="col-sm-2 control-label"><span style="color: red">*</span>{{'RevenueColDisable' | translate}}:</label>
<div class="col-sm-4">
<div dx-date-box="dateBoxEnd"></div>
<div dx-date-box="dateBoxEnd" required></div>
</div>
</div>
</form>
......
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