Skip to content

T
traffic-front
Commit 52ffcc3c authored by kevin's avatar kevin
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 984a7c44 0ec02f5a
Show whitespace changes
Inline Side-by-side
Showing with 1905 additions and 22 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
View file @ 52ffcc3c
......@@ -48,7 +48,7 @@ public class SpringContextUtil implements ApplicationContextAware {
public static InputInvoiceDao inputInvoiceDao;
public static InputInvoiceMapper inputInvoiceMapper;
public static InputVatInvoiceMapper inputVatInvoiceMapper;
public static AssetsListMapper assetsListMapper;
public static CitAssetsListMapper assetsListMapper;
public static ProjectMapper projectMapper;
public static CellDataSourceMapper cellDataSourceMapper;
public static PeriodCellDataSourceMapper periodCellDataSourceMapper;
......@@ -121,7 +121,7 @@ public class SpringContextUtil implements ApplicationContextAware {
inputVatInvoiceMapper = webApplicationContext.getBean(InputVatInvoiceMapper.class);
inputInvoiceDao = webApplicationContext.getBean(InputInvoiceDao.class);
inputInvoiceMapper = webApplicationContext.getBean(InputInvoiceMapper.class);
assetsListMapper = webApplicationContext.getBean(AssetsListMapper.class);
assetsListMapper = webApplicationContext.getBean(CitAssetsListMapper.class);
projectMapper = webApplicationContext.getBean(ProjectMapper.class);
cellDataSourceMapper = webApplicationContext.getBean(CellDataSourceMapper.class);
periodCellDataSourceMapper = webApplicationContext.getBean(PeriodCellDataSourceMapper.class);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 52ffcc3c
......@@ -225,7 +225,7 @@ public class AssetListServiceImpl extends BaseService {
importResult.setResultMsg("行数据为空或格式错误！");
}
//目前没有进行税法分类，标注状态
citAsset.setStatus(0);
// citAsset.setStatus(0);
citAssetsLists.add(citAsset);
}
......@@ -332,11 +332,15 @@ public class AssetListServiceImpl extends BaseService {
.filter(groupResult -> groupResult.getAssetName().equals(citAsset.getAssetGroupName())).collect(Collectors.toList());
//通过判断过滤后的集合来确认是否已经对该资产类别进行过分类
if(groupResults != null && groupResults.size()>0){
//目前已经进行税法分类，标注状态
citAsset.setStatus(1);
AssetDetailGroup assetDetailGroup = selectAssetDetailGroup(groupResults.get(0).getAssetDetailGroupId());
// Integer assetGroupType = selectAssetDetailGroup(groupResults.get(0).getAssetDetailGroupId()).getAssetGroupType();
//进行税务的计算
setCitAssetTaxData(citAsset,groupResults.get(0),assetDetailGroup);
}else{
//目前没有进行税法分类，标注状态
citAsset.setStatus(0);
//没有进行过分类，放入Set集合里面
assetNameSet.add(assetName);
}
......@@ -411,6 +415,7 @@ public class AssetListServiceImpl extends BaseService {
Calendar cal = Calendar.getInstance();
//设置税法分类
citAsset.setTaxGroupName(assetDetailGroup.getDetailGroupName());
citAsset.setAssetDetailGroupId(assetDetailGroup.getId());
Integer assetGroupType = assetDetailGroup.getAssetGroupType();
//获取税务折旧期限,此值根据分类查数据库带出的值不在此进行操作
citAsset.setTaxDepreciationPeriod(assetGroupResult.getTaxDepreciationPeriod());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
View file @ 52ffcc3c
......@@ -61,7 +61,7 @@ import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
public class CitReportServiceImpl extends BaseService {
private final static Logger logger = LoggerFactory.getLogger(CitReportServiceImpl.class);
private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "PC", "JXFPMX",
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR", "WPNAME", "WPTYPE", "SUM2", "RSUMIF", "QMYE"};
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR", "WPNAME", "WPTYPE", "SUM2", "RSUMIF", "QMYE", "ZC"};
@Autowired
private OrganizationServiceTemplateGroupMapper orgServiceTemplateGroupMapper;
......@@ -197,7 +197,7 @@ public class CitReportServiceImpl extends BaseService {
Workbook workbook = reportGenerator.createWorkBookByPeriodTemplate(resources.getPeriodTemplates(), genJob);
reportGenerator.addFunctionsAndContext(workbook, functions, reportGenerator.initContext(resources, periodParam));
reportGenerator.addCitFunctionsAndContext(workbook, functions, reportGenerator.initContext(resources, periodParam));
reportGenerator.setConfigAndDataToWorkBook(workbook, resources);
FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ 52ffcc3c
......@@ -538,16 +538,19 @@ public class ReportGeneratorImpl {
workbook.addToolPack(udfToolpack);
}
/**
* 注册所有的自定义方法到工作簿
* 为CIT复制的一份注册自定义公式，和上面的addFunctionsAndContext方法基本相同
* CIT 注册所有的自定义方法到工作簿
*
* @param workbook 工作簿
*/
public void addCitFunctionsAndContext(Workbook workbook, String[] functions, FormulaContext formulaContext) {
//**************************** 为CIT复制的一份注册自定义公式 ****************************
FreeRefFunction[] functionImpls = {new SGSR(formulaContext), new FSJZ(formulaContext), new ND(formulaContext),
new BB(formulaContext), new XXFP(formulaContext), new GZSD(formulaContext), new PC(formulaContext)
, new JXFPMX(formulaContext), new JXFP(formulaContext), new PSUM(formulaContext), new DFFS(formulaContext),
new JFFS(formulaContext), new WPSR(formulaContext), new WPNAME(formulaContext), new WPTYPE(formulaContext),
new SUM2(formulaContext), new RSUMIF(formulaContext), new QMYE(formulaContext)};
new SUM2(formulaContext), new RSUMIF(formulaContext), new QMYE(formulaContext), new ZC(formulaContext)}; //为CIT复制的一份注册自定义公式
//**************************** 为CIT复制的一份注册自定义公式 ****************************
UDFFinder udfs = new DefaultUDFFinder(functions, functionImpls);
UDFFinder udfToolpack = new AggregatingUDFFinder(udfs);
workbook.addToolPack(udfToolpack);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/ZC.java
View file @ 52ffcc3c
......@@ -9,6 +9,7 @@ import pwc.taxtech.atms.constant.Constant;
import pwc.taxtech.atms.constant.enums.EnumOperationType;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
import pwc.taxtech.atms.constant.enums.KeyValueConfigResultType;
import pwc.taxtech.atms.dpo.CitAssetDetailResultDto;
import pwc.taxtech.atms.dto.vatdto.AssetDetailDataSourceDto;
import pwc.taxtech.atms.vat.dpo.AssetDetailResultDto;
......@@ -53,31 +54,31 @@ public class ZC extends FunctionBase implements FreeRefFunction {
logger.debug(formulaExpression);
int curYear = formulaContext.getYear() + year;
String dbName =
SpringContextUtil.projectDao.getDbNameWithYearAndOrgId(formulaContext.getOrganizationId(), curYear);
// String dbName =
// SpringContextUtil.projectDao.getDbNameWithYearAndOrgId(formulaContext.getOrganizationId(), curYear);
List<AssetDetailResultDto> assetDetailResultDtos =
SpringContextUtil.assetsListMapper.getAssetDetialResult(dbName, assetType, assetDetailType);
List<CitAssetDetailResultDto> assetDetailResultDtos =
SpringContextUtil.assetsListMapper.getCitAssetDetialResult(assetType, assetDetailType);
List<AssetDetailDataSourceDto> dataSource = new ArrayList<>();
for (AssetDetailResultDto x : assetDetailResultDtos) {
for (CitAssetDetailResultDto x : assetDetailResultDtos) {
AssetDetailDataSourceDto assetDetailDataSourceDto = new AssetDetailDataSourceDto();
assetDetailDataSourceDto.setResultType(KeyValueConfigResultType.Accounting.getCode());
assetDetailDataSourceDto.setAssetNumber(x.getAssetsList().getAssetGroupName());
assetDetailDataSourceDto.setAssetGroupName(x.getAssetDetailGroup().getDetailGroupName());
assetDetailDataSourceDto.setAccountAcquisitionValue(FormulaHelper.roundValue(x.getAssetsList().getAccountAcquisitionValue(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setAccountMonthDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getMonthDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setAccountMonthDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getAccountMonthDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setAccountYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setAccountTotalepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTotalepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setAccountTotalepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getAccountTotalDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setYearEndValue(FormulaHelper.roundValue(x.getAssetsList().getYearEndValue(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTaxMonthDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxMonthDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTaxToCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getToCurtYearDepreciateAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTaxCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getToCurtYearDepreciateAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTaxToCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxToCurrentYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTaxCurrentYearDepreciationAmount(FormulaHelper.roundValue(x.getAssetsList().getTaxCurrentYearDepreciationAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setTotalDifferenceAmount(FormulaHelper.roundValue(x.getAssetsList().getTotalDifferenceAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setYearDifferenceAmount(FormulaHelper.roundValue(x.getAssetsList().getYearDifferenceAmount(), KeyValueConfigResultType.Accounting, null, formulaContext));
assetDetailDataSourceDto.setDepreciationPeriod(x.getAssetsList().getDepreciationPeriod());
assetDetailDataSourceDto.setTaxDepreciationPeriod(x.getAssetsList().getTaxDepreciationPeriod());
assetDetailDataSourceDto.setIsRetain(x.getAssetsList().getIsRetain());
assetDetailDataSourceDto.setIsRetain(x.getAssetsList().getIsRetain()==0?false:true);
assetDetailDataSourceDto.setDataType(dataType);
assetDetailDataSourceDto.setName(Constant.DataSourceName.AssetListDataSource);
assetDetailDataSourceDto.setOperationType(EnumOperationType.Single.getCode());
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisTaxReturnEndMapper.java 0 → 100644
View file @ 52ffcc3c
package pwc.taxtech.atms.analysis.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.MyAnalysisMapper;
import pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd;
import pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample;
@Mapper
public interface AnalysisTaxReturnEndMapper extends MyAnalysisMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
long countByExample(AnalysisTaxReturnEndExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int deleteByExample(AnalysisTaxReturnEndExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int insert(AnalysisTaxReturnEnd record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int insertSelective(AnalysisTaxReturnEnd record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
List<AnalysisTaxReturnEnd> selectByExampleWithRowbounds(AnalysisTaxReturnEndExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
List<AnalysisTaxReturnEnd> selectByExample(AnalysisTaxReturnEndExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
AnalysisTaxReturnEnd selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") AnalysisTaxReturnEnd record, @Param("example") AnalysisTaxReturnEndExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int updateByExample(@Param("record") AnalysisTaxReturnEnd record, @Param("example") AnalysisTaxReturnEndExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(AnalysisTaxReturnEnd record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
int updateByPrimaryKey(AnalysisTaxReturnEnd record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisTaxReturnEnd.java 0 → 100644
View file @ 52ffcc3c
package pwc.taxtech.atms.analysis.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import pwc.taxtech.atms.entity.BaseEntity;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table analysis_tax_return_end
*
* @mbg.generated do_not_delete_during_merge
*/
public class AnalysisTaxReturnEnd extends BaseEntity implements Serializable {
/**
* Database Column Remarks:
* 唯一编号 系统唯一编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.id
*
* @mbg.generated
*/
private Long id;
/**
* Database Column Remarks:
* 机构ID
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.organization_id
*
* @mbg.generated
*/
private String organizationId;
/**
* Database Column Remarks:
* 公司名称
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.company_name
*
* @mbg.generated
*/
private String companyName;
/**
* Database Column Remarks:
* 期间 yyyymm
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 序号 系统生成 主键，由所属期间及公司组成。 122
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.seq_no
*
* @mbg.generated
*/
private String seqNo;
/**
* Database Column Remarks:
* 返还后税种 税种 增值税申报表、企业所得税申报表及手工导入 增值税及企业所得税分别在申报表中录入，其他税种为手工导入。返还后税金自动根据手工导入的返还额计算。 返还后增值税 (增值税减增值税返还)返还后个人所得税 (员工个税加司机个税减个人所得税返还)
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.tax_group
*
* @mbg.generated
*/
private String taxGroup;
/**
* Database Column Remarks:
* 返还后税金 税金_ 增值税申报表、企业所得税申报表及手工导入 各税种对应税金。 245345.2
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.tax_amount
*
* @mbg.generated
*/
private BigDecimal taxAmount;
/**
* Database Column Remarks:
* 创建时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.create_time
*
* @mbg.generated
*/
private Date createTime;
/**
* Database Column Remarks:
* 更新时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_tax_return_end.update_time
*
* @mbg.generated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_tax_return_end.id
*
* @return the value of analysis_tax_return_end.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.id
*
* @param id the value for analysis_tax_return_end.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 analysis_tax_return_end.organization_id
*
* @return the value of analysis_tax_return_end.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 analysis_tax_return_end.organization_id
*
* @param organizationId the value for analysis_tax_return_end.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 analysis_tax_return_end.company_name
*
* @return the value of analysis_tax_return_end.company_name
*
* @mbg.generated
*/
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.company_name
*
* @param companyName the value for analysis_tax_return_end.company_name
*
* @mbg.generated
*/
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_tax_return_end.period
*
* @return the value of analysis_tax_return_end.period
*
* @mbg.generated
*/
public Integer getPeriod() {
return period;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.period
*
* @param period the value for analysis_tax_return_end.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 analysis_tax_return_end.seq_no
*
* @return the value of analysis_tax_return_end.seq_no
*
* @mbg.generated
*/
public String getSeqNo() {
return seqNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.seq_no
*
* @param seqNo the value for analysis_tax_return_end.seq_no
*
* @mbg.generated
*/
public void setSeqNo(String seqNo) {
this.seqNo = seqNo == null ? null : seqNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_tax_return_end.tax_group
*
* @return the value of analysis_tax_return_end.tax_group
*
* @mbg.generated
*/
public String getTaxGroup() {
return taxGroup;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.tax_group
*
* @param taxGroup the value for analysis_tax_return_end.tax_group
*
* @mbg.generated
*/
public void setTaxGroup(String taxGroup) {
this.taxGroup = taxGroup == null ? null : taxGroup.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_tax_return_end.tax_amount
*
* @return the value of analysis_tax_return_end.tax_amount
*
* @mbg.generated
*/
public BigDecimal getTaxAmount() {
return taxAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_tax_return_end.tax_amount
*
* @param taxAmount the value for analysis_tax_return_end.tax_amount
*
* @mbg.generated
*/
public void setTaxAmount(BigDecimal taxAmount) {
this.taxAmount = taxAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_tax_return_end.create_time
*
* @return the value of analysis_tax_return_end.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 analysis_tax_return_end.create_time
*
* @param createTime the value for analysis_tax_return_end.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 analysis_tax_return_end.update_time
*
* @return the value of analysis_tax_return_end.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 analysis_tax_return_end.update_time
*
* @param updateTime the value for analysis_tax_return_end.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 analysis_tax_return_end
*
* @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(", companyName=").append(companyName);
sb.append(", period=").append(period);
sb.append(", seqNo=").append(seqNo);
sb.append(", taxGroup=").append(taxGroup);
sb.append(", taxAmount=").append(taxAmount);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisTaxReturnEndExample.java 0 → 100644
View file @ 52ffcc3c
package pwc.taxtech.atms.analysis.entity;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class AnalysisTaxReturnEndExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public AnalysisTaxReturnEndExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNull() {
addCriterion("organization_id is null");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNotNull() {
addCriterion("organization_id is not null");
return (Criteria) this;
}
public Criteria andOrganizationIdEqualTo(String value) {
addCriterion("organization_id =", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotEqualTo(String value) {
addCriterion("organization_id <>", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThan(String value) {
addCriterion("organization_id >", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
addCriterion("organization_id >=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThan(String value) {
addCriterion("organization_id <", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
addCriterion("organization_id <=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLike(String value) {
addCriterion("organization_id like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotLike(String value) {
addCriterion("organization_id not like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdIn(List<String> values) {
addCriterion("organization_id in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotIn(List<String> values) {
addCriterion("organization_id not in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdBetween(String value1, String value2) {
addCriterion("organization_id between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotBetween(String value1, String value2) {
addCriterion("organization_id not between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andCompanyNameIsNull() {
addCriterion("company_name is null");
return (Criteria) this;
}
public Criteria andCompanyNameIsNotNull() {
addCriterion("company_name is not null");
return (Criteria) this;
}
public Criteria andCompanyNameEqualTo(String value) {
addCriterion("company_name =", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotEqualTo(String value) {
addCriterion("company_name <>", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThan(String value) {
addCriterion("company_name >", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
addCriterion("company_name >=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThan(String value) {
addCriterion("company_name <", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
addCriterion("company_name <=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLike(String value) {
addCriterion("company_name like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotLike(String value) {
addCriterion("company_name not like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameIn(List<String> values) {
addCriterion("company_name in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotIn(List<String> values) {
addCriterion("company_name not in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameBetween(String value1, String value2) {
addCriterion("company_name between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotBetween(String value1, String value2) {
addCriterion("company_name not between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
}
public Criteria andPeriodIsNotNull() {
addCriterion("period is not null");
return (Criteria) this;
}
public Criteria andPeriodEqualTo(Integer value) {
addCriterion("period =", value, "period");
return (Criteria) this;
}
public Criteria andPeriodNotEqualTo(Integer value) {
addCriterion("period <>", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThan(Integer value) {
addCriterion("period >", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("period >=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThan(Integer value) {
addCriterion("period <", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThanOrEqualTo(Integer value) {
addCriterion("period <=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodIn(List<Integer> values) {
addCriterion("period in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodNotIn(List<Integer> values) {
addCriterion("period not in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodBetween(Integer value1, Integer value2) {
addCriterion("period between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("period not between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andSeqNoIsNull() {
addCriterion("seq_no is null");
return (Criteria) this;
}
public Criteria andSeqNoIsNotNull() {
addCriterion("seq_no is not null");
return (Criteria) this;
}
public Criteria andSeqNoEqualTo(String value) {
addCriterion("seq_no =", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoNotEqualTo(String value) {
addCriterion("seq_no <>", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoGreaterThan(String value) {
addCriterion("seq_no >", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoGreaterThanOrEqualTo(String value) {
addCriterion("seq_no >=", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoLessThan(String value) {
addCriterion("seq_no <", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoLessThanOrEqualTo(String value) {
addCriterion("seq_no <=", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoLike(String value) {
addCriterion("seq_no like", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoNotLike(String value) {
addCriterion("seq_no not like", value, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoIn(List<String> values) {
addCriterion("seq_no in", values, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoNotIn(List<String> values) {
addCriterion("seq_no not in", values, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoBetween(String value1, String value2) {
addCriterion("seq_no between", value1, value2, "seqNo");
return (Criteria) this;
}
public Criteria andSeqNoNotBetween(String value1, String value2) {
addCriterion("seq_no not between", value1, value2, "seqNo");
return (Criteria) this;
}
public Criteria andTaxGroupIsNull() {
addCriterion("tax_group is null");
return (Criteria) this;
}
public Criteria andTaxGroupIsNotNull() {
addCriterion("tax_group is not null");
return (Criteria) this;
}
public Criteria andTaxGroupEqualTo(String value) {
addCriterion("tax_group =", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupNotEqualTo(String value) {
addCriterion("tax_group <>", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupGreaterThan(String value) {
addCriterion("tax_group >", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupGreaterThanOrEqualTo(String value) {
addCriterion("tax_group >=", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupLessThan(String value) {
addCriterion("tax_group <", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupLessThanOrEqualTo(String value) {
addCriterion("tax_group <=", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupLike(String value) {
addCriterion("tax_group like", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupNotLike(String value) {
addCriterion("tax_group not like", value, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupIn(List<String> values) {
addCriterion("tax_group in", values, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupNotIn(List<String> values) {
addCriterion("tax_group not in", values, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupBetween(String value1, String value2) {
addCriterion("tax_group between", value1, value2, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxGroupNotBetween(String value1, String value2) {
addCriterion("tax_group not between", value1, value2, "taxGroup");
return (Criteria) this;
}
public Criteria andTaxAmountIsNull() {
addCriterion("tax_amount is null");
return (Criteria) this;
}
public Criteria andTaxAmountIsNotNull() {
addCriterion("tax_amount is not null");
return (Criteria) this;
}
public Criteria andTaxAmountEqualTo(BigDecimal value) {
addCriterion("tax_amount =", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotEqualTo(BigDecimal value) {
addCriterion("tax_amount <>", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountGreaterThan(BigDecimal value) {
addCriterion("tax_amount >", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("tax_amount >=", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountLessThan(BigDecimal value) {
addCriterion("tax_amount <", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("tax_amount <=", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountIn(List<BigDecimal> values) {
addCriterion("tax_amount in", values, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotIn(List<BigDecimal> values) {
addCriterion("tax_amount not in", values, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("tax_amount between", value1, value2, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("tax_amount not between", value1, value2, "taxAmount");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table analysis_tax_return_end
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table analysis_tax_return_end
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetsListMapper.java
View file @ 52ffcc3c
......@@ -5,6 +5,7 @@ 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.dpo.CitAssetDetailResultDto;
import pwc.taxtech.atms.dpo.CitAssetEamMappingDto;
import pwc.taxtech.atms.entity.CitAssetsList;
import pwc.taxtech.atms.entity.CitAssetsListExample;
......@@ -116,4 +117,7 @@ public interface CitAssetsListMapper extends MyMapper {
* @return Result<XxxxDO>
*/
List<CitAssetEamMappingDto> getAssetEamMapping(CitAssetsList citAsset);
List<CitAssetDetailResultDto> getCitAssetDetialResult(@Param("assetType") Integer assetType,
@Param("assetDetailType") Integer assetDetailType);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dpo/CitAssetDetailResultDto.java 0 → 100644
View file @ 52ffcc3c
package pwc.taxtech.atms.dpo;
import pwc.taxtech.atms.entity.AssetDetailGroup;
import pwc.taxtech.atms.entity.CitAssetsList;
public class CitAssetDetailResultDto {
String id;
CitAssetsList assetsList;
AssetDetailGroup assetDetailGroup;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public CitAssetsList getAssetsList() {
return assetsList;
}
public void setAssetsList(CitAssetsList assetsList) {
this.assetsList = assetsList;
}
public AssetDetailGroup getAssetDetailGroup() {
return assetDetailGroup;
}
public void setAssetDetailGroup(AssetDetailGroup assetDetailGroup) {
this.assetDetailGroup = assetDetailGroup;
}
}
atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisTaxReturnEndMapper.xml 0 → 100644
View file @ 52ffcc3c
<?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.analysis.dao.AnalysisTaxReturnEndMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
<result column="company_name" jdbcType="VARCHAR" property="companyName" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="seq_no" jdbcType="VARCHAR" property="seqNo" />
<result column="tax_group" jdbcType="VARCHAR" property="taxGroup" />
<result column="tax_amount" jdbcType="DECIMAL" property="taxAmount" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, company_name, period, seq_no, tax_group, tax_amount, create_time,
update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from analysis_tax_return_end
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from analysis_tax_return_end
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from analysis_tax_return_end
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from analysis_tax_return_end
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into analysis_tax_return_end (id, organization_id, company_name,
period, seq_no, tax_group,
tax_amount, create_time, update_time
)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER}, #{seqNo,jdbcType=VARCHAR}, #{taxGroup,jdbcType=VARCHAR},
#{taxAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into analysis_tax_return_end
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="organizationId != null">
organization_id,
</if>
<if test="companyName != null">
company_name,
</if>
<if test="period != null">
period,
</if>
<if test="seqNo != null">
seq_no,
</if>
<if test="taxGroup != null">
tax_group,
</if>
<if test="taxAmount != null">
tax_amount,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="organizationId != null">
#{organizationId,jdbcType=VARCHAR},
</if>
<if test="companyName != null">
#{companyName,jdbcType=VARCHAR},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
<if test="seqNo != null">
#{seqNo,jdbcType=VARCHAR},
</if>
<if test="taxGroup != null">
#{taxGroup,jdbcType=VARCHAR},
</if>
<if test="taxAmount != null">
#{taxAmount,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from analysis_tax_return_end
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update analysis_tax_return_end
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.organizationId != null">
organization_id = #{record.organizationId,jdbcType=VARCHAR},
</if>
<if test="record.companyName != null">
company_name = #{record.companyName,jdbcType=VARCHAR},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
<if test="record.seqNo != null">
seq_no = #{record.seqNo,jdbcType=VARCHAR},
</if>
<if test="record.taxGroup != null">
tax_group = #{record.taxGroup,jdbcType=VARCHAR},
</if>
<if test="record.taxAmount != null">
tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update analysis_tax_return_end
set id = #{record.id,jdbcType=BIGINT},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
company_name = #{record.companyName,jdbcType=VARCHAR},
period = #{record.period,jdbcType=INTEGER},
seq_no = #{record.seqNo,jdbcType=VARCHAR},
tax_group = #{record.taxGroup,jdbcType=VARCHAR},
tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update analysis_tax_return_end
<set>
<if test="organizationId != null">
organization_id = #{organizationId,jdbcType=VARCHAR},
</if>
<if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
<if test="seqNo != null">
seq_no = #{seqNo,jdbcType=VARCHAR},
</if>
<if test="taxGroup != null">
tax_group = #{taxGroup,jdbcType=VARCHAR},
</if>
<if test="taxAmount != null">
tax_amount = #{taxAmount,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update analysis_tax_return_end
set organization_id = #{organizationId,jdbcType=VARCHAR},
company_name = #{companyName,jdbcType=VARCHAR},
period = #{period,jdbcType=INTEGER},
seq_no = #{seqNo,jdbcType=VARCHAR},
tax_group = #{taxGroup,jdbcType=VARCHAR},
tax_amount = #{taxAmount,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from analysis_tax_return_end
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitAssetsListExtendsMapper.xml
View file @ 52ffcc3c
......@@ -221,4 +221,119 @@
from assets_list join cit_eam_assets_disposal on serial_number = asset_label_number where scrap_type='完全报废'
</select>
<resultMap id="citAssetDetailResultDto" type="pwc.taxtech.atms.dpo.CitAssetDetailResultDto">
<id column="ID" jdbcType="VARCHAR" property="id"/>
<association property="assetsList" javaType="pwc.taxtech.atms.entity.CitAssetsList">
<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="scrap_type" jdbcType="VARCHAR" property="scrapType" />
</association>
<association property="assetDetailGroup" javaType="pwc.taxtech.atms.entity.AssetDetailGroup">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="asset_group_id" jdbcType="BIGINT" property="assetGroupId" />
<result column="detail_group_name" jdbcType="VARCHAR" property="detailGroupName" />
<result column="asset_group_type" jdbcType="INTEGER" property="assetGroupType" />
<result column="group_year" jdbcType="INTEGER" property="groupYear" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="detail_group_type" jdbcType="INTEGER" property="detailGroupType" />
<result column="key_values" jdbcType="VARCHAR" property="keyValues" />
</association>
</resultMap>
<select id="getCitAssetDetialResult" resultMap="citAssetDetailResultDto">
SELECT
assets_list.id AS id,
assets_list.id,
assets_list.asset_number,
assets_list.asset_group_name,
assets_list.asset_detail_group_id,
assets_list.asset_description,
assets_list.buy_date,
assets_list.depreciation_date,
assets_list.depreciation_period,
assets_list.acquisition_value,
assets_list.adjustment_value,
assets_list.disposed_date,
assets_list.residual_rate,
assets_list.year_depreciation_amount,
assets_list.year_adjustment_amount,
assets_list.year_end_value,
assets_list.status,
assets_list.account_acquisition_value,
assets_list.account_month_depreciation_amount,
assets_list.account_year_depreciation_amount,
assets_list.account_total_depreciation_amount,
assets_list.tax_depreciation_period,
assets_list.tax_to_last_year_depreciation_period,
assets_list.tax_to_current_year_depreciation_period,
assets_list.tax_year_depreciation_period,
assets_list.tax_month_depreciation_amount,
assets_list.tax_to_current_year_depreciation_amount,
assets_list.tax_current_year_depreciation_amount,
assets_list.total_difference_amount,
assets_list.year_difference_amount,
assets_list.is_retain,
assets_list.create_time,
assets_list.update_time,
assets_list.asset_type,
asset_detail_group.id,
asset_detail_group.asset_group_id,
asset_detail_group.detail_group_name,
asset_detail_group.asset_group_type,
asset_detail_group.group_year,
asset_detail_group.create_time,
asset_detail_group.update_time,
asset_detail_group.detail_group_type,
asset_detail_group.key_values
FROM
assets_list
JOIN
asset_detail_group asset_detail_group
ON
assets_list.asset_detail_group_id = asset_detail_group.id
WHERE
assets_list.asset_detail_group_id IS NOT NULL
AND assets_list.asset_type IS NOT NULL
AND assets_list.asset_type = #{assetType,jdbcType=INTEGER}
AND asset_detail_group.asset_group_type = #{assetType,jdbcType=INTEGER}
AND asset_detail_group.detail_group_type = #{assetDetailType,jdbcType=INTEGER}
</select>
</mapper>
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 52ffcc3c
......@@ -1505,12 +1505,14 @@
"Alternate2Description": "Alternate 2 Description",
"YYYY-MM": "YYYY-MM",
"profitLoss": "Profit Statement",
"profitLossPRC": "Profit Statement PRC",
"ProfitLossTitle": "Profit Statement",
"CurrentPeriodAmount": "Current Period Amount",
"ThisYearAccumulatedAmount": "This Year Accumulated Amount",
"quarterlyOwnersEquityChangeTable": "Quarterly Owners Equity Change Table",
"directMethodCashFlowStatement": "Direct Method Cash Flow Statement",
"offBalanceSheet": "Balance Sheet",
"offBalanceSheetPRC": "Balance Sheet PRC",
"OffBalanceSheetTitle": "Balance sheet",
"InitialBalance": "Beginning Balance",
"journal": "Journal Entry",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 52ffcc3c
......@@ -1989,6 +1989,7 @@
"YYYY-MM": "YYYY-MM",
"profitLoss": "利润表",
"profitLossPRC": "利润表PRC",
"ProfitLossTitle": "利润表",
"CurrentPeriodAmount": "本期发生额",
"ThisYearAccumulatedAmount": "本年累计",
......@@ -2000,6 +2001,8 @@
"DirectMethodCashFlowStatementTitle": "直接法现金流量表",
"offBalanceSheet" : "资产负债表",
"offBalanceSheetPRC": "资产负债表PRC",
"OffBalanceSheetTitle" : "资产负债表",
"InitialBalance" : "年初余额",
......
atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/fixedAssetsRuleEnginee/fixed-assets-rule-enginee.ctrl.js
View file @ 52ffcc3c
......@@ -202,8 +202,9 @@
});
};
$scope.editRow = function (data) {
$scope.editRow = function (data,type) {
debugger;
$scope.assetGroupType = type;
$scope.isEdit = true;
$scope.fixedAssetsObject = angular.copy(data)
if (data.year) {
......@@ -275,7 +276,7 @@
$("<span class='span-btn' />")
.text($translate.instant('Edit'))
.on('click', function () {
$scope.editRow(data);
$scope.editRow(data,'1');
})
.appendTo(container);
......@@ -348,7 +349,7 @@
$("<span class='span-btn' />")
.text($translate.instant('Edit'))
.on('click', function () {
$scope.editRow(data);
$scope.editRow(data,'2');
})
.appendTo(container);
......@@ -421,7 +422,7 @@
$("<span class='span-btn' />")
.text($translate.instant('Edit'))
.on('click', function () {
$scope.editRow(data);
$scope.editRow(data,'3');
})
.appendTo(container);
......
atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js
View file @ 52ffcc3c
......@@ -30,7 +30,7 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
},
{
name: 'offBalanceSheet', permission: constant.vatPermission.dataPreview.offBalanceSheet.queryCode,
text: $translate.instant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
text: $translate.inunreturned-taxstant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
},
{
name: 'journal', permission: constant.vatPermission.dataPreview.journal.queryCode,
......
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