Skip to content

T
traffic-front
Commit e7c526d4 authored by zhkwei's avatar zhkwei
Browse files
Options

CIT分配表的生成，固资的生成

parent b3f395d4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 494 additions and 66 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/JxlsUtils.java
View file @ e7c526d4
......@@ -27,6 +27,7 @@ import java.util.*;
*/
public class JxlsUtils {
private static final Logger log = LoggerFactory.getLogger(JxlsUtils.class);
public static String sheetName = "汇总表";
public static void toPackageOs(HttpServletResponse response , String fileName) {
ResponseUtil.response(response, fileName, null);
......@@ -81,8 +82,8 @@ public class JxlsUtils {
AreaBuilder areaBuilder = new XlsCommentAreaBuilder(trans);
List<Area> areaList = areaBuilder.build();
areaList.get(0).applyAt(new CellRef("汇总表!A1"), context);
//"汇总表!A1"
areaList.get(0).applyAt(new CellRef( sheetName + "!A1"), context);
try {
trans.write();
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportController.java
View file @ e7c526d4
......@@ -86,6 +86,26 @@ public class CitReportController {
}
}
/**
* 生成CIT固资损失计算
* @return
*/
@RequestMapping(value = "generateAssetEamMapping", method = RequestMethod.POST)
public @ResponseBody ApiResultDto generateAssetEamMapping(@RequestBody CitAssetsListDto citAssetsListDto) {
ApiResultDto apiResultDto = new ApiResultDto();
try{
apiResultDto.setCode(1);
apiResultDto.setMessage("生成成功");
apiResultDto.setData(citReportService.generateAssetEamMapping(citAssetsListDto));
return apiResultDto;
}catch(Exception e){
e.printStackTrace();
apiResultDto.setCode(0);
apiResultDto.setMessage("生成失败");
return apiResultDto;
}
}
/**
* 获取当前卡片所拥有的模板
* @param projectId
......
atms-api/src/main/java/pwc/taxtech/atms/dto/CitDistributionDto.java
View file @ e7c526d4
......@@ -229,6 +229,37 @@ public class CitDistributionDto implements Serializable {
private PagingDto pageInfo;
//营业收入合计变量
private BigDecimal totalBusinessIncome;
//职工薪酬合计变量
private BigDecimal totalEmployeeRemuneration;
//资产总额合计变量
private BigDecimal totalTotalAssets;
public BigDecimal getTotalBusinessIncome() {
return totalBusinessIncome;
}
public void setTotalBusinessIncome(BigDecimal totalBusinessIncome) {
this.totalBusinessIncome = totalBusinessIncome;
}
public BigDecimal getTotalEmployeeRemuneration() {
return totalEmployeeRemuneration;
}
public void setTotalEmployeeRemuneration(BigDecimal totalEmployeeRemuneration) {
this.totalEmployeeRemuneration = totalEmployeeRemuneration;
}
public BigDecimal getTotalTotalAssets() {
return totalTotalAssets;
}
public void setTotalTotalAssets(BigDecimal totalTotalAssets) {
this.totalTotalAssets = totalTotalAssets;
}
public PagingDto getPageInfo() {
return pageInfo;
}
......
atms-api/src/main/java/pwc/taxtech/atms/dto/TableRule.java
View file @ e7c526d4
......@@ -28,6 +28,7 @@ public class TableRule {
map.put("CITZCFZB", "cit_balance_sheet_prc_adjust");
map.put("CITLRB", "cit_profit_prc_adjust");
map.put("CIT_TBAM", "cit_tbam");
map.put("cit_asset_eam_mapping", "cit_asset_eam_mapping");
}
}
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ e7c526d4
......@@ -41,11 +41,21 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator>
<table tableName="operation_log_entry_log" domainObjectName="OperationLogEntryLog">
<table tableName="cit_asset_eam_mapping" domainObjectName="CitAssetEamMapping">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<!--<table tableName="cit_distribution" domainObjectName="CitDistribution">-->
<!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
<!--</table>-->
<!--<table tableName="operation_log_entry_log" domainObjectName="OperationLogEntryLog">-->
<!--<property name="useActualColumnNames" value="false"/>-->
<!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
<!--</table>-->
<!--<table tableName="organization" domainObjectName="Organization">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetEamMappingMapper.java 0 → 100644
View file @ e7c526d4
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.CitAssetEamMapping;
import pwc.taxtech.atms.entity.CitAssetEamMappingExample;
@Mapper
public interface CitAssetEamMappingMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
long countByExample(CitAssetEamMappingExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int deleteByExample(CitAssetEamMappingExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int insert(CitAssetEamMapping record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int insertSelective(CitAssetEamMapping record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
List<CitAssetEamMapping> selectByExampleWithRowbounds(CitAssetEamMappingExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
List<CitAssetEamMapping> selectByExample(CitAssetEamMappingExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
CitAssetEamMapping selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") CitAssetEamMapping record, @Param("example") CitAssetEamMappingExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int updateByExample(@Param("record") CitAssetEamMapping record, @Param("example") CitAssetEamMappingExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CitAssetEamMapping record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_asset_eam_mapping
*
* @mbg.generated
*/
int updateByPrimaryKey(CitAssetEamMapping record);
int insertBatch(List<CitAssetEamMapping> citAssetEamMappings);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetsListMapper.java
View file @ e7c526d4
......@@ -6,8 +6,8 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.CitAssetDetailResultDto;
import pwc.taxtech.atms.dpo.CitAssetEamMappingDto;
import pwc.taxtech.atms.dpo.CitAssetSumDataDto;
import pwc.taxtech.atms.entity.CitAssetEamMapping;
import pwc.taxtech.atms.entity.CitAssetsList;
import pwc.taxtech.atms.entity.CitAssetsListExample;
......@@ -117,7 +117,7 @@ public interface CitAssetsListMapper extends MyMapper {
* @param citAsset
* @return Result<XxxxDO>
*/
List<CitAssetEamMappingDto> getAssetEamMapping(CitAssetsList citAsset);
List<CitAssetEamMapping> getAssetEamMapping(CitAssetsList citAsset);
List<CitAssetDetailResultDto> getCitAssetDetialResult(@Param("assetType") Integer assetType,
@Param("assetDetailType") Integer assetDetailType);
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/CitAssetEamMappingDto.java deleted 100644 → 0
View file @ b3f395d4
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;
}
}
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitAssetEamMappingExtendsMapper.xml 0 → 100644
View file @ e7c526d4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CitAssetEamMappingMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into cit_asset_eam_mapping
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<choose>
<when test="item.id != null">#{item.id,jdbcType=BIGINT},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.assetNumber != null">#{item.assetNumber,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.serialNumber != null">#{item.serialNumber,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.assetGroupName != null">#{item.assetGroupName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.assetDetailGroupId != null">#{item.assetDetailGroupId,jdbcType=BIGINT},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.assetDescription != null">#{item.assetDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.buyDate != null">#{item.buyDate,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.depreciationDate != null">#{item.depreciationDate,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.depreciationPeriod != null">#{item.depreciationPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.acquisitionValue != null">#{item.acquisitionValue,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.adjustmentValue != null">#{item.adjustmentValue,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.disposedDate != null">#{item.disposedDate,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.residualRate != null">#{item.residualRate,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.yearDepreciationAmount != null">#{item.yearDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.yearAdjustmentAmount != null">#{item.yearAdjustmentAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.yearEndValue != null">#{item.yearEndValue,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.status != null">#{item.status,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.accountAcquisitionValue != null">#{item.accountAcquisitionValue,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.accountMonthDepreciationAmount != null">#{item.accountMonthDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.accountYearDepreciationAmount != null">#{item.accountYearDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.accountTotalDepreciationAmount != null">#{item.accountTotalDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxDepreciationPeriod != null">#{item.taxDepreciationPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxToLastYearDepreciationPeriod != null">#{item.taxToLastYearDepreciationPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxToCurrentYearDepreciationPeriod != null">#{item.taxToCurrentYearDepreciationPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxYearDepreciationPeriod != null">#{item.taxYearDepreciationPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxMonthDepreciationAmount != null">#{item.taxMonthDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxToCurrentYearDepreciationAmount != null">#{item.taxToCurrentYearDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxCurrentYearDepreciationAmount != null">#{item.taxCurrentYearDepreciationAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.totalDifferenceAmount != null">#{item.totalDifferenceAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.yearDifferenceAmount != null">#{item.yearDifferenceAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.isRetain != null">#{item.isRetain,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.assetType != null">#{item.assetType,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.taxAccountCompare != null">#{item.taxAccountCompare,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxGroupName != null">#{item.taxGroupName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.scrapType != null">#{item.scrapType,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.compensationSaleAmount != null">#{item.compensationSaleAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.saleAmount != null">#{item.saleAmount,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.disposalProfitAndLoss != null">#{item.disposalProfitAndLoss,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.taxNetValue != null">#{item.taxNetValue,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.disposalTaxBenefit != null">#{item.disposalTaxBenefit,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
</trim>
</foreach>;
SELECT 1 FROM DUAL;
</insert>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitAssetsListExtendsMapper.xml
View file @ e7c526d4
......@@ -2,7 +2,7 @@
<!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">
<resultMap id="assetEamMap" type="pwc.taxtech.atms.dpo.CitAssetEamMappingDto">
<resultMap id="assetEamMap" type="pwc.taxtech.atms.entity.CitAssetEamMapping">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -218,7 +218,8 @@
<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='完全报废'
from assets_list join cit_eam_assets_disposal on serial_number = asset_label_number
where scrap_type='完全报废' and assets_list.project_id = #{projectId,jdbcType=VARCHAR}
</select>
<resultMap id="citAssetDetailResultDto" type="pwc.taxtech.atms.dpo.CitAssetDetailResultDto">
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ e7c526d4
......@@ -1148,5 +1148,6 @@
"TotalAssets": "Total Assets",
"DistributionRatio": "Distribution Ratio",
"DistributionAmount": "Distribution Amount",
"Subtotal": "Total"
"Subtotal": "Total",
"AssetEamMapping": "Asset Eam Mapping"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ e7c526d4
......@@ -1201,7 +1201,8 @@
"EmployeeRemuneration": "职工薪酬",
"TotalAssets": "资产总额",
"DistributionRatio": "分配比例",
"DistributionAmount": "分配税额"
"DistributionAmount": "分配税额",
"AssetEamMapping": "固资损失计算"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ e7c526d4
......@@ -245,6 +245,18 @@
});
};
$scope.startCalculateData = function () {
citReportService.generateAssetEamMapping($scope.queryParams).success(function (data) {
debugger;
loadJournalEntryDataFromDB(1);
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
// return;
// }
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
(function initialize() {
$log.debug('VatPreviewInputInvoiceController.ctor()...');
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ e7c526d4
<div class="cit-asset-eam-mapping" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<div class="nav-wrapper">
<div class="nav-header">{{'AssetEamMapping' | translate}}</div>
<div class="nav-tab">
<span style="width: auto" ng-click="startCalculateData()">{{'startCaculateData' | translate}}</span>
<span ng-click="downloadJE()" style="float: right;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
</div>
<div class="top-area-wrapper" style="margin-top: 10px;display: none">
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ e7c526d4
......@@ -163,3 +163,41 @@
width: 217px;
}
}
.nav-wrapper {
padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
}
.nav-tab {
/*display: inline-block;*/
span {
display: inline-block;
height: 34px;
width: 80px;
text-align: center;
line-height: 34px;
padding: 0 10px;
background-color: #B90808;
color: #FFF;
font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal;
font-size: 14px;
cursor: pointer;
}
.active {
background-color: #F91000;
}
}
}
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ e7c526d4
......@@ -9,6 +9,10 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.totalBusinessIncome = 0;
$scope.totalEmployeeRemuneration = 0;
$scope.totalTotalAssets = 0;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -25,11 +29,9 @@
pageInfo: {},
periodStart: '',
periodEnd: '',
subjectCode: null,
subjectName: null,
orgCode: null,
orgName: null,
documentDate: null,
totalBusinessIncome: $scope.totalBusinessIncome,
totalEmployeeRemuneration:$scope.totalEmployeeRemuneration,
totalTotalAssets:$scope.totalEmployeeRemuneration,
projectId: vatSessionService.project.id
};
};
......@@ -40,12 +42,21 @@
$scope.curJournalEntryPage = pageIndex;
//初始化查询信息
$scope.queryParams.pageInfo = {
totalCount: $scope.queryJournalEntryResult.pageInfo.totalCount,
pageIndex: pageIndex,
pageSize: $scope.queryJournalEntryResult.pageInfo.pageSize,
totalPage: 0
$scope.queryParams = {
pageInfo: {
totalCount: $scope.queryJournalEntryResult.pageInfo.totalCount,
pageIndex: pageIndex,
pageSize: $scope.queryJournalEntryResult.pageInfo.pageSize,
totalPage: 0
},
periodStart: '',
periodEnd: '',
totalBusinessIncome: $scope.totalBusinessIncome,
totalEmployeeRemuneration:$scope.totalEmployeeRemuneration,
totalTotalAssets:$scope.totalEmployeeRemuneration,
projectId: vatSessionService.project.id
};
$scope.getDataFromDatabase($scope.queryParams);
};
......@@ -146,21 +157,21 @@
removeItem.forEach(function (v) {
$scope.queryParams[v] = null;
if ($scope.queryParams.subjectCode === null) {
$scope.queryParams.subjectCode = '';
}
if ($scope.queryParams.subjectName === null) {
$scope.queryParams.subjectName = '';
}
if ($scope.queryParams.orgCode === null) {
$scope.queryParams.orgCode = '';
}
if ($scope.queryParams.orgName === null) {
$scope.queryParams.orgName = '';
}
if ($scope.queryParams.documentDate === null) {
$scope.queryParams.documentDate = '';
}
// if ($scope.queryParams.subjectCode === null) {
// $scope.queryParams.subjectCode = '';
// }
// if ($scope.queryParams.subjectName === null) {
// $scope.queryParams.subjectName = '';
// }
// if ($scope.queryParams.orgCode === null) {
// $scope.queryParams.orgCode = '';
// }
// if ($scope.queryParams.orgName === null) {
// $scope.queryParams.orgName = '';
// }
// if ($scope.queryParams.documentDate === null) {
// $scope.queryParams.documentDate = '';
// }
});
}
......@@ -247,6 +258,10 @@
$scope.startCalculateData = function () {
citReportService.generateDistributionTable($scope.queryParams).success(function (data) {
debugger;
$scope.totalBusinessIncome = data.data.totalBusinessIncome;
$scope.totalEmployeeRemuneration = data.data.totalEmployeeRemuneration;
$scope.totalTotalAssets = data.data.totalTotalAssets;
loadJournalEntryDataFromDB(1);
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
......@@ -283,7 +298,7 @@
loadJournalEntryDataFromDB(1);
});
//格式化Grid
$scope.gridOptions = {
rowHeight: constant.UIGrid.rowHeight,
showColumnFooter: true,
......@@ -296,17 +311,17 @@
columnDefs: [
{ name: $translate.instant('TaxPayerNumber'), width: 250, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxPayerNumber}}<span></div>' },
{ name: $translate.instant('OrgName'), width: 350,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents">$translate.instant("Subtotal"): </div>'},
, footerCellTemplate: '<div class="ui-grid-cell-contents" translate="Subtotal"> </div>'},
{ name: $translate.instant('BusinessIncome'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.businessIncome}}</span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
, footerCellTemplate: '<div class="ui-grid-cell-contents">'+$scope.totalBusinessIncome+'</div>'},
{ name: $translate.instant('EmployeeRemuneration'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.employeeRemuneration}}</span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
, footerCellTemplate: '<div class="ui-grid-cell-contents">'+$scope.totalEmployeeRemuneration+'</div>'},
{ name: $translate.instant('TotalAssets'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.totalAssets}}</span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
, footerCellTemplate: '<div class="ui-grid-cell-contents">'+$scope.totalTotalAssets+'</div>'},
{ name: $translate.instant('DistributionRatio'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.distributionRatio}}</span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
{ name: $translate.instant('DistributionAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.distributionAmount}}</span></div>'
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
, footerCellTemplate: '<div class="ui-grid-cell-contents"><span>100<span></div>'},
// { name: $translate.instant('DistributionAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.distributionAmount}}</span></div>'
// , footerCellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.orgName}}<span></div>'},
]
};
......
atms-web/src/main/webapp/app/common/webservices/citReport.svc.js
View file @ e7c526d4
......@@ -211,6 +211,13 @@
return $http.get('/Report/deleteAttach?id=' + id, apiConfig.create(config));
},
/**
生成固定资产及EAM对应的数据
*/
generateAssetEamMapping : function(citAssetsListDto){
debugger;
return $http.post('/citReport/generateAssetEamMapping', citAssetsListDto, apiConfig.create());
},
/**
获取固定资产及EAM对应的数据
*/
......
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