Skip to content

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

CIT所得税分配表

parent ad252e85
Show whitespace changes
Inline Side-by-side
Showing with 1572 additions and 36 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportController.java
View file @ d78e0abc
......@@ -9,10 +9,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.constant.enums.EnumServiceType;
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.*;
import pwc.taxtech.atms.dto.vatdto.ManualDataSourceDto;
import pwc.taxtech.atms.dto.vatdto.PeriodJobDto;
import pwc.taxtech.atms.dto.vatdto.ReportDataDto;
......@@ -69,6 +66,28 @@ public class CitReportController {
return ResponseEntity.ok(citReportService.generateCitData(projectId, EnumServiceType.CIT, mergeManual,0,null, generator));
}
/**
* 生成CIT总分机构分配表
* @param projectId
* @return
*/
@RequestMapping(value = "generateDistributionTable/{projectId}", method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ApiResultDto generateDistributionTable(@PathVariable String projectId) {
ApiResultDto apiResultDto = new ApiResultDto();
try{
apiResultDto.setCode(1);
apiResultDto.setMessage("生成成功");
apiResultDto.setData(citReportService.generateTotalBranchOrgDisTable(projectId));
return apiResultDto;
}catch(Exception e){
e.printStackTrace();
apiResultDto.setCode(0);
apiResultDto.setMessage("生成失败");
return apiResultDto;
}
}
/**
* 获取当前卡片所拥有的模板
* @param projectId
......@@ -140,18 +159,18 @@ public class CitReportController {
/**
* 获取 企业所得税汇总纳税分支机构所得税分配表（A202000）
* @param citAssetsListDto
* @param citDistributionDto
* @return
*/
@RequestMapping(value = "/getCitDistribution", method = RequestMethod.POST)
@RequestMapping(value = "/getDistributionTables", method = RequestMethod.POST)
public @ResponseBody
ApiResultDto getCitDistribution(@RequestBody CitAssetsListDto citAssetsListDto){
ApiResultDto getCitDistribution(@RequestBody CitDistributionDto citDistributionDto){
logger.info("获取 企业所得税汇总纳税分支机构所得税分配表 的数据");
ApiResultDto apiResultDto = new ApiResultDto();
try{
apiResultDto.setCode(1);
apiResultDto.setMessage("获取成功");
apiResultDto.setData(citReportService.getAssetEamMappingPage(citAssetsListDto));
apiResultDto.setData(citReportService.getCitDistribution(citDistributionDto));
return apiResultDto;
}catch(Exception e){
e.printStackTrace();
......
atms-api/src/main/java/pwc/taxtech/atms/dto/CitDistributionDto.java 0 → 100644
View file @ d78e0abc
package pwc.taxtech.atms.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.util.PwCIdSerialize;
import pwc.taxtech.atms.dpo.PagingDto;
import pwc.taxtech.atms.entity.BaseEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table cit_distribution
*
* @mbg.generated do_not_delete_during_merge
*/
public class CitDistributionDto implements Serializable {
/**
* Database Column Remarks:
* 唯一编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.id
*
* @mbg.generated
*/
@JsonSerialize(using = PwCIdSerialize.class)
private Long id;
/**
* Database Column Remarks:
* 机构编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.organization_id
*
* @mbg.generated
*/
private String organizationId;
/**
* Database Column Remarks:
* 项目ID
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.project_id
*
* @mbg.generated
*/
private String projectId;
/**
* Database Column Remarks:
* 数据日期
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.date
*
* @mbg.generated
*/
private Date date;
/**
* Database Column Remarks:
* 来源
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.source
*
* @mbg.generated
*/
private String source;
/**
* Database Column Remarks:
* 期间 yyyymm(区分卡片年份的期间，系统设计要求必有字段)
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 季度
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.quarter
*
* @mbg.generated
*/
private Integer quarter;
/**
* Database Column Remarks:
* 纳税人识别号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.tax_payer_number
*
* @mbg.generated
*/
private String taxPayerNumber;
/**
* Database Column Remarks:
* 机构名称
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.org_name
*
* @mbg.generated
*/
private String orgName;
/**
* Database Column Remarks:
* 营业收入
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.business_income
*
* @mbg.generated
*/
private BigDecimal businessIncome;
/**
* Database Column Remarks:
* 职工薪酬
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.employee_remuneration
*
* @mbg.generated
*/
private BigDecimal employeeRemuneration;
/**
* Database Column Remarks:
* 资产总额
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.total_assets
*
* @mbg.generated
*/
private BigDecimal totalAssets;
/**
* Database Column Remarks:
* 分配比例
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.distribution_ratio
*
* @mbg.generated
*/
private BigDecimal distributionRatio;
/**
* Database Column Remarks:
* 分配比例公式
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.distribution_ratio_formula
*
* @mbg.generated
*/
private String distributionRatioFormula;
/**
* Database Column Remarks:
* 分配所得税额
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.distribution_amount
*
* @mbg.generated
*/
private BigDecimal distributionAmount;
/**
* Database Column Remarks:
* 分配所得税额公式
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.distribution_amount_formula
*
* @mbg.generated
*/
private String distributionAmountFormula;
/**
* Database Column Remarks:
* 创建人
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.create_by
*
* @mbg.generated
*/
private String createBy;
/**
* Database Column Remarks:
* 创建时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.create_time
*
* @mbg.generated
*/
private Date createTime;
/**
* Database Column Remarks:
* 更新时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_distribution.update_time
*
* @mbg.generated
*/
private Date updateTime;
private PagingDto pageInfo;
public PagingDto getPageInfo() {
return pageInfo;
}
public void setPageInfo(PagingDto pageInfo) {
this.pageInfo = pageInfo;
}
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_distribution
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.id
*
* @return the value of cit_distribution.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.id
*
* @param id the value for cit_distribution.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.organization_id
*
* @return the value of cit_distribution.organization_id
*
* @mbg.generated
*/
public String getOrganizationId() {
return organizationId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.organization_id
*
* @param organizationId the value for cit_distribution.organization_id
*
* @mbg.generated
*/
public void setOrganizationId(String organizationId) {
this.organizationId = organizationId == null ? null : organizationId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.project_id
*
* @return the value of cit_distribution.project_id
*
* @mbg.generated
*/
public String getProjectId() {
return projectId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.project_id
*
* @param projectId the value for cit_distribution.project_id
*
* @mbg.generated
*/
public void setProjectId(String projectId) {
this.projectId = projectId == null ? null : projectId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.date
*
* @return the value of cit_distribution.date
*
* @mbg.generated
*/
public Date getDate() {
return date;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.date
*
* @param date the value for cit_distribution.date
*
* @mbg.generated
*/
public void setDate(Date date) {
this.date = date;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.source
*
* @return the value of cit_distribution.source
*
* @mbg.generated
*/
public String getSource() {
return source;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.source
*
* @param source the value for cit_distribution.source
*
* @mbg.generated
*/
public void setSource(String source) {
this.source = source == null ? null : source.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.period
*
* @return the value of cit_distribution.period
*
* @mbg.generated
*/
public Integer getPeriod() {
return period;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.period
*
* @param period the value for cit_distribution.period
*
* @mbg.generated
*/
public void setPeriod(Integer period) {
this.period = period;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.quarter
*
* @return the value of cit_distribution.quarter
*
* @mbg.generated
*/
public Integer getQuarter() {
return quarter;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.quarter
*
* @param quarter the value for cit_distribution.quarter
*
* @mbg.generated
*/
public void setQuarter(Integer quarter) {
this.quarter = quarter;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.tax_payer_number
*
* @return the value of cit_distribution.tax_payer_number
*
* @mbg.generated
*/
public String getTaxPayerNumber() {
return taxPayerNumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.tax_payer_number
*
* @param taxPayerNumber the value for cit_distribution.tax_payer_number
*
* @mbg.generated
*/
public void setTaxPayerNumber(String taxPayerNumber) {
this.taxPayerNumber = taxPayerNumber == null ? null : taxPayerNumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.org_name
*
* @return the value of cit_distribution.org_name
*
* @mbg.generated
*/
public String getOrgName() {
return orgName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.org_name
*
* @param orgName the value for cit_distribution.org_name
*
* @mbg.generated
*/
public void setOrgName(String orgName) {
this.orgName = orgName == null ? null : orgName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.business_income
*
* @return the value of cit_distribution.business_income
*
* @mbg.generated
*/
public BigDecimal getBusinessIncome() {
return businessIncome;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.business_income
*
* @param businessIncome the value for cit_distribution.business_income
*
* @mbg.generated
*/
public void setBusinessIncome(BigDecimal businessIncome) {
this.businessIncome = businessIncome;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.employee_remuneration
*
* @return the value of cit_distribution.employee_remuneration
*
* @mbg.generated
*/
public BigDecimal getEmployeeRemuneration() {
return employeeRemuneration;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.employee_remuneration
*
* @param employeeRemuneration the value for cit_distribution.employee_remuneration
*
* @mbg.generated
*/
public void setEmployeeRemuneration(BigDecimal employeeRemuneration) {
this.employeeRemuneration = employeeRemuneration;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.total_assets
*
* @return the value of cit_distribution.total_assets
*
* @mbg.generated
*/
public BigDecimal getTotalAssets() {
return totalAssets;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.total_assets
*
* @param totalAssets the value for cit_distribution.total_assets
*
* @mbg.generated
*/
public void setTotalAssets(BigDecimal totalAssets) {
this.totalAssets = totalAssets;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.distribution_ratio
*
* @return the value of cit_distribution.distribution_ratio
*
* @mbg.generated
*/
public BigDecimal getDistributionRatio() {
return distributionRatio;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.distribution_ratio
*
* @param distributionRatio the value for cit_distribution.distribution_ratio
*
* @mbg.generated
*/
public void setDistributionRatio(BigDecimal distributionRatio) {
this.distributionRatio = distributionRatio;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.distribution_ratio_formula
*
* @return the value of cit_distribution.distribution_ratio_formula
*
* @mbg.generated
*/
public String getDistributionRatioFormula() {
return distributionRatioFormula;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.distribution_ratio_formula
*
* @param distributionRatioFormula the value for cit_distribution.distribution_ratio_formula
*
* @mbg.generated
*/
public void setDistributionRatioFormula(String distributionRatioFormula) {
this.distributionRatioFormula = distributionRatioFormula == null ? null : distributionRatioFormula.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.distribution_amount
*
* @return the value of cit_distribution.distribution_amount
*
* @mbg.generated
*/
public BigDecimal getDistributionAmount() {
return distributionAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.distribution_amount
*
* @param distributionAmount the value for cit_distribution.distribution_amount
*
* @mbg.generated
*/
public void setDistributionAmount(BigDecimal distributionAmount) {
this.distributionAmount = distributionAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.distribution_amount_formula
*
* @return the value of cit_distribution.distribution_amount_formula
*
* @mbg.generated
*/
public String getDistributionAmountFormula() {
return distributionAmountFormula;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.distribution_amount_formula
*
* @param distributionAmountFormula the value for cit_distribution.distribution_amount_formula
*
* @mbg.generated
*/
public void setDistributionAmountFormula(String distributionAmountFormula) {
this.distributionAmountFormula = distributionAmountFormula == null ? null : distributionAmountFormula.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.create_by
*
* @return the value of cit_distribution.create_by
*
* @mbg.generated
*/
public String getCreateBy() {
return createBy;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.create_by
*
* @param createBy the value for cit_distribution.create_by
*
* @mbg.generated
*/
public void setCreateBy(String createBy) {
this.createBy = createBy == null ? null : createBy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.create_time
*
* @return the value of cit_distribution.create_time
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.create_time
*
* @param createTime the value for cit_distribution.create_time
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_distribution.update_time
*
* @return the value of cit_distribution.update_time
*
* @mbg.generated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_distribution.update_time
*
* @param updateTime the value for cit_distribution.update_time
*
* @mbg.generated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_distribution
*
* @mbg.generated
*/
@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(", organizationId=").append(organizationId);
sb.append(", projectId=").append(projectId);
sb.append(", date=").append(date);
sb.append(", source=").append(source);
sb.append(", period=").append(period);
sb.append(", quarter=").append(quarter);
sb.append(", taxPayerNumber=").append(taxPayerNumber);
sb.append(", orgName=").append(orgName);
sb.append(", businessIncome=").append(businessIncome);
sb.append(", employeeRemuneration=").append(employeeRemuneration);
sb.append(", totalAssets=").append(totalAssets);
sb.append(", distributionRatio=").append(distributionRatio);
sb.append(", distributionRatioFormula=").append(distributionRatioFormula);
sb.append(", distributionAmount=").append(distributionAmount);
sb.append(", distributionAmountFormula=").append(distributionAmountFormula);
sb.append(", createBy=").append(createBy);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
View file @ d78e0abc
......@@ -71,14 +71,8 @@ public class CitReportServiceImpl extends BaseService {
private PeriodTaxRuleSettingMapper periodTaxRuleSettingMapper;
@Resource
private PeriodTaxPayerReportRuleMapper periodTaxPayerReportRuleMapper;
@Resource
private PeriodEnterpriseAccountMapper periodEnterpriseAccountMapper;
@Autowired
private InputVatInvoiceMapper inputVATInvoiceMapper;
@Autowired
private OutputVatInvoiceMapper outputVATInvoiceMapper;
@Resource
private CustomsInvoiceMapper customsInvoiceMapper;
@Resource
private PeriodCellDataSourceMapper periodCellDataSourceMapper;
@Resource
......@@ -117,10 +111,6 @@ public class CitReportServiceImpl extends BaseService {
private PeriodJobMapper periodJobMapper;
@Resource
private PeriodApproveMapper periodApprovalMapper;
@Resource
RevenueConfigMapper revenueConfigMapper;
@Autowired
private HttpFileService httpFileService;
@Autowired
DidiFileUploadService didiFileUploadService;
@Resource
......@@ -133,6 +123,10 @@ public class CitReportServiceImpl extends BaseService {
private OrganizationServiceTemplateGroupMapper orgServiceTemplateGroupMapper;
@Autowired
private OrganizationMapper organizationMapper;
@Autowired
private CitBalanceSheetPrcAdjustMapper citBsPrcAdjustMapper;
@Autowired
private CitDistributionMapper citDistributionMapper;
public OperationResultDto<List<ReportDto>> getReportTemplate(String projectId, EnumServiceType serviceType, Integer period) {
......@@ -153,8 +147,8 @@ public class CitReportServiceImpl extends BaseService {
oSTGCriteria.andOrganizationIdEqualTo(organizationId);
oSTGCriteria.andServiceTypeIdEqualTo(serviceType.getCode().toString());
List<OrganizationServiceTemplateGroup> currentOrganizationServiceTemplateGroupList = orgServiceTemplateGroupMapper
.selectByExample(oSTGExample);
// List<OrganizationServiceTemplateGroup> currentOrganizationServiceTemplateGroupList = orgServiceTemplateGroupMapper
// .selectByExample(oSTGExample);
Optional<Long> tempVlaue = orgServiceTemplateGroupMapper.selectByExample(oSTGExample).stream().map(OrganizationServiceTemplateGroup::getTemplateGroupId).findFirst();
if (tempVlaue.isPresent()) {
templateGroupId = tempVlaue.get();
......@@ -761,6 +755,27 @@ public class CitReportServiceImpl extends BaseService {
return pageInfo;
}
/**
* 获取分配表的数据
*/
public PageInfo<CitDistributionDto> getCitDistribution(CitDistributionDto citDistributionDto) throws Exception {
logger.debug("获取分配表的数据");
Page page = PageHelper.startPage(citDistributionDto.getPageInfo().getPageIndex(), citDistributionDto.getPageInfo().getPageSize());
CitDistributionExample example = new CitDistributionExample();
example.createCriteria().andProjectIdEqualTo(citDistributionDto.getProjectId());
List<CitDistribution> citDistributionList = citDistributionMapper.selectByExample(example);
List<CitDistributionDto> citDistributionDtos = new ArrayList<>();
citDistributionList.stream().forEach(citDistribution -> {
CitDistributionDto temp = new CitDistributionDto();
BeanUtils.copyProperties(citDistribution, temp);
citDistributionDtos.add(temp);
});
PageInfo<CitDistributionDto> pageInfo = new PageInfo<>(citDistributionDtos);
pageInfo.setTotal(page.getTotal());
pageInfo.setPageNum(citDistributionDto.getPageInfo().getPageIndex());
return pageInfo;
}
/**
* 固资申报表导出(第二种方式)--正在使用
*
......@@ -1104,7 +1119,7 @@ public class CitReportServiceImpl extends BaseService {
} else if (!boo1 && boo2) {
sumValue = String.valueOf((Double.parseDouble(data.getKeyinData())));
}
if (StringUtils.isEmpty(cellData.getFormulaExp())){
if (StringUtils.isEmpty(cellData.getFormulaExp())) {
cellData.setFormulaExp(data.getAmount().toString());
}
cellData.setData(sumValue);
......@@ -1326,21 +1341,148 @@ public class CitReportServiceImpl extends BaseService {
}
}
private List<Organization> getTotalBranchByProjectId(String projectId){
Project project = projectMapper.selectByPrimaryKey(projectId);
Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
if(organization.getCode() == null){
/**
* 通过卡片主键（projectId）获取总分机构相关信息
*
* @param projectId
* @return
*/
private List<Organization> getTotalBranchByProjectId(String projectId) {
return null;
}else{
}
/**
* 生成总分机构分配表
*/
public Integer generateTotalBranchOrgDisTable(String projectId) {
Project project = projectMapper.selectByPrimaryKey(projectId);
//判断是不是总机构，若机构代码最后两位是00代表是总机构
if(organization.getCode().substring(organization.getCode().length()-3,organization.getCode().length()).equals("00")){
if (project.getCode() != null && project.getCode().substring(project.getCode().length() - 3, project.getCode().length()).equals("00")) {
//此时代表该机构为总机构，需要生成总分机构分配表
//获取当前卡片所在期间（就是年数）
Integer period = project.getYear();
//生成总分机构分配表 start
//1、查出所有所有分支机构
OrganizationExample example = new OrganizationExample();
example.createCriteria().andCodeLike(organization.getCode().substring(0,organization.getCode().length()-2));
example.createCriteria().andCodeLike(project.getCode().substring(0, project.getCode().length() - 2));
List<Organization> organizations = organizationMapper.selectByExample(example);
return organizations;
}else{
return null;
//2、取出各个分支机构的三项因素，并算出各个三项因素的合计
//营业收入合计变量
BigDecimal totalBusinessIncome = new BigDecimal(0.000000);
//职工薪酬合计变量
BigDecimal totalEmployeeRemuneration = new BigDecimal(0.000000);
//资产总额合计变量
BigDecimal totalTotalAssets = new BigDecimal(0.000000);
List<CitDistribution> citDistributionList = new ArrayList<>();
for (Organization org : organizations) {
//2.1 查出该机构该期间对应的卡片
ProjectExample projectExample = new ProjectExample();
projectExample.createCriteria().andOrganizationIdEqualTo(org.getId()).andYearEqualTo(period);
List<Project> projects = projectMapper.selectByExample(projectExample);
if (projects == null) {
continue;
}
CitDistribution citDistribution = new CitDistribution();
citDistribution.setId(idService.nextId());
citDistribution.setOrganizationId(org.getId());
citDistribution.setPeriod(period);
citDistribution.setProjectId(project.getId());
citDistribution.setOrgName(org.getName());
citDistribution.setTaxPayerNumber(org.getTaxPayerNumber());
//2.2 获取该机构该期间的营业收入--A101010《一版企业收入明细表》的营业收入金额C4抓取
// TODO 获取该机构该期间的营业收入
//2.3 获取该机构该期间的职工薪酬--WP008职工薪酬表的“职工薪酬”的小计项D20抓取
//2.3.1找出该卡片对应的模板组
OrganizationServiceTemplateGroupExample oSTGExample = new OrganizationServiceTemplateGroupExample();
OrganizationServiceTemplateGroupExample.Criteria oSTGCriteria = oSTGExample
.createCriteria();
oSTGCriteria.andOrganizationIdEqualTo(org.getId());
oSTGCriteria.andServiceTypeIdEqualTo("6");
List<OrganizationServiceTemplateGroup> currentOrgTemplateGroups = orgServiceTemplateGroupMapper.selectByExample(oSTGExample);
if (currentOrgTemplateGroups == null) {
citDistribution.setEmployeeRemuneration(new BigDecimal("0.000000"));
} else {
//查询出该机构对应的报表组ID
Long templateGroupId;
Optional<Long> tempVlaue = orgServiceTemplateGroupMapper.selectByExample(oSTGExample).stream().map(OrganizationServiceTemplateGroup::getTemplateGroupId).findFirst();
if (tempVlaue.isPresent()) {
templateGroupId = tempVlaue.get();
} else {
templateGroupId = 0L;
}
Map<String, Object> map = new HashMap<>();
map.put("period", 0);
map.put("projectId", project.getId());
map.put("templateGroupID", templateGroupId);
//根据条件获取到报表相关信息
List<ReportDto> collect = templateMapper.getTemplateLeftJoinReport(map).stream().
filter(reportDto -> reportDto.getTemplateCode().equals("CIT.WP008")).collect(Collectors.toList());
if (collect == null) {
citDistribution.setEmployeeRemuneration(new BigDecimal("0.000000"));
} else {
//根据报表主键和卡片查询出
PeriodCellDataExample periodCellDataExample = new PeriodCellDataExample();
periodCellDataExample.createCriteria().andProjectIdEqualTo(projects.get(0).getId()).
andReportIdEqualTo(Long.getLong(collect.get(0).getId())).andFormulaExpEqualTo("D16+D18").
andPeriodEqualTo(0);
List<PeriodCellData> periodCellData = periodCellDataMapper.selectByExample(periodCellDataExample);
if (periodCellData == null) {
citDistribution.setEmployeeRemuneration(new BigDecimal("0.000000"));
} else {
citDistribution.setEmployeeRemuneration(new BigDecimal(periodCellData.get(0).getData()));
totalEmployeeRemuneration.add(citDistribution.getEmployeeRemuneration());
}
}
}
//2.4 获取该机构该期间的资产总额--取该机构该期间的卡片的利润表（cit_profit_prc_adjust）中的数据
CitBalanceSheetPrcAdjustExample citBsExample = new CitBalanceSheetPrcAdjustExample();
citBsExample.createCriteria().andProjectIdEqualTo(projects.get(0).getId()).andItemNameEqualTo("非流动资产合计");
List<CitBalanceSheetPrcAdjust> citBalanceSheetPrcAdjusts = citBsPrcAdjustMapper.selectByExample(citBsExample);
citDistribution.setTotalAssets(citBalanceSheetPrcAdjusts.get(0).getBegBal());
totalTotalAssets.add(citBalanceSheetPrcAdjusts.get(0).getBegBal());
citDistributionList.add(citDistribution);
}
//计算各个机构的分配比例及分配税额
for (CitDistribution citDistribution : citDistributionList) {
//计算分配比例
citDistribution.setDistributionRatio(citDistribution.getBusinessIncome().divide(totalBusinessIncome).multiply(new BigDecimal("0.35")).
add(citDistribution.getEmployeeRemuneration().divide(totalEmployeeRemuneration).multiply(new BigDecimal("0.35"))).
add(citDistribution.getTotalAssets().divide(totalTotalAssets).multiply(new BigDecimal("0.30"))));
//拼写分配比例的公式
StringBuilder sb = new StringBuilder();
sb.append(citDistribution.getBusinessIncome());
sb.append("/");
sb.append(totalBusinessIncome);
sb.append("*0.35");
sb.append("+");
sb.append(citDistribution.getEmployeeRemuneration());
sb.append("/");
sb.append(totalEmployeeRemuneration);
sb.append("*0.35");
sb.append("+");
sb.append(citDistribution.getTotalAssets());
sb.append("/");
sb.append(totalTotalAssets);
sb.append("*0.30");
citDistribution.setDistributionRatioFormula(citDistribution.getBusinessIncome().toString());
// TODO 计算分配税额
// TODO 拼写分配税额的计算公式
}
citDistributionList.stream().forEach(citDistribution -> {
int insert = citDistributionMapper.insert(citDistribution);
});
}
return null;
}
}
atms-web/src/main/webapp/Scripts/module-part2.js
View file @ d78e0abc
......@@ -1019,7 +1019,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
function ($scope, $stateParams, appTranslation) {
appTranslation.load([appTranslation.cit]);
}],
template: '<cit-asset-eam-mapping></cit-asset-eam-mapping>',
template: '<cit-distribution-table></cit-distribution-table>',
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ d78e0abc
......@@ -1141,5 +1141,12 @@
"DisposalProfitAndLoss": "Disposal Profit And Loss",
"TaxNetValue": "Tax Net Value",
"DisposalTaxBenefit": "Disposal Tax Benefit",
"DistributionTable" : "Distribution Table"
"DistributionTable" : "Distribution Table",
"OrgName": "Organization Name",
"BusinessIncome": "Business Income",
"EmployeeRemuneration": "Employee Remuneration",
"TotalAssets": "Total Assets",
"DistributionRatio": "Distribution Ratio",
"DistributionAmount": "Distribution Amount",
"Subtotal": "Total"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ d78e0abc
......@@ -1195,7 +1195,13 @@
"DisposalTaxBenefit": "处置的税收损益",
"BackAdjustAmount" : "调整后金额",
"OperateDate" : "操作日期",
"DistributionTable" : "总分机构分配表"
"DistributionTable" : "总分机构分配表",
"OrgName": "机构名称",
"BusinessIncome": "营业收入",
"EmployeeRemuneration": "职工薪酬",
"TotalAssets": "资产总额",
"DistributionRatio": "分配比例",
"DistributionAmount": "分配税额"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ d78e0abc
......@@ -3,7 +3,7 @@
<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" />
<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>
<span ng-click="downloadJE()" style="float:right"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<!--<div style="margin-bottom: 8px;margin-left: 30px">-->
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js 0 → 100644
View file @ d78e0abc
vatModule.controller('citDistributionTableController', ['$rootScope','$scope', '$log', '$filter','$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'citPreviewService', 'citReportService','browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, citPreviewService, citReportService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4Year');
$scope.startMonth = vatSessionService.month;
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
var maxDate = [12, vatSessionService.project.year];
var setDate = [
[vatSessionService.project.year],
[vatSessionService.project.year]];
//初始化期间
var initPeriods = function () {
var curMonth = new Date().getMonth() + 1;
$scope.queryParams = {
pageInfo: {},
periodStart: '',
periodEnd: '',
subjectCode: null,
subjectName: null,
orgCode: null,
orgName: null,
documentDate: null,
projectId: vatSessionService.project.id
};
};
//从数据库中load数据
var loadJournalEntryDataFromDB = function (pageIndex) {
initJournalEntryPagination();
$scope.curJournalEntryPage = pageIndex;
//初始化查询信息
$scope.queryParams.pageInfo = {
totalCount: $scope.queryJournalEntryResult.pageInfo.totalCount,
pageIndex: pageIndex,
pageSize: $scope.queryJournalEntryResult.pageInfo.pageSize,
totalPage: 0
};
$scope.getDataFromDatabase($scope.queryParams);
};
$scope.getDataFromDatabase = function (queryParams){
citReportService.getAssetEamMappings(queryParams).success(function (resp) {
debugger;
if (resp.data) {
// minDate = data.
var index = 1;
resp.data.list.forEach(function (v) {
v.index = index++;
});
$scope.gridOptions.data = resp.data.list;
$scope.queryJournalEntryResult.pageInfo = resp.data;
computeJournalEntryPage();
// $scope.ledgerName = data.list[0].ledgerName;
// $scope.currencyCode = data.list[0].currencyCode;
// $scope.status = data.list[0].status;
// $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
}
});
};
//点击任意一页加载数据事件
var loadIncomeInvoiceDataByPage = function (pageIndex) {
loadJournalEntryDataFromDB(pageIndex);
};
//计算页数，创建分页栏
var computeJournalEntryPage = function () {
if ($scope.queryJournalEntryResult.pageInfo && $scope.queryJournalEntryResult.pageInfo.total > 0) {
var totalPage = parseInt($scope.queryJournalEntryResult.pageInfo.total / $scope.queryJournalEntryResult.pageInfo.pageSize);
totalPage = $scope.queryJournalEntryResult.pageInfo.totalCount % $scope.queryJournalEntryResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
//计算本页记录数
if ($scope.queryJournalEntryResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.queryJournalEntryResult.pageInfo.pageSize;
}
else {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.pageSize;
}
$scope.queryJournalEntryResult.pageInfo.totalPage = totalPage;
var createPage = $("#totalInvoicePage").createPage({
pageCount: totalPage,
current: $scope.curJournalEntryPage,
backFn: function (p) {
//单击回调方法，p是当前页码
loadIncomeInvoiceDataByPage(p);
}
});
$('#totalInvoicePage').css('display', 'inline-block');
} else {
//如果查询结果为0，则直接设置本页记录数为0
$scope.curPageItemCount = 0;
var createPage = $("#totalInvoicePage").createPage({
pageCount: 0,
current: $scope.curJournalEntryPage,
backFn: function (p) {
//单击回调方法，p是当前页码
loadIncomeInvoiceDataByPage(p);
}
});
$('#totalInvoicePage').css('display', 'inline-block');
}
};
//初始化分页信息
var initJournalEntryPagination = function () {
$scope.queryJournalEntryResult = {
list: [],
pageInfo: {
totalCount: -1,
pageIndex: 1,
pageSize: constant.pagesize,
totalPage: 0,
}
}
$scope.curJournalEntryPage = 1;
};
//将选择了的查询条件显示在grid上方
var doDataFilter = function (removeData) {
if ($scope.queryParams.periodStart > $scope.queryParams.periodEnd) {
$scope.queryParams.periodEnd = $scope.queryParams.periodStart;
}
//设置需要去掉的查询条件的值为空
if (!PWC.isNullOrEmpty(removeData)) {
var removeItem = removeData.split("|");
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 = '';
}
});
}
loadJournalEntryDataFromDB(1);
if ($scope.criteriaList.length > 6) {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
$scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
}
else {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
}
$('.filter-button').popover("hide");
};
//去掉所有的查询条件，重新load数据
var doDataFilterReset = function () {
$scope.queryParams = {
pageInfo: {},
periodStart: '',
periodEnd: '',
subjectCode: null,
subjectName: null,
orgCode: null,
orgName: null,
documentDate: null,
projectId: vatSessionService.project.id
};
$scope.queryParams.periodStart = $scope.startMonth;
$scope.queryParams.periodEnd = $scope.endMonth;
loadJournalEntryDataFromDB(1);
$('.filter-button').popover("hide");
};
var prepareSummary = function () {
// do something before show popover
};
//在popover打开时执行事件
var showPopover = function () {
$timeout(function () {
initDatePickers();
}, 500);
};
//初始化时间控件
var initDatePickers = function () {
//认证开始时间
var ele1 = $("#certificationDateStart");
ele1.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
language: region,
autoclose: true,//选中之后自动隐藏日期选择框
clearBtn: true,//清除按钮
todayBtn: false,//今日按钮
format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
ele1.datepicker("setDate", $scope.queryParams.certificationDateStart);
//认证结束时间
var ele2 = $("#certificationDateEnd");
ele2.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
language: region,
autoclose: true,//选中之后自动隐藏日期选择框
clearBtn: true,//清除按钮
todayBtn: false,//今日按钮
format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
})
ele2.datepicker("setDate", $scope.queryParams.certificationDateEnd);
};
var downloadJE = function () {
citReportService.initExportAEMData($scope.queryParams).success(function (data, status, headers) {
if(status===204){
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'A202000.xlsx');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
$scope.startCalculateData = function () {
citReportService.generateDistributionTable(vatSessionService.project.id).success(function (data, status, headers) {
loadJournalEntryDataFromDB(1);
// if(status===204){
// SweetAlert.warning("没有数据可以下载");
// return;
// }
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
(function initialize() {
$log.debug('VatPreviewInputInvoiceController.ctor()...');
$('#input-invoice-period-picker').focus(function () {
$('.filter-button').popover("hide");
});
//初始化month-picker
$('#input-invoice-period-picker').rangePicker({
minDate: minDate,
maxDate: maxDate,
setDate: setDate,
ConfirmBtnText: $translate.instant('Confirm'),
CancelBtnText: $translate.instant('ButtonCancel')
})
.on('datePicker.done', function (e, result) {
//开始月份
var startMonth = result[0][1] * 100 + result[0][0];
//结束月份
var endMonth = result[1][1] * 100 + result[1][0];
$scope.startMonth = startMonth;
$scope.endMonth = endMonth;
$scope.queryParams.periodStart = startMonth;
$scope.queryParams.periodEnd = endMonth;
loadJournalEntryDataFromDB(1);
});
$scope.gridOptions = {
rowHeight: constant.UIGrid.rowHeight,
selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
enableSorting: false,
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
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>'},
{ 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>'},
{ 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>'},
{ 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>'},
{ 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>'},
]
};
$scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset;
$scope.prepareSummary = prepareSummary;
$scope.showPopover = showPopover;
$scope.downloadJE = downloadJE;
initPeriods();
initJournalEntryPagination();
//初始化查询条件-期间范围
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.organizationId = vatSessionService.project.organizationID;
if($rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "280px";
}else{
$('.periodInput')[0].style.left = "150px";
}
loadJournalEntryDataFromDB(1);
})();
}
]);
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html 0 → 100644
View file @ d78e0abc
<div class="cit-distribution-table" id="mainPreviewDiv">
<div class="nav-wrapper">
<div class="nav-header">{{'DistributionTable' | translate}}</div>
<div class="nav-tab">
<span style="width: auto" ng-click="startCalculateData()">{{'startCaculateData' | translate}}</span>
<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>
<!--<div class="top-area-wrapper" style="margin-top: 10px">-->
<!--<span translate="DistributionTable" 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" />-->
<!--<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>
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.js 0 → 100644
View file @ d78e0abc
citModule.directive('citDistributionTable', ['$log',
function ($log) {
$log.debug('citDistributionTable.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/cit/reduction/cit-distribution-table/cit-distribution-table.html' + '?_=' + Math.random(),
scope: {},
controller: 'citDistributionTableController',
link: function ($scope, element) {
}
};
}
]);
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less 0 → 100644
View file @ d78e0abc
@import "~/app-resources/less/theme.less";
.cit-distribution-table {
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;
}
}
.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;
}
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/webservices/citReport.svc.js
View file @ d78e0abc
......@@ -225,7 +225,18 @@
initExportAEMData: function (citAssetsListDto) {
return $http.post('/citReport/exportAEMData', citAssetsListDto, apiConfig.create({ responseType: 'arraybuffer' }));
},
/**
获取所得税分配表的数据
*/
getDistributionTables : function(citAssetsListDto){
return $http.post('/citReport/getDistributionTables', citAssetsListDto, apiConfig.create());
},
/**
生成所得税分配表的
*/
generateDistributionTable : function(projectId){
return $http.post('/citReport/generateDistributionTable/' + projectId, apiConfig.create());
},
};
}]);
\ No newline at end of file
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