Commit 796e5d5b authored by kevin's avatar kevin

#

parents 783a5125 3e1eb7ba
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.constant.enums.EnumServiceType; import pwc.taxtech.atms.constant.enums.EnumServiceType;
import pwc.taxtech.atms.dpo.ReportDto; import pwc.taxtech.atms.dpo.ReportDto;
import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.CitAssetsListDto;
import pwc.taxtech.atms.dto.CitJournalAdjustDto;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.vatdto.PeriodJobDto; import pwc.taxtech.atms.dto.vatdto.PeriodJobDto;
import pwc.taxtech.atms.service.impl.CitReportServiceImpl; import pwc.taxtech.atms.service.impl.CitReportServiceImpl;
import pwc.taxtech.atms.vat.entity.PeriodJob; import pwc.taxtech.atms.vat.entity.PeriodJob;
import pwc.taxtech.atms.vat.service.impl.ReportServiceImpl; import pwc.taxtech.atms.vat.service.impl.ReportServiceImpl;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
/** /**
* @author zhikai.z.wei * @author zhikai.z.wei
* @description CIT报表生成(数据处理) * @description CIT报表生成(数据处理)
...@@ -22,6 +31,8 @@ import java.util.Optional; ...@@ -22,6 +31,8 @@ import java.util.Optional;
@RestController @RestController
@RequestMapping(value = "api/v1/citReport") @RequestMapping(value = "api/v1/citReport")
public class CitReportController { public class CitReportController {
private static Logger logger = LoggerFactory.getLogger(CitReportController.class);
@Autowired @Autowired
ReportServiceImpl reportService; ReportServiceImpl reportService;
...@@ -37,6 +48,7 @@ public class CitReportController { ...@@ -37,6 +48,7 @@ public class CitReportController {
*/ */
@RequestMapping(value = "citTemplate/{projectId}/{serviceType}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "citTemplate/{projectId}/{serviceType}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<List<ReportDto>> getCitTemplate(@PathVariable String projectId, @PathVariable int serviceType) { public OperationResultDto<List<ReportDto>> getCitTemplate(@PathVariable String projectId, @PathVariable int serviceType) {
logger.info("获取CIT所有要生成的报表模板相关信息,参数");
return citReportService.getReportTemplate(projectId, EnumServiceType.getEnumByCode(serviceType),0); return citReportService.getReportTemplate(projectId, EnumServiceType.getEnumByCode(serviceType),0);
} }
...@@ -54,11 +66,24 @@ public class CitReportController { ...@@ -54,11 +66,24 @@ public class CitReportController {
return ResponseEntity.ok(citReportService.generateCitData(projectId, EnumServiceType.CIT, mergeManual,0,null, generator)); return ResponseEntity.ok(citReportService.generateCitData(projectId, EnumServiceType.CIT, mergeManual,0,null, generator));
} }
/**
* 获取当前卡片所拥有的模板
* @param projectId
* @param serviceType
* @param period
* @return
*/
@RequestMapping(value = "filterTemplate/{projectId}/{serviceType}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "filterTemplate/{projectId}/{serviceType}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<List<ReportDto>> getFilterTemplate(@PathVariable String projectId, @PathVariable int serviceType, @PathVariable Integer period) { public OperationResultDto<List<ReportDto>> getFilterTemplate(@PathVariable String projectId, @PathVariable int serviceType, @PathVariable Integer period) {
return citReportService.getFilterReportTemplate(projectId, EnumServiceType.getEnumByCode(serviceType), period); return citReportService.getFilterReportTemplate(projectId, EnumServiceType.getEnumByCode(serviceType), period);
} }
/**
* 获取当前卡片的线程任务
* @param projectId
* @param period
* @return
*/
@RequestMapping(value = "getPeriodJob/{projectId}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "getPeriodJob/{projectId}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody @ResponseBody
public PeriodJobDto getPeriodJob(@PathVariable String projectId, @PathVariable Integer period) { public PeriodJobDto getPeriodJob(@PathVariable String projectId, @PathVariable Integer period) {
...@@ -70,4 +95,45 @@ public class CitReportController { ...@@ -70,4 +95,45 @@ public class CitReportController {
} }
} }
/**
* 获取固定资产及EAM Mapping的数据
* @param citAssetsListDto
* @return
*/
@RequestMapping(value = "/getAssetEamMappingsPage", method = RequestMethod.POST)
public @ResponseBody
ApiResultDto getAssetEamMappingsPage(@RequestBody CitAssetsListDto citAssetsListDto){
logger.info("获取固定资产及EAM Mapping的数据");
ApiResultDto apiResultDto = new ApiResultDto();
try{
apiResultDto.setCode(1);
apiResultDto.setMessage("获取成功");
apiResultDto.setData(citReportService.getAssetEamMappingPage(citAssetsListDto));
return apiResultDto;
}catch(Exception e){
e.printStackTrace();
apiResultDto.setCode(0);
apiResultDto.setMessage("获取失败");
return apiResultDto;
}
}
/**
* 日记账合并版导出
* @param paras
* @param response
*/
@RequestMapping(value = "exportAEMData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportAEMData(@RequestBody CitAssetsListDto paras, HttpServletResponse response) {
int count = citReportService.exportAEMData2(paras, response);
if (count == 0) {
response.setStatus(SC_NO_CONTENT);
} else {
response.setStatus(SC_OK);
}
}
} }
\ No newline at end of file
...@@ -60,6 +60,17 @@ public class CitAssetsListDto implements Serializable { ...@@ -60,6 +60,17 @@ public class CitAssetsListDto implements Serializable {
*/ */
private String assetNumber; private String assetNumber;
/**
* Database Column Remarks:
* 序列号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.serial_number
*
* @mbg.generated
*/
private String serialNumber;
/** /**
* Database Column Remarks: * Database Column Remarks:
* 资产类别-页面 * 资产类别-页面
...@@ -426,6 +437,50 @@ public class CitAssetsListDto implements Serializable { ...@@ -426,6 +437,50 @@ public class CitAssetsListDto implements Serializable {
private PagingDto pageInfo; private PagingDto pageInfo;
/**
* EAM 资产里面的赔偿/变卖金额
*/
private BigDecimal compensationSaleAmount;
/**
* 处置损益
*/
private BigDecimal disposalProfitAndLoss;
/**
* 资产的税务净值
*/
private BigDecimal taxNetValue;
/**
* 处置的税收损益
*/
private BigDecimal disposalTaxBenefit;
public BigDecimal getDisposalProfitAndLoss() {
return disposalProfitAndLoss;
}
public void setDisposalProfitAndLoss(BigDecimal disposalProfitAndLoss) {
this.disposalProfitAndLoss = disposalProfitAndLoss;
}
public BigDecimal getTaxNetValue() {
return taxNetValue;
}
public void setTaxNetValue(BigDecimal taxNetValue) {
this.taxNetValue = taxNetValue;
}
public BigDecimal getDisposalTaxBenefit() {
return disposalTaxBenefit;
}
public void setDisposalTaxBenefit(BigDecimal disposalTaxBenefit) {
this.disposalTaxBenefit = disposalTaxBenefit;
}
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table assets_list * This field corresponds to the database table assets_list
...@@ -530,6 +585,14 @@ public class CitAssetsListDto implements Serializable { ...@@ -530,6 +585,14 @@ public class CitAssetsListDto implements Serializable {
this.assetNumber = assetNumber == null ? null : assetNumber.trim(); this.assetNumber = assetNumber == null ? null : assetNumber.trim();
} }
public String getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.asset_group_name * This method returns the value of the database column assets_list.asset_group_name
...@@ -1322,56 +1385,13 @@ public class CitAssetsListDto implements Serializable { ...@@ -1322,56 +1385,13 @@ public class CitAssetsListDto implements Serializable {
this.pageInfo = pageInfo; this.pageInfo = pageInfo;
} }
/** public BigDecimal getCompensationSaleAmount() {
* This method was generated by MyBatis Generator. return compensationSaleAmount;
* This method corresponds to the database table assets_list }
*
* @mbg.generated public void setCompensationSaleAmount(BigDecimal compensationSaleAmount) {
*/ this.compensationSaleAmount = compensationSaleAmount;
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", projectId=").append(projectId);
sb.append(", period=").append(period);
sb.append(", assetNumber=").append(assetNumber);
sb.append(", assetGroupName=").append(assetGroupName);
sb.append(", assetDetailGroupId=").append(assetDetailGroupId);
sb.append(", assetDescription=").append(assetDescription);
sb.append(", buyDate=").append(buyDate);
sb.append(", depreciationDate=").append(depreciationDate);
sb.append(", depreciationPeriod=").append(depreciationPeriod);
sb.append(", acquisitionValue=").append(acquisitionValue);
sb.append(", adjustmentValue=").append(adjustmentValue);
sb.append(", disposedDate=").append(disposedDate);
sb.append(", residualRate=").append(residualRate);
sb.append(", yearDepreciationAmount=").append(yearDepreciationAmount);
sb.append(", yearAdjustmentAmount=").append(yearAdjustmentAmount);
sb.append(", yearEndValue=").append(yearEndValue);
sb.append(", status=").append(status);
sb.append(", accountAcquisitionValue=").append(accountAcquisitionValue);
sb.append(", accountMonthDepreciationAmount=").append(accountMonthDepreciationAmount);
sb.append(", accountYearDepreciationAmount=").append(accountYearDepreciationAmount);
sb.append(", accountTotalDepreciationAmount=").append(accountTotalDepreciationAmount);
sb.append(", taxDepreciationPeriod=").append(taxDepreciationPeriod);
sb.append(", taxToLastYearDepreciationPeriod=").append(taxToLastYearDepreciationPeriod);
sb.append(", taxToCurrentYearDepreciationPeriod=").append(taxToCurrentYearDepreciationPeriod);
sb.append(", taxYearDepreciationPeriod=").append(taxYearDepreciationPeriod);
sb.append(", taxMonthDepreciationAmount=").append(taxMonthDepreciationAmount);
sb.append(", taxToCurrentYearDepreciationAmount=").append(taxToCurrentYearDepreciationAmount);
sb.append(", taxCurrentYearDepreciationAmount=").append(taxCurrentYearDepreciationAmount);
sb.append(", totalDifferenceAmount=").append(totalDifferenceAmount);
sb.append(", yearDifferenceAmount=").append(yearDifferenceAmount);
sb.append(", isRetain=").append(isRetain);
sb.append(", assetType=").append(assetType);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", taxAccountCompare=").append(taxAccountCompare);
sb.append(", taxGroupName=").append(taxGroupName);
sb.append("]");
return sb.toString();
} }
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class BalanceSheetPrcQueryDto { public class BalanceSheetPrcQueryDto {
...@@ -16,8 +13,7 @@ public class BalanceSheetPrcQueryDto { ...@@ -16,8 +13,7 @@ public class BalanceSheetPrcQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -173,12 +169,12 @@ public class BalanceSheetPrcQueryDto { ...@@ -173,12 +169,12 @@ public class BalanceSheetPrcQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId; return date;
} }
public void setTaskId(String taskId) { public void setDate(String date) {
this.taskId = taskId; this.date = date;
} }
public String getSource() { public String getSource() {
...@@ -189,14 +185,6 @@ public class BalanceSheetPrcQueryDto { ...@@ -189,14 +185,6 @@ public class BalanceSheetPrcQueryDto {
this.source = source; this.source = source;
} }
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() { public String getPeriod() {
return period; return period;
} }
...@@ -292,4 +280,33 @@ public class BalanceSheetPrcQueryDto { ...@@ -292,4 +280,33 @@ public class BalanceSheetPrcQueryDto {
public void setBegBal(BigDecimal begBal) { public void setBegBal(BigDecimal begBal) {
this.begBal = begBal; this.begBal = begBal;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "BalanceSheetPrcQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", endBal=" + endBal +
", begBal=" + begBal +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class BalanceSheetQueryDto { public class BalanceSheetQueryDto {
/** /**
...@@ -15,8 +12,7 @@ public class BalanceSheetQueryDto { ...@@ -15,8 +12,7 @@ public class BalanceSheetQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -172,12 +168,12 @@ public class BalanceSheetQueryDto { ...@@ -172,12 +168,12 @@ public class BalanceSheetQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId; return date;
} }
public void setTaskId(String taskId) { public void setDate(String date) {
this.taskId = taskId; this.date = date;
} }
public String getSource() { public String getSource() {
...@@ -188,14 +184,6 @@ public class BalanceSheetQueryDto { ...@@ -188,14 +184,6 @@ public class BalanceSheetQueryDto {
this.source = source; this.source = source;
} }
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() { public String getPeriod() {
return period; return period;
} }
...@@ -291,4 +279,33 @@ public class BalanceSheetQueryDto { ...@@ -291,4 +279,33 @@ public class BalanceSheetQueryDto {
public void setBegBal(BigDecimal begBal) { public void setBegBal(BigDecimal begBal) {
this.begBal = begBal; this.begBal = begBal;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "BalanceSheetQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", endBal=" + endBal +
", begBal=" + begBal +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class CashFlowQueryDto { public class CashFlowQueryDto {
/** /**
...@@ -15,8 +12,7 @@ public class CashFlowQueryDto { ...@@ -15,8 +12,7 @@ public class CashFlowQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -184,19 +180,11 @@ public class CashFlowQueryDto { ...@@ -184,19 +180,11 @@ public class CashFlowQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(String date) {
this.date = date; this.date = date;
} }
...@@ -311,4 +299,34 @@ public class CashFlowQueryDto { ...@@ -311,4 +299,34 @@ public class CashFlowQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) { public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt; this.ytdAmt = ytdAmt;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "CashFlowQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", itemName2='" + itemName2 + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
} }
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class JournalEntryQueryDto { public class JournalEntryQueryDto {
...@@ -16,8 +13,7 @@ public class JournalEntryQueryDto { ...@@ -16,8 +13,7 @@ public class JournalEntryQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -138,8 +134,7 @@ public class JournalEntryQueryDto { ...@@ -138,8 +134,7 @@ public class JournalEntryQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String accountingDate;
private Date accountingDate;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -513,8 +508,7 @@ public class JournalEntryQueryDto { ...@@ -513,8 +508,7 @@ public class JournalEntryQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String attribute2;
private Date attribute2;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -690,8 +684,7 @@ public class JournalEntryQueryDto { ...@@ -690,8 +684,7 @@ public class JournalEntryQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String createdDate;
private Date createdDate;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -713,8 +706,7 @@ public class JournalEntryQueryDto { ...@@ -713,8 +706,7 @@ public class JournalEntryQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String lateUpdatedDate;
private Date lateUpdatedDate;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -727,19 +719,11 @@ public class JournalEntryQueryDto { ...@@ -727,19 +719,11 @@ public class JournalEntryQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(String date) {
this.date = date; this.date = date;
} }
...@@ -823,11 +807,11 @@ public class JournalEntryQueryDto { ...@@ -823,11 +807,11 @@ public class JournalEntryQueryDto {
this.period = period; this.period = period;
} }
public Date getAccountingDate() { public String getAccountingDate() {
return accountingDate; return accountingDate;
} }
public void setAccountingDate(Date accountingDate) { public void setAccountingDate(String accountingDate) {
this.accountingDate = accountingDate; this.accountingDate = accountingDate;
} }
...@@ -1095,11 +1079,11 @@ public class JournalEntryQueryDto { ...@@ -1095,11 +1079,11 @@ public class JournalEntryQueryDto {
this.attribute1 = attribute1; this.attribute1 = attribute1;
} }
public Date getAttribute2() { public String getAttribute2() {
return attribute2; return attribute2;
} }
public void setAttribute2(Date attribute2) { public void setAttribute2(String attribute2) {
this.attribute2 = attribute2; this.attribute2 = attribute2;
} }
...@@ -1223,11 +1207,11 @@ public class JournalEntryQueryDto { ...@@ -1223,11 +1207,11 @@ public class JournalEntryQueryDto {
this.createdBy = createdBy; this.createdBy = createdBy;
} }
public Date getCreatedDate() { public String getCreatedDate() {
return createdDate; return createdDate;
} }
public void setCreatedDate(Date createdDate) { public void setCreatedDate(String createdDate) {
this.createdDate = createdDate; this.createdDate = createdDate;
} }
...@@ -1239,11 +1223,90 @@ public class JournalEntryQueryDto { ...@@ -1239,11 +1223,90 @@ public class JournalEntryQueryDto {
this.lateUpdatedBy = lateUpdatedBy; this.lateUpdatedBy = lateUpdatedBy;
} }
public Date getLateUpdatedDate() { public String getLateUpdatedDate() {
return lateUpdatedDate; return lateUpdatedDate;
} }
public void setLateUpdatedDate(Date lateUpdatedDate) { public void setLateUpdatedDate(String lateUpdatedDate) {
this.lateUpdatedDate = lateUpdatedDate; this.lateUpdatedDate = lateUpdatedDate;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "JournalEntryQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", currencyCode='" + currencyCode + '\'' +
", status='" + status + '\'' +
", headerId='" + headerId + '\'' +
", lineNum='" + lineNum + '\'' +
", approvalStatus='" + approvalStatus + '\'' +
", postedStatus='" + postedStatus + '\'' +
", period='" + period + '\'' +
", accountingDate='" + accountingDate + '\'' +
", journalSource='" + journalSource + '\'' +
", category='" + category + '\'' +
", name='" + name + '\'' +
", voucherNum='" + voucherNum + '\'' +
", description='" + description + '\'' +
", segment1='" + segment1 + '\'' +
", segment2='" + segment2 + '\'' +
", segment3='" + segment3 + '\'' +
", segment4='" + segment4 + '\'' +
", segment5='" + segment5 + '\'' +
", segment6='" + segment6 + '\'' +
", segment7='" + segment7 + '\'' +
", segment8='" + segment8 + '\'' +
", segment9='" + segment9 + '\'' +
", segment10='" + segment10 + '\'' +
", segment1Name='" + segment1Name + '\'' +
", segment2Name='" + segment2Name + '\'' +
", segment3Name='" + segment3Name + '\'' +
", segment4Name='" + segment4Name + '\'' +
", segment5Name='" + segment5Name + '\'' +
", segment6Name='" + segment6Name + '\'' +
", segment7Name='" + segment7Name + '\'' +
", segment8Name='" + segment8Name + '\'' +
", segment9Name='" + segment9Name + '\'' +
", segment10Name='" + segment10Name + '\'' +
", journalCurrencyCode='" + journalCurrencyCode + '\'' +
", sobCurrencyCode='" + sobCurrencyCode + '\'' +
", accountedDr=" + accountedDr +
", accountedCr=" + accountedCr +
", enteredDr=" + enteredDr +
", enteredCr=" + enteredCr +
", cfItem='" + cfItem + '\'' +
", attribute1='" + attribute1 + '\'' +
", attribute2='" + attribute2 + '\'' +
", attribute3='" + attribute3 + '\'' +
", attribute4='" + attribute4 + '\'' +
", attribute5='" + attribute5 + '\'' +
", attribute6='" + attribute6 + '\'' +
", attribute7='" + attribute7 + '\'' +
", attribute8='" + attribute8 + '\'' +
", attribute9='" + attribute9 + '\'' +
", attribute10='" + attribute10 + '\'' +
", attribute11='" + attribute11 + '\'' +
", attribute12='" + attribute12 + '\'' +
", attribute13='" + attribute13 + '\'' +
", attribute14='" + attribute14 + '\'' +
", attribute15='" + attribute15 + '\'' +
", attribute16='" + attribute16 + '\'' +
", createdBy='" + createdBy + '\'' +
", createdDate='" + createdDate + '\'' +
", lateUpdatedBy='" + lateUpdatedBy + '\'' +
", lateUpdatedDate='" + lateUpdatedDate + '\'' +
", taskId='" + taskId + '\'' +
'}';
}
} }
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class OrganizationAccountingRateQueryDto { public class OrganizationAccountingRateQueryDto {
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
* 期间 * 期间yyyy-MM-dd
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column organization_accounting_rate.period * This field corresponds to the database column organization_accounting_rate.period
...@@ -78,19 +74,11 @@ public class OrganizationAccountingRateQueryDto { ...@@ -78,19 +74,11 @@ public class OrganizationAccountingRateQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(String date) {
this.date = date; this.date = date;
} }
...@@ -149,4 +137,27 @@ public class OrganizationAccountingRateQueryDto { ...@@ -149,4 +137,27 @@ public class OrganizationAccountingRateQueryDto {
public void setInvalidDate(String invalidDate) { public void setInvalidDate(String invalidDate) {
this.invalidDate = invalidDate; this.invalidDate = invalidDate;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "OrganizationAccountingRateQueryDto{" +
"date='" + date + '\'' +
", period='" + period + '\'' +
", source='" + source + '\'' +
", convertionType='" + convertionType + '\'' +
", currencyFrom='" + currencyFrom + '\'' +
", currencyTo='" + currencyTo + '\'' +
", rate=" + rate +
", invalidDate='" + invalidDate + '\'' +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class ProfitLossStatementPrcQueryDto { public class ProfitLossStatementPrcQueryDto {
/** /**
...@@ -15,8 +12,7 @@ public class ProfitLossStatementPrcQueryDto { ...@@ -15,8 +12,7 @@ public class ProfitLossStatementPrcQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -172,12 +168,12 @@ public class ProfitLossStatementPrcQueryDto { ...@@ -172,12 +168,12 @@ public class ProfitLossStatementPrcQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId; return date;
} }
public void setTaskId(String taskId) { public void setDate(String date) {
this.taskId = taskId; this.date = date;
} }
public String getSource() { public String getSource() {
...@@ -188,14 +184,6 @@ public class ProfitLossStatementPrcQueryDto { ...@@ -188,14 +184,6 @@ public class ProfitLossStatementPrcQueryDto {
this.source = source; this.source = source;
} }
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() { public String getPeriod() {
return period; return period;
} }
...@@ -291,4 +279,33 @@ public class ProfitLossStatementPrcQueryDto { ...@@ -291,4 +279,33 @@ public class ProfitLossStatementPrcQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) { public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt; this.ytdAmt = ytdAmt;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "ProfitLossStatementPrcQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class ProfitLossStatementQueryDto { public class ProfitLossStatementQueryDto {
/** /**
...@@ -15,8 +12,7 @@ public class ProfitLossStatementQueryDto { ...@@ -15,8 +12,7 @@ public class ProfitLossStatementQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -172,12 +168,12 @@ public class ProfitLossStatementQueryDto { ...@@ -172,12 +168,12 @@ public class ProfitLossStatementQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId; return date;
} }
public void setTaskId(String taskId) { public void setDate(String date) {
this.taskId = taskId; this.date = date;
} }
public String getSource() { public String getSource() {
...@@ -188,14 +184,6 @@ public class ProfitLossStatementQueryDto { ...@@ -188,14 +184,6 @@ public class ProfitLossStatementQueryDto {
this.source = source; this.source = source;
} }
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getPeriod() { public String getPeriod() {
return period; return period;
} }
...@@ -291,4 +279,33 @@ public class ProfitLossStatementQueryDto { ...@@ -291,4 +279,33 @@ public class ProfitLossStatementQueryDto {
public void setYtdAmt(BigDecimal ytdAmt) { public void setYtdAmt(BigDecimal ytdAmt) {
this.ytdAmt = ytdAmt; this.ytdAmt = ytdAmt;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "ProfitLossStatementQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", status='" + status + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", ledgerCurrencyCode='" + ledgerCurrencyCode + '\'' +
", entityCode='" + entityCode + '\'' +
", entityName='" + entityName + '\'' +
", category='" + category + '\'' +
", frequency='" + frequency + '\'' +
", itemName='" + itemName + '\'' +
", periodAmt=" + periodAmt +
", ytdAmt=" + ytdAmt +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
package pwc.taxtech.atms.dto.ebsdto; package pwc.taxtech.atms.dto.ebsdto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
public class TrialBalanceQueryDto { public class TrialBalanceQueryDto {
/** /**
...@@ -15,8 +12,7 @@ public class TrialBalanceQueryDto { ...@@ -15,8 +12,7 @@ public class TrialBalanceQueryDto {
* *
* @mbg.generated * @mbg.generated
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8") private String date;
private Date date;
/** /**
* Database Column Remarks: * Database Column Remarks:
...@@ -557,19 +553,11 @@ public class TrialBalanceQueryDto { ...@@ -557,19 +553,11 @@ public class TrialBalanceQueryDto {
*/ */
private String taskId; private String taskId;
public String getTaskId() { public String getDate() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public Date getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(String date) {
this.date = date; this.date = date;
} }
...@@ -956,4 +944,68 @@ public class TrialBalanceQueryDto { ...@@ -956,4 +944,68 @@ public class TrialBalanceQueryDto {
public void setYtdCrBeq(BigDecimal ytdCrBeq) { public void setYtdCrBeq(BigDecimal ytdCrBeq) {
this.ytdCrBeq = ytdCrBeq; this.ytdCrBeq = ytdCrBeq;
} }
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "TrialBalanceQueryDto{" +
"date='" + date + '\'' +
", source='" + source + '\'' +
", period='" + period + '\'' +
", ledgerId='" + ledgerId + '\'' +
", ledgerName='" + ledgerName + '\'' +
", currencyCode='" + currencyCode + '\'' +
", status='" + status + '\'' +
", category='" + category + '\'' +
", accountCategory='" + accountCategory + '\'' +
", acctCode1='" + acctCode1 + '\'' +
", acctName1='" + acctName1 + '\'' +
", acctName2='" + acctName2 + '\'' +
", acctName3='" + acctName3 + '\'' +
", segment1='" + segment1 + '\'' +
", segment2='" + segment2 + '\'' +
", segment3='" + segment3 + '\'' +
", segment4='" + segment4 + '\'' +
", segment5='" + segment5 + '\'' +
", segment6='" + segment6 + '\'' +
", segment7='" + segment7 + '\'' +
", segment8='" + segment8 + '\'' +
", segment9='" + segment9 + '\'' +
", segment10='" + segment10 + '\'' +
", segment1Name='" + segment1Name + '\'' +
", segment2Name='" + segment2Name + '\'' +
", segment3Name='" + segment3Name + '\'' +
", segment4Name='" + segment4Name + '\'' +
", segment5Name='" + segment5Name + '\'' +
", segment6Name='" + segment6Name + '\'' +
", segment7Name='" + segment7Name + '\'' +
", segment8Name='" + segment8Name + '\'' +
", segment9Name='" + segment9Name + '\'' +
", segment10Name='" + segment10Name + '\'' +
", begBal=" + begBal +
", periodDr=" + periodDr +
", periodCr=" + periodCr +
", endBal=" + endBal +
", qtdDr=" + qtdDr +
", qtdCr=" + qtdCr +
", ytdDr=" + ytdDr +
", ytdCr=" + ytdCr +
", begBalBeq=" + begBalBeq +
", periodDrBeq=" + periodDrBeq +
", periodCrBeq=" + periodCrBeq +
", endBalBeq=" + endBalBeq +
", qtdDrBeq=" + qtdDrBeq +
", qtdCrBeq=" + qtdCrBeq +
", ytdDrBeq=" + ytdDrBeq +
", ytdCrBeq=" + ytdCrBeq +
", taskId='" + taskId + '\'' +
'}';
}
} }
\ No newline at end of file
...@@ -180,6 +180,7 @@ public class AssetListServiceImpl extends BaseService { ...@@ -180,6 +180,7 @@ public class AssetListServiceImpl extends BaseService {
//定义返回变量 //定义返回变量
OperationResultDto<Object> importResult = new OperationResultDto<>(); OperationResultDto<Object> importResult = new OperationResultDto<>();
importResult.setResult(true); importResult.setResult(true);
StringBuilder errorMsgSb = new StringBuilder("第");
//通过输入流获取当前workbook //通过输入流获取当前workbook
Workbook workbook = fileService.getWorkbook(inputStream, fileName, "citAsset"); Workbook workbook = fileService.getWorkbook(inputStream, fileName, "citAsset");
...@@ -202,7 +203,7 @@ public class AssetListServiceImpl extends BaseService { ...@@ -202,7 +203,7 @@ public class AssetListServiceImpl extends BaseService {
Integer period = CitCommonUtil.getPeriod(); Integer period = CitCommonUtil.getPeriod();
List<CitAssetsList> citAssetsLists = new ArrayList<>(); List<CitAssetsList> citAssetsLists = new ArrayList<>();
StringBuilder errorMsgSb = new StringBuilder("第");
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理 //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) { for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
CitAssetsList citAsset = new CitAssetsList(); CitAssetsList citAsset = new CitAssetsList();
...@@ -217,8 +218,8 @@ public class AssetListServiceImpl extends BaseService { ...@@ -217,8 +218,8 @@ public class AssetListServiceImpl extends BaseService {
//因模板固定,则按照写死的做法处理数据单元格数据 //因模板固定,则按照写死的做法处理数据单元格数据
citAsset = cellToCitAsset(rowData, citAsset, assetNameSet, citAssetGroupResults); citAsset = cellToCitAsset(rowData, citAsset, assetNameSet, citAssetGroupResults);
if(citAsset == null){ if(citAsset == null){
importResult.setResult(false);
errorMsgSb.append(rowNum+","); errorMsgSb.append(rowNum+",");
continue;
} }
if(!importResult.getResult()){ if(!importResult.getResult()){
importResult.setResultMsg("行数据为空或格式错误!"); importResult.setResultMsg("行数据为空或格式错误!");
...@@ -263,41 +264,49 @@ public class AssetListServiceImpl extends BaseService { ...@@ -263,41 +264,49 @@ public class AssetListServiceImpl extends BaseService {
//获取单元格数据,并set进入实体 //获取单元格数据,并set进入实体
//获取资产编号 //获取资产编号
Cell cell = rowData.getCell(1); Object value = CitCommonUtil.getValue(rowData.getCell(1));
Object value = CitCommonUtil.getValue(cell);
if (value == null) { if (value == null) {
return null; return null;
} }
citAsset.setAssetNumber(value.toString()); citAsset.setAssetNumber(value.toString());
citAsset.setSerialNumber(String.valueOf(CitCommonUtil.getValue(rowData.getCell(2))));
//获取资产描述 //获取资产描述
citAsset.setAssetDescription(CitCommonUtil.getValue(rowData.getCell(5)).toString()); citAsset.setAssetDescription(String.valueOf(CitCommonUtil.getValue(rowData.getCell(5))));
//获取资产类别 //获取资产类别
String assetName = CitCommonUtil.getValue(rowData.getCell(7)).toString(); value = CitCommonUtil.getValue(rowData.getCell(7));
if (value == null) {
return null;
}
String assetName = value.toString();
citAsset.setAssetGroupName(assetName); citAsset.setAssetGroupName(assetName);
//获取购入日期 //获取购入日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
citAsset.setBuyDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString())); value = CitCommonUtil.getValue(rowData.getCell(15));
citAsset.setBuyDate(value==null?null:sdf.parse(value.toString()));
//获取开始折旧日期,DD没有提供,我们要根据购入日期和税法分类做预处理自己转化 //获取开始折旧日期,DD没有提供,我们要根据购入日期和税法分类做预处理自己转化
// citAsset.setDepreciationDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString())); // citAsset.setDepreciationDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString()));
//获取折旧期限,接下来计算需要用到,所以赋给一个对象 //获取折旧期限,接下来计算需要用到,所以赋给一个对象
Integer depreciationPeriod = Integer.valueOf(CitCommonUtil.getValue(rowData.getCell(30)).toString()); value = CitCommonUtil.getValue(rowData.getCell(30));
Integer depreciationPeriod = Integer.valueOf(value==null?"0":value.toString());
citAsset.setDepreciationPeriod(depreciationPeriod); citAsset.setDepreciationPeriod(depreciationPeriod);
//获取原值,接下来计算需要用到,所以赋给一个对象 //获取原值,接下来计算需要用到,所以赋给一个对象
BigDecimal acquisitionValue = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(16)).toString()); value = CitCommonUtil.getValue(rowData.getCell(16));
if (value == null) {
return null;
}
BigDecimal acquisitionValue = new BigDecimal(value.toString());
citAsset.setAcquisitionValue(acquisitionValue); citAsset.setAcquisitionValue(acquisitionValue);
//获取原值调整值0----列数待定,滴滴无调整值 //获取原值调整值0----列数待定,滴滴无调整值
// citAsset.setAdjustmentValue(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(32)).toString())); // citAsset.setAdjustmentValue(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(32)).toString()));
//获取报废日期 //获取报废日期
Cell cell1 = rowData.getCell(37); value = CitCommonUtil.getValue(rowData.getCell(37));
if (rowData.getCell(37) != null && CitCommonUtil.getValue(rowData.getCell(37)) != null) { citAsset.setDisposedDate(value==null?null:sdf.parse(value.toString()));
citAsset.setDisposedDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(37)).toString())); citAsset.setScrapType(String.valueOf(CitCommonUtil.getValue(rowData.getCell(38))));
}
//获取残值额,原为残值率现为残值额,接下来计算需要用到,所以赋给一个对象 //获取残值额,原为残值率现为残值额,接下来计算需要用到,所以赋给一个对象
BigDecimal residualRate = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(20)).toString()); BigDecimal residualRate = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(20)).toString());
citAsset.setResidualRate(residualRate); citAsset.setResidualRate(residualRate);
...@@ -316,7 +325,7 @@ public class AssetListServiceImpl extends BaseService { ...@@ -316,7 +325,7 @@ public class AssetListServiceImpl extends BaseService {
//获取财务累计折旧额,接下来计算需要用到,所以赋给一个对象 //获取财务累计折旧额,接下来计算需要用到,所以赋给一个对象
BigDecimal accountTotalDepreciationAmount = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString()); BigDecimal accountTotalDepreciationAmount = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString());
citAsset.setAccountTotalDepreciationAmount(accountTotalDepreciationAmount); citAsset.setAccountTotalDepreciationAmount(accountTotalDepreciationAmount);
//年终剩余价值, //年终剩余价值,原值-累计折旧
citAsset.setYearEndValue(acquisitionValue.subtract(accountTotalDepreciationAmount)); citAsset.setYearEndValue(acquisitionValue.subtract(accountTotalDepreciationAmount));
//过滤查询出的资产类别,若已对该资产类别进行过分类直接进行税务数据的计算 //过滤查询出的资产类别,若已对该资产类别进行过分类直接进行税务数据的计算
List<CitAssetGroupResult> groupResults = citAssetGroupResults.stream() List<CitAssetGroupResult> groupResults = citAssetGroupResults.stream()
......
...@@ -77,7 +77,7 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -77,7 +77,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
} }
/** /**
* 日记账导出(第一种方式) * 日记账导出(第一种方式)--暂时不使用
* @param citJournalAdjustDto * @param citJournalAdjustDto
* @param os * @param os
* @return * @return
...@@ -103,7 +103,7 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -103,7 +103,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
} }
/** /**
* 日记账导出(第二种方式) * 日记账导出(第二种方式)--正在使用
* @param citJournalAdjustDto * @param citJournalAdjustDto
* @param response * @param response
* @return * @return
......
...@@ -870,14 +870,14 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -870,14 +870,14 @@ public class CitImportExcelServiceImpl extends BaseService {
CitEAMAssetsDisposal citEAMAssetsDisposal = new CitEAMAssetsDisposal(); CitEAMAssetsDisposal citEAMAssetsDisposal = new CitEAMAssetsDisposal();
citEAMAssetsDisposal.setId(idService.nextId()); citEAMAssetsDisposal.setId(idService.nextId());
citEAMAssetsDisposal.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString())); citEAMAssetsDisposal.setPeriod(period);
citEAMAssetsDisposal.setCreatedBy(currentUserName); citEAMAssetsDisposal.setCreatedBy(currentUserName);
String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().split("-"); String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().split("-");
StringBuilder sb = new StringBuilder(split[0]); StringBuilder sb = new StringBuilder(split[0]);
if(new Integer(split[1]) + 1 < 10){ // if(new Integer(split[1]) + 1 < 10){
sb.append(0); // sb.append(0);
} // }
sb.append(split[1]); sb.append(split[1]);
citEAMAssetsDisposal.setOccurPeriod(new Integer(sb.toString())); citEAMAssetsDisposal.setOccurPeriod(new Integer(sb.toString()));
citEAMAssetsDisposal.setAssetLabelNumber(CitCommonUtil.getValue(rowData.getCell(6)).toString()); citEAMAssetsDisposal.setAssetLabelNumber(CitCommonUtil.getValue(rowData.getCell(6)).toString());
......
...@@ -3,6 +3,7 @@ package pwc.taxtech.atms.service.impl; ...@@ -3,6 +3,7 @@ package pwc.taxtech.atms.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -12,21 +13,23 @@ import org.apache.poi.ss.usermodel.FormulaEvaluator; ...@@ -12,21 +13,23 @@ import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.CommonUtils; import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.util.DataUtil; import pwc.taxtech.atms.common.util.DataUtil;
import pwc.taxtech.atms.common.util.FileUploadUtil; import pwc.taxtech.atms.common.util.FileUploadUtil;
import pwc.taxtech.atms.common.util.JxlsUtils;
import pwc.taxtech.atms.common.util.MyAsserts; import pwc.taxtech.atms.common.util.MyAsserts;
import pwc.taxtech.atms.common.util.SpringContextUtil; import pwc.taxtech.atms.common.util.SpringContextUtil;
import pwc.taxtech.atms.constant.Constant; import pwc.taxtech.atms.constant.Constant;
import pwc.taxtech.atms.constant.enums.*; import pwc.taxtech.atms.constant.enums.*;
import pwc.taxtech.atms.dao.*; import pwc.taxtech.atms.dao.*;
import pwc.taxtech.atms.dpo.CitAssetEamMappingDto;
import pwc.taxtech.atms.dpo.ReportDto; import pwc.taxtech.atms.dpo.ReportDto;
import pwc.taxtech.atms.dto.FileDto; import pwc.taxtech.atms.dto.*;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.export.ExportDto;
import pwc.taxtech.atms.dto.ReportAttachDto;
import pwc.taxtech.atms.dto.vatdto.*; import pwc.taxtech.atms.dto.vatdto.*;
import pwc.taxtech.atms.entity.*; import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.exception.Exceptions; import pwc.taxtech.atms.exception.Exceptions;
...@@ -39,6 +42,7 @@ import pwc.taxtech.atms.vat.entity.*; ...@@ -39,6 +42,7 @@ import pwc.taxtech.atms.vat.entity.*;
import pwc.taxtech.atms.vat.service.impl.ReportGeneratorImpl; import pwc.taxtech.atms.vat.service.impl.ReportGeneratorImpl;
import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper; import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper;
import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
...@@ -111,6 +115,8 @@ public class CitReportServiceImpl extends BaseService { ...@@ -111,6 +115,8 @@ public class CitReportServiceImpl extends BaseService {
private DataValidateLogMapper dataValidateLogMapper; private DataValidateLogMapper dataValidateLogMapper;
@Autowired @Autowired
private DataUtil dataUtil; private DataUtil dataUtil;
@Autowired
private CitAssetsListMapper assetsListMapper;
public OperationResultDto<List<ReportDto>> getReportTemplate(String projectId, EnumServiceType serviceType, Integer period) { public OperationResultDto<List<ReportDto>> getReportTemplate(String projectId, EnumServiceType serviceType, Integer period) {
OperationResultDto<List<ReportDto>> operationResult = new OperationResultDto<>(); OperationResultDto<List<ReportDto>> operationResult = new OperationResultDto<>();
...@@ -700,4 +706,75 @@ public class CitReportServiceImpl extends BaseService { ...@@ -700,4 +706,75 @@ public class CitReportServiceImpl extends BaseService {
result.setData(reportDtos); result.setData(reportDtos);
return result; return result;
} }
/**
* 获取固定资产及EAM Mapping的数据
*/
public PageInfo<CitAssetsListDto> getAssetEamMappingPage(CitAssetsListDto citAssetsListDto) throws Exception {
logger.debug("获取固定资产及EAM Mapping的数据");
Page page = PageHelper.startPage(citAssetsListDto.getPageInfo().getPageIndex(),citAssetsListDto.getPageInfo().getPageSize());
CitAssetsList citAssetsList = new CitAssetsList();
BeanUtils.copyProperties(citAssetsListDto,citAssetsList);
List<CitAssetEamMappingDto> citAssetsLists = assetsListMapper.getAssetEamMapping(citAssetsList);
List<CitAssetsListDto> citAssetsListDtos = new ArrayList<>();
citAssetsListDtos = assetToAssetEamMapping(citAssetsListDtos,citAssetsLists);
// for (CitAssetsList citAssetsListTemp:citAssetsLists){
// CitAssetsListDto temp = new CitAssetsListDto();
// BeanUtils.copyProperties(citAssetsListTemp,temp);
//
// //计算处置损益 处置/赔偿收入-账面净值(年终剩余价值)
// temp.setDisposalProfitAndLoss(temp.getCompensationSaleAmount().subtract(temp.getYearEndValue()));
// //计算资产的税务净值 taxNetValue 原值-累计税务折旧/摊销
// temp.setTaxNetValue(temp.getAcquisitionValue().subtract(temp.getTaxToCurrentYearDepreciationAmount()));
// //处置的税收损益 处置/赔偿收入-资产的税务净值
// temp.setDisposalTaxBenefit(temp.getCompensationSaleAmount().subtract(temp.getTaxNetValue()));
// citAssetsListDtos.add(temp);
// }
PageInfo<CitAssetsListDto> pageInfo =new PageInfo<>(citAssetsListDtos);
pageInfo.setTotal(page.getTotal());
pageInfo.setPageNum(citAssetsListDto.getPageInfo().getPageIndex());
return pageInfo;
}
/**
* 固资申报表导出(第二种方式)--正在使用
* @param citAssetsListDto
* @param response
* @return
*/
public int exportAEMData2(CitAssetsListDto citAssetsListDto, HttpServletResponse response){
CitAssetsList citAssetsList = new CitAssetsList();
BeanUtils.copyProperties(citAssetsListDto,citAssetsList);
List<CitAssetEamMappingDto> citAssetsLists = assetsListMapper.getAssetEamMapping(citAssetsList);
if(citAssetsLists.size()==0){
return 0;
}
List<CitAssetsListDto> citAssetsListDtos = new ArrayList<>();
assetToAssetEamMapping(citAssetsListDtos,citAssetsLists);
ExportDto exportDto = new ExportDto();
exportDto.setFileName("固资申报表");
exportDto.setTemplateUrl(Constant.citTemplateUrl + "/assetEamMapping.xlsx");
exportDto.setResponse(response);
exportDto.setList(citAssetsListDtos);
exportDto.setRelation(null);
JxlsUtils.export(exportDto);
return 1;
}
public List<CitAssetsListDto> assetToAssetEamMapping(List<CitAssetsListDto> citAssetsListDtos, List<CitAssetEamMappingDto> citAssetsLists){
for (CitAssetsList citAssetsListTemp:citAssetsLists){
CitAssetsListDto temp = new CitAssetsListDto();
BeanUtils.copyProperties(citAssetsListTemp,temp);
//计算处置损益 处置/赔偿收入-账面净值(年终剩余价值)
temp.setDisposalProfitAndLoss(temp.getCompensationSaleAmount().subtract(temp.getYearEndValue()));
//计算资产的税务净值 taxNetValue 原值-累计税务折旧/摊销
temp.setTaxNetValue(temp.getAcquisitionValue().subtract(temp.getTaxToCurrentYearDepreciationAmount()));
//处置的税收损益 处置/赔偿收入-资产的税务净值
temp.setDisposalTaxBenefit(temp.getCompensationSaleAmount().subtract(temp.getTaxNetValue()));
citAssetsListDtos.add(temp);
}
return citAssetsListDtos;
}
} }
...@@ -400,7 +400,6 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -400,7 +400,6 @@ public class TemplateGroupServiceImpl extends AbstractService {
List<PeriodDataSource> periodDataSourceList = Lists.newArrayList(); List<PeriodDataSource> periodDataSourceList = Lists.newArrayList();
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) { for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r); Row row = sheet.getRow(r);
Assert.notNull(row,"Excel 文档为空");
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) { for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
Cell cell = row.getCell(c); Cell cell = row.getCell(c);
if (cell == null) { if (cell == null) {
......
...@@ -282,66 +282,66 @@ public class EbsApiServiceImplTest extends CommonIT { ...@@ -282,66 +282,66 @@ public class EbsApiServiceImplTest extends CommonIT {
public void queryRemoteServerThenUpdateJE(){ public void queryRemoteServerThenUpdateJE(){
List<JournalEntryQueryDto> items=new ArrayList<>(); List<JournalEntryQueryDto> items=new ArrayList<>();
for(int i=0;i<10;i++){ for(int i=0;i<10;i++){
JournalEntryQueryDto journalEntryQueryDto =new JournalEntryQueryDto(); JournalEntryQueryDto result =new JournalEntryQueryDto();
journalEntryQueryDto.setSource("来源"); result.setSource("来源");
journalEntryQueryDto.setLedgerId("账套ID"); result.setLedgerId("账套ID");
journalEntryQueryDto.setLedgerName("账套名称"); result.setLedgerName("账套名称");
journalEntryQueryDto.setCurrencyCode("账套币种"); result.setCurrencyCode("账套币种");
journalEntryQueryDto.setHeaderId("日记账头ID"); result.setHeaderId("日记账头ID");
journalEntryQueryDto.setLineNum("日记账行号"); result.setLineNum("日记账行号");
journalEntryQueryDto.setApprovalStatus("审批状态"); result.setApprovalStatus("审批状态");
journalEntryQueryDto.setPostedStatus("过账"); result.setPostedStatus("过账");
// journalEntryQueryDto.setPeriod(20180102+i); result.setPeriod("2018-11");
journalEntryQueryDto.setJournalSource("日记账来源"); result.setJournalSource("日记账来源");
journalEntryQueryDto.setCategory("日记账类别"); result.setCategory("日记账类别");
journalEntryQueryDto.setName("日记账名称"); result.setName("日记账名称");
journalEntryQueryDto.setVoucherNum("凭证编号"); result.setVoucherNum("凭证编号");
journalEntryQueryDto.setDescription("摘要"); result.setDescription("摘要");
journalEntryQueryDto.setSegment1("主体代码"); result.setSegment1("主体代码");
journalEntryQueryDto.setSegment2("成本中心"); result.setSegment2("成本中心");
journalEntryQueryDto.setSegment3("科目代码"); result.setSegment3("科目代码");
journalEntryQueryDto.setSegment4("辅助科目"); result.setSegment4("辅助科目");
journalEntryQueryDto.setSegment5("利润中心"); result.setSegment5("利润中心");
journalEntryQueryDto.setSegment6("产品"); result.setSegment6("产品");
journalEntryQueryDto.setSegment7("项目"); result.setSegment7("项目");
journalEntryQueryDto.setSegment8("公司间"); result.setSegment8("公司间");
journalEntryQueryDto.setSegment9("备用1"); result.setSegment9("备用1");
journalEntryQueryDto.setSegment10("备用2"); result.setSegment10("备用2");
journalEntryQueryDto.setSegment1Name("主体说明"); result.setSegment1Name("主体说明");
journalEntryQueryDto.setSegment2Name("成本中心说明"); result.setSegment2Name("成本中心说明");
journalEntryQueryDto.setSegment3Name("科目说明"); result.setSegment3Name("科目说明");
journalEntryQueryDto.setSegment4Name("辅助科目说明"); result.setSegment4Name("辅助科目说明");
journalEntryQueryDto.setSegment5Name("利润中心说明"); result.setSegment5Name("利润中心说明");
journalEntryQueryDto.setSegment6Name("产品说明"); result.setSegment6Name("产品说明");
journalEntryQueryDto.setSegment7Name("项目说明"); result.setSegment7Name("项目说明");
journalEntryQueryDto.setSegment8Name("公司间说明"); result.setSegment8Name("公司间说明");
journalEntryQueryDto.setSegment9Name("备用1说明"); result.setSegment9Name("备用1说明");
journalEntryQueryDto.setSegment10Name("备用2说明"); result.setSegment10Name("备用2说明");
journalEntryQueryDto.setJournalCurrencyCode("币种"); result.setJournalCurrencyCode("币种");
journalEntryQueryDto.setSobCurrencyCode("本位币币种"); result.setSobCurrencyCode("本位币币种");
journalEntryQueryDto.setAccountedDr(new BigDecimal("123")); result.setAccountedDr(new BigDecimal("123"));
journalEntryQueryDto.setAccountedCr(new BigDecimal("120.2")); result.setAccountedCr(new BigDecimal("120.2"));
journalEntryQueryDto.setEnteredDr(new BigDecimal("1231.0231")); result.setEnteredDr(new BigDecimal("1231.0231"));
journalEntryQueryDto.setEnteredCr(new BigDecimal("120.122")); result.setEnteredCr(new BigDecimal("120.122"));
journalEntryQueryDto.setCfItem("现金流量表项"); result.setCfItem("现金流量表项");
journalEntryQueryDto.setAttribute1("城市"); result.setAttribute1("城市");
journalEntryQueryDto.setAttribute3("对方银行账号"); result.setAttribute3("对方银行账号");
journalEntryQueryDto.setAttribute4("银行流水号"); result.setAttribute4("银行流水号");
journalEntryQueryDto.setAttribute5("供应商编号"); result.setAttribute5("供应商编号");
journalEntryQueryDto.setAttribute6("交易单号"); result.setAttribute6("交易单号");
journalEntryQueryDto.setAttribute7("供应商名称"); result.setAttribute7("供应商名称");
journalEntryQueryDto.setAttribute8("接收编码"); result.setAttribute8("接收编码");
journalEntryQueryDto.setAttribute9("制单人"); result.setAttribute9("制单人");
journalEntryQueryDto.setAttribute10("审核人"); result.setAttribute10("审核人");
journalEntryQueryDto.setAttribute11("成本中心部门描述1"); result.setAttribute11("成本中心部门描述1");
journalEntryQueryDto.setAttribute12("成本中心部门描述2"); result.setAttribute12("成本中心部门描述2");
journalEntryQueryDto.setAttribute13("成本中心部门描述3"); result.setAttribute13("成本中心部门描述3");
journalEntryQueryDto.setAttribute14("成本中心部门描述4"); result.setAttribute14("成本中心部门描述4");
journalEntryQueryDto.setAttribute15("成本中心部门描述5"); result.setAttribute15("成本中心部门描述5");
journalEntryQueryDto.setAttribute16("成本中心部门描述6"); result.setAttribute16("成本中心部门描述6");
journalEntryQueryDto.setCreatedBy("pwcCreat"); result.setCreatedBy("pwcCreat");
journalEntryQueryDto.setLateUpdatedBy("pwcUpate"); result.setLateUpdatedBy("pwcUpate");
items.add(journalEntryQueryDto); items.add(result);
} }
String a=JSON.toJSONString(items); String a=JSON.toJSONString(items);
System.out.println(a); System.out.println(a);
......
...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper; import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.CitAssetEamMappingDto;
import pwc.taxtech.atms.entity.CitAssetsList; import pwc.taxtech.atms.entity.CitAssetsList;
import pwc.taxtech.atms.entity.CitAssetsListExample; import pwc.taxtech.atms.entity.CitAssetsListExample;
...@@ -107,4 +108,12 @@ public interface CitAssetsListMapper extends MyMapper { ...@@ -107,4 +108,12 @@ public interface CitAssetsListMapper extends MyMapper {
int updateByPrimaryKey(CitAssetsList record); int updateByPrimaryKey(CitAssetsList record);
int insertBatch(List<CitAssetsList> citAssetsLists); int insertBatch(List<CitAssetsList> citAssetsLists);
/**
* fetch data by citAsset
*
* @param citAsset
* @return Result<XxxxDO>
*/
List<CitAssetEamMappingDto> getAssetEamMapping(CitAssetsList citAsset);
} }
\ No newline at end of file
package pwc.taxtech.atms.dpo;
import pwc.taxtech.atms.entity.CitAssetsList;
import java.math.BigDecimal;
/**
* @author zhikai.z.wei
*/
public class CitAssetEamMappingDto extends CitAssetsList {
/**
* EAM 资产里面的赔偿/变卖金额
*/
private BigDecimal compensationSaleAmount;
public BigDecimal getCompensationSaleAmount() {
return compensationSaleAmount;
}
public void setCompensationSaleAmount(BigDecimal compensationSaleAmount) {
this.compensationSaleAmount = compensationSaleAmount;
}
}
...@@ -54,6 +54,17 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -54,6 +54,17 @@ public class CitAssetsList extends BaseEntity implements Serializable {
*/ */
private String assetNumber; private String assetNumber;
/**
* Database Column Remarks:
* 序列号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.serial_number
*
* @mbg.generated
*/
private String serialNumber;
/** /**
* Database Column Remarks: * Database Column Remarks:
* 资产类别-页面 * 资产类别-页面
...@@ -417,6 +428,17 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -417,6 +428,17 @@ public class CitAssetsList extends BaseEntity implements Serializable {
*/ */
private String taxGroupName; private String taxGroupName;
/**
* Database Column Remarks:
* 报废类型
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.scrap_type
*
* @mbg.generated
*/
private String scrapType;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table assets_list * This field corresponds to the database table assets_list
...@@ -521,6 +543,30 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -521,6 +543,30 @@ public class CitAssetsList extends BaseEntity implements Serializable {
this.assetNumber = assetNumber == null ? null : assetNumber.trim(); this.assetNumber = assetNumber == null ? null : assetNumber.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.serial_number
*
* @return the value of assets_list.serial_number
*
* @mbg.generated
*/
public String getSerialNumber() {
return serialNumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.serial_number
*
* @param serialNumber the value for assets_list.serial_number
*
* @mbg.generated
*/
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber == null ? null : serialNumber.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.asset_group_name * This method returns the value of the database column assets_list.asset_group_name
...@@ -1313,6 +1359,30 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -1313,6 +1359,30 @@ public class CitAssetsList extends BaseEntity implements Serializable {
this.taxGroupName = taxGroupName == null ? null : taxGroupName.trim(); this.taxGroupName = taxGroupName == null ? null : taxGroupName.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.scrap_type
*
* @return the value of assets_list.scrap_type
*
* @mbg.generated
*/
public String getScrapType() {
return scrapType;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.scrap_type
*
* @param scrapType the value for assets_list.scrap_type
*
* @mbg.generated
*/
public void setScrapType(String scrapType) {
this.scrapType = scrapType == null ? null : scrapType.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table assets_list * This method corresponds to the database table assets_list
...@@ -1329,6 +1399,7 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -1329,6 +1399,7 @@ public class CitAssetsList extends BaseEntity implements Serializable {
sb.append(", projectId=").append(projectId); sb.append(", projectId=").append(projectId);
sb.append(", period=").append(period); sb.append(", period=").append(period);
sb.append(", assetNumber=").append(assetNumber); sb.append(", assetNumber=").append(assetNumber);
sb.append(", serialNumber=").append(serialNumber);
sb.append(", assetGroupName=").append(assetGroupName); sb.append(", assetGroupName=").append(assetGroupName);
sb.append(", assetDetailGroupId=").append(assetDetailGroupId); sb.append(", assetDetailGroupId=").append(assetDetailGroupId);
sb.append(", assetDescription=").append(assetDescription); sb.append(", assetDescription=").append(assetDescription);
...@@ -1362,6 +1433,7 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -1362,6 +1433,7 @@ public class CitAssetsList extends BaseEntity implements Serializable {
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", taxAccountCompare=").append(taxAccountCompare); sb.append(", taxAccountCompare=").append(taxAccountCompare);
sb.append(", taxGroupName=").append(taxGroupName); sb.append(", taxGroupName=").append(taxGroupName);
sb.append(", scrapType=").append(scrapType);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
......
...@@ -456,6 +456,76 @@ public class CitAssetsListExample { ...@@ -456,6 +456,76 @@ public class CitAssetsListExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberIsNull() {
addCriterion("serial_number is null");
return (Criteria) this;
}
public Criteria andSerialNumberIsNotNull() {
addCriterion("serial_number is not null");
return (Criteria) this;
}
public Criteria andSerialNumberEqualTo(String value) {
addCriterion("serial_number =", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotEqualTo(String value) {
addCriterion("serial_number <>", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberGreaterThan(String value) {
addCriterion("serial_number >", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
addCriterion("serial_number >=", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLessThan(String value) {
addCriterion("serial_number <", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLessThanOrEqualTo(String value) {
addCriterion("serial_number <=", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLike(String value) {
addCriterion("serial_number like", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotLike(String value) {
addCriterion("serial_number not like", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberIn(List<String> values) {
addCriterion("serial_number in", values, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotIn(List<String> values) {
addCriterion("serial_number not in", values, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberBetween(String value1, String value2) {
addCriterion("serial_number between", value1, value2, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotBetween(String value1, String value2) {
addCriterion("serial_number not between", value1, value2, "serialNumber");
return (Criteria) this;
}
public Criteria andAssetGroupNameIsNull() { public Criteria andAssetGroupNameIsNull() {
addCriterion("asset_group_name is null"); addCriterion("asset_group_name is null");
return (Criteria) this; return (Criteria) this;
...@@ -2465,6 +2535,76 @@ public class CitAssetsListExample { ...@@ -2465,6 +2535,76 @@ public class CitAssetsListExample {
addCriterion("tax_group_name not between", value1, value2, "taxGroupName"); addCriterion("tax_group_name not between", value1, value2, "taxGroupName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andScrapTypeIsNull() {
addCriterion("scrap_type is null");
return (Criteria) this;
}
public Criteria andScrapTypeIsNotNull() {
addCriterion("scrap_type is not null");
return (Criteria) this;
}
public Criteria andScrapTypeEqualTo(String value) {
addCriterion("scrap_type =", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeNotEqualTo(String value) {
addCriterion("scrap_type <>", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeGreaterThan(String value) {
addCriterion("scrap_type >", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeGreaterThanOrEqualTo(String value) {
addCriterion("scrap_type >=", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeLessThan(String value) {
addCriterion("scrap_type <", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeLessThanOrEqualTo(String value) {
addCriterion("scrap_type <=", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeLike(String value) {
addCriterion("scrap_type like", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeNotLike(String value) {
addCriterion("scrap_type not like", value, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeIn(List<String> values) {
addCriterion("scrap_type in", values, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeNotIn(List<String> values) {
addCriterion("scrap_type not in", values, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeBetween(String value1, String value2) {
addCriterion("scrap_type between", value1, value2, "scrapType");
return (Criteria) this;
}
public Criteria andScrapTypeNotBetween(String value1, String value2) {
addCriterion("scrap_type not between", value1, value2, "scrapType");
return (Criteria) this;
}
} }
/** /**
......
...@@ -2,6 +2,52 @@ ...@@ -2,6 +2,52 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CitAssetsListMapper"> <mapper namespace="pwc.taxtech.atms.dao.CitAssetsListMapper">
<resultMap id="assetEamMap" type="pwc.taxtech.atms.dpo.CitAssetEamMappingDto">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="asset_number" jdbcType="VARCHAR" property="assetNumber" />
<result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
<result column="asset_group_name" jdbcType="VARCHAR" property="assetGroupName" />
<result column="asset_detail_group_id" jdbcType="BIGINT" property="assetDetailGroupId" />
<result column="asset_description" jdbcType="VARCHAR" property="assetDescription" />
<result column="buy_date" jdbcType="TIMESTAMP" property="buyDate" />
<result column="depreciation_date" jdbcType="TIMESTAMP" property="depreciationDate" />
<result column="depreciation_period" jdbcType="INTEGER" property="depreciationPeriod" />
<result column="acquisition_value" jdbcType="DECIMAL" property="acquisitionValue" />
<result column="adjustment_value" jdbcType="DECIMAL" property="adjustmentValue" />
<result column="disposed_date" jdbcType="TIMESTAMP" property="disposedDate" />
<result column="residual_rate" jdbcType="DECIMAL" property="residualRate" />
<result column="year_depreciation_amount" jdbcType="DECIMAL" property="yearDepreciationAmount" />
<result column="year_adjustment_amount" jdbcType="DECIMAL" property="yearAdjustmentAmount" />
<result column="year_end_value" jdbcType="DECIMAL" property="yearEndValue" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="account_acquisition_value" jdbcType="DECIMAL" property="accountAcquisitionValue" />
<result column="account_month_depreciation_amount" jdbcType="DECIMAL" property="accountMonthDepreciationAmount" />
<result column="account_year_depreciation_amount" jdbcType="DECIMAL" property="accountYearDepreciationAmount" />
<result column="account_total_depreciation_amount" jdbcType="DECIMAL" property="accountTotalDepreciationAmount" />
<result column="tax_depreciation_period" jdbcType="INTEGER" property="taxDepreciationPeriod" />
<result column="tax_to_last_year_depreciation_period" jdbcType="INTEGER" property="taxToLastYearDepreciationPeriod" />
<result column="tax_to_current_year_depreciation_period" jdbcType="INTEGER" property="taxToCurrentYearDepreciationPeriod" />
<result column="tax_year_depreciation_period" jdbcType="INTEGER" property="taxYearDepreciationPeriod" />
<result column="tax_month_depreciation_amount" jdbcType="DECIMAL" property="taxMonthDepreciationAmount" />
<result column="tax_to_current_year_depreciation_amount" jdbcType="DECIMAL" property="taxToCurrentYearDepreciationAmount" />
<result column="tax_current_year_depreciation_amount" jdbcType="DECIMAL" property="taxCurrentYearDepreciationAmount" />
<result column="total_difference_amount" jdbcType="DECIMAL" property="totalDifferenceAmount" />
<result column="year_difference_amount" jdbcType="DECIMAL" property="yearDifferenceAmount" />
<result column="is_retain" jdbcType="INTEGER" property="isRetain" />
<result column="asset_type" jdbcType="INTEGER" property="assetType" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="tax_account_compare" jdbcType="INTEGER" property="taxAccountCompare" />
<result column="tax_group_name" jdbcType="VARCHAR" property="taxGroupName" />
<result column="compensation_sale_amount" jdbcType="VARCHAR" property="compensationSaleAmount" />
</resultMap>
<insert id="insertBatch" parameterType="java.util.List"> <insert id="insertBatch" parameterType="java.util.List">
insert into assets_list insert into assets_list
(<include refid="Base_Column_List"/>) (<include refid="Base_Column_List"/>)
...@@ -24,6 +70,10 @@ ...@@ -24,6 +70,10 @@
<when test="item.assetNumber != null">#{item.assetNumber,jdbcType=VARCHAR},</when> <when test="item.assetNumber != null">#{item.assetNumber,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>'',</otherwise>
</choose> </choose>
<choose>
<when test="item.serialNumber != null">#{item.serialNumber,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose> <choose>
<when test="item.assetGroupName != null">#{item.assetGroupName,jdbcType=VARCHAR},</when> <when test="item.assetGroupName != null">#{item.assetGroupName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>'',</otherwise>
...@@ -156,9 +206,19 @@ ...@@ -156,9 +206,19 @@
<when test="item.taxGroupName != null">#{item.taxGroupName,jdbcType=VARCHAR},</when> <when test="item.taxGroupName != null">#{item.taxGroupName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise> <otherwise>'',</otherwise>
</choose> </choose>
<choose>
<when test="item.scrapType != null">#{item.scrapType,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
</trim> </trim>
</foreach>; </foreach>;
SELECT 1 FROM DUAL; SELECT 1 FROM DUAL;
</insert> </insert>
<select id="getAssetEamMapping" parameterType="map" resultMap="assetEamMap">
select
assets_list.* , cit_eam_assets_disposal.compensation_sale_amount
from assets_list join cit_eam_assets_disposal on serial_number = asset_label_number where scrap_type='完全报废'
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -993,6 +993,23 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru ...@@ -993,6 +993,23 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
sticky: true sticky: true
}); });
$stateProvider.state({
name: 'cit.reductionData.assetEamMapping',
url: '/assetEamMapping',
views: {
'@cit.reductionData': {
controller: ['$scope', '$stateParams', 'appTranslation',
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-asset-eam-mapping></cit-asset-eam-mapping>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
deepStateRedirect: true,
sticky: true
});
$stateProvider.state({ $stateProvider.state({
name: 'cit.reductionData.inputInvoice', name: 'cit.reductionData.inputInvoice',
url: '/inputInvoice', url: '/inputInvoice',
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
"AddTemplate": "Add Template", "AddTemplate": "Add Template",
"AddWidget": "Add Widget", "AddWidget": "Add Widget",
"AdjustmentItems": "Adjustment Item", "AdjustmentItems": "Adjustment Item",
"TotalNumberUnit": "Sheet",
"AdjustmentSummaryInCurrentPeriod": "Current Period CIT Adjustment Summary", "AdjustmentSummaryInCurrentPeriod": "Current Period CIT Adjustment Summary",
"AdvancedSearch": "More Search Options", "AdvancedSearch": "More Search Options",
"AdvertisingExpense": "Advertisement Expense", "AdvertisingExpense": "Advertisement Expense",
...@@ -106,6 +107,8 @@ ...@@ -106,6 +107,8 @@
"CertificationResult": "Certification Result", "CertificationResult": "Certification Result",
"Change": "Change", "Change": "Change",
"Alter": "Alter", "Alter": "Alter",
"MenuRecordManage": "Record Manage",
"MenuAnalysis": "Analysis",
"ChangePassword": "Change Password", "ChangePassword": "Change Password",
"ChangePasswordFailInfo": "Failed Password Modification Operation:", "ChangePasswordFailInfo": "Failed Password Modification Operation:",
"ChangePasswordSuccessInfo": "The Password Modification Operation was Successful! Automatic Shutdown After 3 Seconds...", "ChangePasswordSuccessInfo": "The Password Modification Operation was Successful! Automatic Shutdown After 3 Seconds...",
...@@ -381,7 +384,7 @@ ...@@ -381,7 +384,7 @@
"ManufacturingIndustry": "Manufacturing Industry", "ManufacturingIndustry": "Manufacturing Industry",
"MappingInvoice": "Association management", "MappingInvoice": "Association management",
"MenuAMVAT": "Asset Management VAT Return", "MenuAMVAT": "Asset Management VAT Return",
"MenuCIT": "Corporate Income Tax Return", "MenuCIT": "CIT Return",
"MenuCashFlow": "Tax Cash Flow", "MenuCashFlow": "Tax Cash Flow",
"MenuIndexAnalytics": "Tax Indicator Analysis", "MenuIndexAnalytics": "Tax Indicator Analysis",
"MenuInvoiceManagement": "Invoice Management", "MenuInvoiceManagement": "Invoice Management",
......
...@@ -1132,5 +1132,9 @@ ...@@ -1132,5 +1132,9 @@
"BeginningBalance": "Beginning Balance", "BeginningBalance": "Beginning Balance",
"EndingBalance": "Ending Balance", "EndingBalance": "Ending Balance",
"Attribute": "Attribute", "Attribute": "Attribute",
"MainBodyCode": "Main Body Code" "MainBodyCode": "Main Body Code",
"AssetEamMapping": "Asset Eam Mapping",
"DisposalProfitAndLoss": "Disposal Profit And Loss",
"TaxNetValue": "Tax Net Value",
"DisposalTaxBenefit": "Disposal Tax Benefit"
} }
\ No newline at end of file
...@@ -1503,7 +1503,8 @@ ...@@ -1503,7 +1503,8 @@
"Alternate1Description": "Alternate 1 Description", "Alternate1Description": "Alternate 1 Description",
"Alternate2Description": "Alternate 2 Description", "Alternate2Description": "Alternate 2 Description",
"YYYY-MM": "YYYY-MM", "YYYY-MM": "YYYY-MM",
"profitLoss": "Profit&Loss", "profitLoss": "Profit Statement&Loss",
"ProfitLossTitle": "Profit Statement",
"CurrentPeriodAmount": "Current Period Amount", "CurrentPeriodAmount": "Current Period Amount",
"ThisYearAccumulatedAmount": "This Year Accumulated Amount", "ThisYearAccumulatedAmount": "This Year Accumulated Amount",
"quarterlyOwnersEquityChangeTable": "Quarterly Owners Equity Change Table", "quarterlyOwnersEquityChangeTable": "Quarterly Owners Equity Change Table",
...@@ -1799,7 +1800,6 @@ ...@@ -1799,7 +1800,6 @@
"CoupaInvoiceNum": "Invoice number", "CoupaInvoiceNum": "Invoice number",
"CoupaTotalTaxAmount": "Total tax amount", "CoupaTotalTaxAmount": "Total tax amount",
"AdjustmentTableTitle": "Adjustment table", "AdjustmentTableTitle": "Adjustment table",
"ProfitLossTitle": "Profit&Loss",
"QuarterlyOwnersEquityChangeTableTitle": "Quarterly owners equity change Table", "QuarterlyOwnersEquityChangeTableTitle": "Quarterly owners equity change Table",
"DirectMethodCashFlowStatementTitle": "Direct method cash flow statement", "DirectMethodCashFlowStatementTitle": "Direct method cash flow statement",
"JournalTitle": "Journal entry", "JournalTitle": "Journal entry",
...@@ -1873,6 +1873,65 @@ ...@@ -1873,6 +1873,65 @@
"ValidateContent": "Validate Content", "ValidateContent": "Validate Content",
"ValidateResult": "Validate Result", "ValidateResult": "Validate Result",
"ResultMsg": "Result Message", "ResultMsg": "Result Message",
"revenueDetail": "Revenue Detail",
"RevSearchAccountCode": "Revenue Account Code",
"RevSearchAccountName": "Revenue Account Name",
"RevSearchProfitCenterCode": "Revenue Profit Center Code",
"RevSearchProfitCenterName": "Revenue Profit Center Name",
"RevSearchProductCode": "Revenue Product Code",
"RevSearchProductName": "Revenue Product Name",
"RevSearchType": "Revenue Type",
"RevSearchCategory": "Revenue Category",
"RevSearchTaxOn": "Revenue TaxOn",
"RevDetailSearch": "Revenue Search",
"RevDetailReset": "Revenue Reset",
"RevDetailColSerialNo": "SerialNo",
"RevDetailColSubject": "Subject",
"RevDetailColAccount": "Account",
"RevDetailColProfitCenter": "Profit Center",
"RevDetailProduct": "Product",
"RevDetailColSubjectExp": "Subject Exp",
"RevDetailColAccountExp": "Account Exp",
"RevDetailColProfitCenterExp": "Profit Center Exp",
"RevDetailProductExp": "Product Exp",
"RevDetailAmount": "Amount",
"RevDetailType": "Type",
"RevDetailCategory": "Category",
"RevDetailTaxOn": "TaxOn",
"RevCMTitle": "开票记录与收入类型映射配置",
"RevCMApplyBU": "申请部门",
"RevCMInvoiceCTX": "开票内容",
"BillDetail": "Bill Detail",
"BillEditRevenueType": "Bill Edit Revenue Type",
"BillDtlHandle": "Bill Handle",
"BillSearchType": "Bill Type",
"BillSearchCustomer": "Bill Customer",
"BillSearchProfitCenter": "Bill ProfitCenter",
"BillSearchContent": "Bill Content",
"BillSearchDate": "Bill Date",
"BillSearchRevenueType": "Bill Revenue Type",
"BillSearchDepartment": "Bill Department",
"BillSearchTaxRate": "Bill Tax Rate",
"BillSearchNumber": "Bill Number",
"BillDtlSearch": "Bill Search",
"BillDtlReset": "Bill Reset",
"BillDtlMoreSearch": "Bill More Search",
"BillDtlShrink": "Bill Shrink",
"BillDtlColSerialNo": "Bill SerialNo",
"BillDtlColSubject": "Bill Subject",
"BillDtlColCustCompany": "Bill Cust Company",
"BillDtlColType": "Bill Type",
"BillDtlColContent": "Bill Content",
"BillDtlColAmount": "Bill Amount",
"BillDtlColTaxRate": "Bill Tax Rate",
"BillDtlColTaxAmount": "Bill Tax Amount",
"BillDtlColOANo": "Bill OA No",
"BillDtlColDepartment": "Bill Department",
"BillDtlColDate": "Bill Date",
"BillDtlColCode": "Bill Code",
"BillDtlColNumber": "Bill Number",
"BillDtlColRevenueType": "Bill RevenueType",
"BillDtlUpdateSuccess": "Bill Update Success",
"Operater": "Operater", "Operater": "Operater",
"OperateTime": "Operate Time", "OperateTime": "Operate Time",
"SelectedImportType": "Selected Import Type", "SelectedImportType": "Selected Import Type",
......
...@@ -1184,7 +1184,14 @@ ...@@ -1184,7 +1184,14 @@
"QMYETotalend" : "期末余额合计(贷-借)", "QMYETotalend" : "期末余额合计(贷-借)",
"Backfill any adjusted total value back to the adjusted amount" : "单选任意合计值回填至调整后金额", "Backfill any adjusted total value back to the adjusted amount" : "单选任意合计值回填至调整后金额",
"BackAdjustAmount" : "调整后金额", "BackAdjustAmount" : "调整后金额",
"gatheringCompanyAccount":"收款公司账号",
"AssetEamMapping": "CIT.WP01901_固定资产",
"DisposalProfitAndLoss": "处置损益",
"TaxNetValue": "资产的税务净值",
"DisposalTaxBenefit": "处置的税收损益",
"BackAdjustAmount" : "调整后金额",
"OperateDate" : "操作日期" "OperateDate" : "操作日期"
} }
\ No newline at end of file
...@@ -312,7 +312,17 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate, ...@@ -312,7 +312,17 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
name: 'reductionData.accountMapping', state: 'reductionData.accountMapping', num: 3, name: 'reductionData.accountMapping', state: 'reductionData.accountMapping', num: 3,
permission: constant.citPermission.dataManage.accountMappingCode, url: '#/cit/reductionData/accountMapping' permission: constant.citPermission.dataManage.accountMappingCode, url: '#/cit/reductionData/accountMapping'
}); });
} }
else if (data[constant.citPermission.dataManage.assetEamMapping]) {
$scope.menus.push({
name: 'reductionData', state: 'reductionData', num: 3,
permission: constant.citPermission.dataManage.dataManageCode, url: '#/cit/reductionData'
});
subMenus.push({
name: 'reductionData.assetEamMapping', state: 'reductionData.assetEamMapping', num: 3,
permission: constant.citPermission.dataManage.assetEamMapping, url: '#/cit/reductionData/assetEamMapping'
});
}
if (data[constant.citPermission.reportView.bsplCode] if (data[constant.citPermission.reportView.bsplCode]
|| data[constant.citPermission.reportView.quarterlyFilingReturnTypeCode] || data[constant.citPermission.reportView.quarterlyFilingReturnTypeCode]
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
__RequestVerificationToken: token, __RequestVerificationToken: token,
withCredentials: true withCredentials: true
}, withCredentials: true }, withCredentials: true
}).then(function(resp){ }).success(function(resp){
$('#busy-indicator-container').hide(); $('#busy-indicator-container').hide();
assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) { assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
$scope.assetGroupResultDataSource = groupResultData.data; $scope.assetGroupResultDataSource = groupResultData.data;
...@@ -248,6 +248,8 @@ ...@@ -248,6 +248,8 @@
scope: $scope, scope: $scope,
windowClass: "set-asset-list-modal" windowClass: "set-asset-list-modal"
}); });
}).error(function(resp){
SweetAlert.error("文件导入出现错误,请重试");
}); });
}; };
...@@ -877,11 +879,16 @@ ...@@ -877,11 +879,16 @@
{ {
assetListService.saveAssetGroupInfo($scope.assetGroupResultDataSource, $scope.saveGroupType, projectId).success(function (data) { assetListService.saveAssetGroupInfo($scope.assetGroupResultDataSource, $scope.saveGroupType, projectId).success(function (data) {
if (data) { if (data.data) {
SweetAlert.success($translate.instant('SaveSuccess')); SweetAlert.success($translate.instant('SaveSuccess'));
if ($scope.modalInstance) { if ($scope.modalInstance) {
$scope.modalInstance.close(); $scope.modalInstance.close();
} }
}else {
SweetAlert.error("设置二级分类失败,请联系系统管理员");
if ($scope.modalInstance) {
$scope.modalInstance.close();
}
} }
}).error(function () { }).error(function () {
SweetAlert.error(serviceErrorMsg); SweetAlert.error(serviceErrorMsg);
......
...@@ -72,6 +72,7 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi ...@@ -72,6 +72,7 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
else if ($location && $location.absUrl().indexOf('reductionData') > -1) { else if ($location && $location.absUrl().indexOf('reductionData') > -1) {
$scope.nodeDicKey = constant.DictionaryDictKey.DataProcess; $scope.nodeDicKey = constant.DictionaryDictKey.DataProcess;
$scope.linkShort = enums.linkShort.ReductionData; $scope.linkShort = enums.linkShort.ReductionData;
debugger;
$scope.menus = [ $scope.menus = [
{ {
name: 'caculateData', permission: constant.citPermission.dataManage.caculateDataCode, name: 'caculateData', permission: constant.citPermission.dataManage.caculateDataCode,
...@@ -80,7 +81,11 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi ...@@ -80,7 +81,11 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
{ {
name: 'accountMapping', permission: constant.citPermission.dataManage.accountMappingCode, name: 'accountMapping', permission: constant.citPermission.dataManage.accountMappingCode,
text: $translate.instant('accountMapping'), icon: 'fa fa-map' text: $translate.instant('accountMapping'), icon: 'fa fa-map'
}, },
{
name: 'assetEamMapping', permission: constant.citPermission.dataManage.assetEamMapping,
text: $translate.instant('AssetEamMapping'), icon: 'fa fa-map'
},
]; ];
} }
else { else {
......
<div class="cit-asset-eam-mapping" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<span translate="JournalTitle" 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;" id="input-invoice-period-picker" />
<span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<!--<div style="margin-bottom: 8px;margin-left: 30px">-->
<!--{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;-->
<!--{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;-->
<!--{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>-->
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div>
<div class="pagination-container">
<span>本页{{curPageItemCount}}条记录,共{{queryJournalEntryResult.pageInfo.total}}条记录</span>
<div id="totalInvoicePage" class="common-pagination" style="display:none;">
</div>
</div>
</div>
</div>
citModule.directive('citAssetEamMapping', ['$log',
function ($log) {
$log.debug('citPreviewJournalMerge.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html' + '?_=' + Math.random(),
scope: {},
controller: 'citAssetEamMappingController',
link: function ($scope, element) {
}
};
}
]);
@import "~/app-resources/less/theme.less";
.cit-asset-eam-mapping {
background-color: white;
height: 100%;
.numAmount {
padding: 0 3px;
height: 21px;
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.filter-button {
width: 30px;
margin-top: 16px;
}
.operation-wrapper {
margin: 15px 25px 10px 10px;
span {
cursor: pointer;
}
}
}
.filter-popup-wrapper {
display: none;
}
.margin-left20 {
margin-left: 20px;
}
/*******************************************/
/*Filter Criteria tags:*/
.tag {
font-size: 12px;
padding: .3em .4em .4em;
margin: 0 .1em;
a {
color: #bbb;
cursor: pointer;
opacity: 0.6;
margin: 0 0 0 .3em;
&:hover {
opacity: 1.0;
}
.glyphicon-white {
color: #fff;
margin-bottom: 2px;
}
}
.remove {
vertical-align: bottom;
top: 0;
}
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
height: 100%;
margin: 0 20px;
.watermark {
position: absolute;
top: 50%;
transform: translateY(-50%);
opacity: .25;
font-size: 3em;
width: 100%;
text-align: center;
z-index: 1000;
}
.inputInvoiceGrid {
width: 100%;
height: calc(~'100% - 158px');
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents {
height: 40px;
i {
display: none;
}
}
}
}
.form-control {
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
.input-width-middle {
width: 217px;
}
}
.popover {
min-width: 370px;
left: 119px !important;
.arrow {
left: 5% !important;
}
}
.popover-content {
td {
text-align: right;
padding: 6px;
span {
float: left;
}
}
.form-control {
display: inline-block;
&:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
}
}
.input-width-small {
width: 100px;
}
.input-width-middle {
width: 217px;
}
}
...@@ -650,6 +650,7 @@ constant.citPermission = { ...@@ -650,6 +650,7 @@ constant.citPermission = {
dataManage: { dataManage: {
dataManageCode: '03.003', dataManageCode: '03.003',
accountMappingCode: '03.003.001', accountMappingCode: '03.003.001',
assetEamMapping: '03.003.002',
accountMapping: { accountMapping: {
queryCode: '03.003.001.001', queryCode: '03.003.001.001',
importCode: '03.003.001.002' importCode: '03.003.001.002'
......
...@@ -43,20 +43,20 @@ ...@@ -43,20 +43,20 @@
// citGetTemplate: function (projectId, period?) // citGetTemplate: function (projectId, period?)
updateConfig: function (projectId, ifDeleteManualDataSource, period, generator, isMergeManualDataSource) { updateConfig: function (projectId, ifDeleteManualDataSource, period, generator, isMergeManualDataSource) {
return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator+ '&mergeManual='+isMergeManualDataSource, {}, apiConfig.createVat({ignoreLoadingBar: true})); return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator + '&mergeManual=' + isMergeManualDataSource, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
generate: function (projectId, templateId, ifDeleteManualDataSource, period, generator) { generate: function (projectId, templateId, ifDeleteManualDataSource, period, generator) {
return $http.post('/Report/generate/' + projectId + '/' + templateId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true})); return $http.post('/Report/generate/' + projectId + '/' + templateId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
generateAllCitReport: function (projectId, isMergeManualDataSource, generator) { generateAllCitReport: function (projectId, isMergeManualDataSource, generator) {
return $http.post('/citReport/generateByTotal/' + projectId + '/' + isMergeManualDataSource + '?generator=' + generator , {}, apiConfig.createVat({ignoreLoadingBar: true})); return $http.post('/citReport/generateByTotal/' + projectId + '/' + isMergeManualDataSource + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
getRunningJob: function (projectId, period) { getRunningJob: function (projectId, period) {
return $http.get('/citReport/getPeriodJob/' + projectId+'/'+period, apiConfig.createVat()); return $http.get('/citReport/getPeriodJob/' + projectId + '/' + period, apiConfig.createVat());
}, },
getJobStatus: function (projectId, period, jobId) { getJobStatus: function (projectId, period, jobId) {
return $http.get('/Report/getJobStatus/' + projectId +'/'+ period +'/'+ jobId, apiConfig.createVat({ignoreLoadingBar: true})); return $http.get('/Report/getJobStatus/' + projectId + '/' + period + '/' + jobId, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
getReportData: function (reportId) { getReportData: function (reportId) {
return $http.get('/Report/reportData/' + reportId, apiConfig.createVat()); return $http.get('/Report/reportData/' + reportId, apiConfig.createVat());
}, },
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
vatOperationLogService.addOperationLog(logInfo); vatOperationLogService.addOperationLog(logInfo);
data.dataSourceType = enums.cellDataSourceType.KeyIn; data.dataSourceType = enums.cellDataSourceType.KeyIn;
return $q.when(data); return $q.when(data);
},function (data) { }, function (data) {
logInfo.UpdateState = $translate.instant('ManualInputFail'); logInfo.UpdateState = $translate.instant('ManualInputFail');
SweetAlert.error($translate.instant('PleaseContactAdministrator')); SweetAlert.error($translate.instant('PleaseContactAdministrator'));
return vatOperationLogService.addOperationLog(logInfo); return vatOperationLogService.addOperationLog(logInfo);
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/' + 0 return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/' + 0
// 暂时将生成预缴表的period设置为0,等待完成新的预缴表生成逻辑 + period // 暂时将生成预缴表的period设置为0,等待完成新的预缴表生成逻辑 + period
+ '/' + enums.reportType.prepay + '/' + enums.reportType.prepay
+ '?generator=' + generator, {}, apiConfig.createVat({ ignoreLoadingBar: true })); + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
citGenerateByType: function (projectId, ifDeleteManualDataSource, reportType, generator) { citGenerateByType: function (projectId, ifDeleteManualDataSource, reportType, generator) {
var paramStr = ''; var paramStr = '';
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
paramStr = '/' + reportType; paramStr = '/' + reportType;
} }
return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/0' + paramStr + '?generator=' + generator, {}, apiConfig.createVat({ ignoreLoadingBar: true })); return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/0' + paramStr + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
citGetTemplate: function (projectId, period) { citGetTemplate: function (projectId, period) {
if (!_.isNumber(period)) { if (!_.isNumber(period)) {
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
reportTypeParam = '/' + reportType; reportTypeParam = '/' + reportType;
} }
return $http.post('/Report/citCalculateKeyValue/' + projectId + '/0' + reportTypeParam, {}, apiConfig.createVat({ ignoreLoadingBar: true })); return $http.post('/Report/citCalculateKeyValue/' + projectId + '/0' + reportTypeParam, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
getReportByTemplateId: function (templateId, period) { getReportByTemplateId: function (templateId, period) {
if (!_.isNumber(period)) { if (!_.isNumber(period)) {
...@@ -201,15 +201,30 @@ ...@@ -201,15 +201,30 @@
return $http.get('/Report/getDataSourceDetailList/' + dataSourceId, apiConfig.createVat()); return $http.get('/Report/getDataSourceDetailList/' + dataSourceId, apiConfig.createVat());
}, },
hasManualDataSource: function (projectId, period) { hasManualDataSource: function (projectId, period) {
return $http.get('/Report/hasManualDataSource/' + projectId+ '/' +period, apiConfig.createVat()); return $http.get('/Report/hasManualDataSource/' + projectId + '/' + period, apiConfig.createVat());
},
loadAttachList: function (activeSheet) {
return $http.post('/Report/loadAttachList', activeSheet, apiConfig.createVat());
},
deleteAttach: function (id) {
var config = {isBusyRequest: true};
return $http.get('/Report/deleteAttach?id=' + id, apiConfig.create(config));
},
/**
获取固定资产及EAM对应的数据
*/
getAssetEamMappings : function(citAssetsListDto){
return $http.post('/citReport/getAssetEamMappingsPage', citAssetsListDto, apiConfig.create());
}, },
loadAttachList : function(activeSheet){ /**
return $http.post('/Report/loadAttachList' , activeSheet, apiConfig.createVat()); * 导出固定资产及EAM对应的数据
* @param citAssetsListDto
* @returns {HttpPromise}
*/
initExportAEMData: function (citAssetsListDto) {
return $http.post('/citReport/exportAEMData', citAssetsListDto, apiConfig.create({ responseType: 'arraybuffer' }));
}, },
deleteAttach : function(id){
var config = { isBusyRequest: true };
return $http.get('/Report/deleteAttach?id=' + id, apiConfig.create(config));
}
}; };
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<td> <td>
<span class="lbl-name"> <span class="lbl-name">
<!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>--> <!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>-->
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">更多查询</span></span></a> <a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">{{'MoreQuery' | translate }}</span></span></a>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -98,11 +98,11 @@ ...@@ -98,11 +98,11 @@
</td> </td>
<td> <td>
<button type="button" class="btn btn-primary invoice-btn" ng-click="searchboxService.searchInvoice()">查询</button> <button type="button" class="btn btn-primary invoice-btn" ng-click="searchboxService.searchInvoice()">{{'Query' | translate }}</button>
</td> </td>
<td> <td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起</span></span></a> <a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td> </td>
</tr> </tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<td> <td>
<span class="lbl-name"> <span class="lbl-name">
<!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>--> <!--<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起查询</span></span></a>-->
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">更多查询</span></span></a> <a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()" ng-show="!hasShowMoreSearchBox"><span><i class="fa fa-chevron-down" aria-hidden="true"></i><span style="margin-left:3px;">{{'MoreQuery' | translate }}</span></span></a>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</td> </td>
<td> <td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">收起</span></span></a> <a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()" ng-show="hasShowMoreSearchBox"><span><i class="fa fa-chevron-up" aria-hidden="true"></i><span style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td> </td>
</tr> </tr>
......
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
</td> </td>
<td ng-show="!hasShowMoreSearchBox"> <td ng-show="!hasShowMoreSearchBox">
<button type="button" class="btn btn-primary invoice-btn" <button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.search()">查询 ng-click="searchboxService.search()">{{'Query' | translate }}
</button> </button>
</td> </td>
<td ng-show="!hasShowMoreSearchBox"> <td ng-show="!hasShowMoreSearchBox">
<button type="button" class="btn btn-primary invoice-btn" <button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.resetBox()">重置 ng-click="searchboxService.resetBox()">{{'Reset' | translate }}
</button> </button>
</td> </td>
<td ng-show="!hasShowMoreSearchBox"> <td ng-show="!hasShowMoreSearchBox">
<span class="lbl-name"> <span class="lbl-name">
<a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()"><span><i <a href="javacript:void(0)" ng-click="searchboxService.showOrHideSearchBox()"><span><i
class="fa fa-chevron-down" aria-hidden="true"></i><span class="fa fa-chevron-down" aria-hidden="true"></i><span
style="margin-left:3px;">更多查询</span></span></a> style="margin-left:3px;">{{'MoreQuery' | translate }}多查询</span></span></a>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -69,18 +69,18 @@ ...@@ -69,18 +69,18 @@
<td> <td>
<button type="button" class="btn btn-primary invoice-btn" <button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.search()">查询 ng-click="searchboxService.search()">{{'Query' | translate }}
</button> </button>
</td> </td>
<td> <td>
<button type="button" class="btn btn-primary invoice-btn" <button type="button" class="btn btn-primary invoice-btn"
ng-click="searchboxService.resetBox()">重置 ng-click="searchboxService.resetBox()">{{'Reset' | translate }}
</button> </button>
</td> </td>
<td> <td>
<a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()"> <a href="javascript:void(0);" ng-click="searchboxService.showOrHideSearchBox()">
<span><i class="fa fa-chevron-up" aria-hidden="true"></i><span <span><i class="fa fa-chevron-up" aria-hidden="true"></i><span
style="margin-left:3px;">收起</span></span></a> style="margin-left:3px;">{{'Collapse' | translate }}</span></span></a>
</td> </td>
</tr> </tr>
......
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