Skip to content

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

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents 767d6509 9e466900
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1045 additions and 149 deletions
atms-api/pom.xml
View file @ 428577c0
......@@ -432,7 +432,7 @@
<profiles>
<profile>
<id>dev</id>
<activation>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
......@@ -444,6 +444,8 @@
<env>dev</env>
</properties>
</profile>
<profile>
<id>staging</id>
<build>
......
atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java
View file @ 428577c0
......@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.quartz.QuartzJobBean;
import pwc.taxtech.atms.analysis.entity.AnalysisMaster;
import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.dao.OrganizationMapper;
......@@ -61,7 +62,6 @@ public class AnalysisJob extends QuartzJobBean {
logger.info(String.format("开始分析%税种税金计算数据",period));
analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
}
}
atms-api/src/main/java/pwc/taxtech/atms/constant/TemplateHeaderCheck.java
View file @ 428577c0
......@@ -21,7 +21,7 @@ public class TemplateHeaderCheck {
};
//职工人数
public static String[] zgrs = {
"公司简称", "正式员工", "实习生", "外包", "合计"
"公司名称", "正式员工", "实习生", "外包", "合计"
};
//司机人数
public static String[] sjrs = {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 428577c0
......@@ -394,7 +394,13 @@ public class AnalysisServiceImpl extends BaseService {
//通过公司名称查询orgId
OrganizationExample example = new OrganizationExample();
example.createCriteria().andNameEqualTo(getCellStringValue(sheet.getRow(j).getCell(0)));
model.setSeqNo(getSeqNoByPeriod(organizationMapper.selectByExample(example).get(0).getId(), Integer.parseInt(periodDate)));
/* if(organizationMapper.selectByExample(example).size() == 0)
continue;*/
try{
model.setSeqNo(getSeqNoByPeriod(organizationMapper.selectByExample(example).get(0).getId(), DateUtils.strToPeriod(periodDate)));
}catch (Exception e){
System.out.println(getCellStringValue(sheet.getRow(j).getCell(0)));
}
lists.add(model);
}
AnalysisEmployeeNumExample example = new AnalysisEmployeeNumExample();
......@@ -409,6 +415,7 @@ public class AnalysisServiceImpl extends BaseService {
}catch (ServiceException se){
throw se;
}catch (Exception e){
e.printStackTrace();
throw new ServiceException(e);
}
}
......@@ -490,6 +497,12 @@ public class AnalysisServiceImpl extends BaseService {
model.setRightPublicAmount(getCellBigDecimalValue(cell2));
}
}
AnalysisMasterExample example2 = new AnalysisMasterExample();
//todo 这里先写死滴滴出行科技有限公司
example2.createCriteria().andNameEqualTo("滴滴出行科技有限公司");
List<AnalysisMaster> size = analysisMasterMapper.selectByExample(example2);
if(size.size() != 0)
model.setSeqNo(size.get(0).getSeqNo());
AnalysisDriverNumExample example = new AnalysisDriverNumExample();
example.createCriteria().andPeriodEqualTo(selectedPer);
analysisDriverNumMapper.deleteByExample(example);
......@@ -578,6 +591,12 @@ public class AnalysisServiceImpl extends BaseService {
model.setSubsidyC(getCellBigDecimalValue(sheet.getRow(j).getCell(3)));
model.setRevenue(getCellBigDecimalValue(sheet.getRow(j).getCell(4)));
model.setProfit(getCellBigDecimalValue(sheet.getRow(j).getCell(5)));
model.setRef1(getCellBigDecimalValue(sheet.getRow(j).getCell(6)));
model.setRef2(getCellBigDecimalValue(sheet.getRow(j).getCell(7)));
model.setRef3(getCellBigDecimalValue(sheet.getRow(j).getCell(8)));
model.setRef4(getCellBigDecimalValue(sheet.getRow(j).getCell(9)));
model.setRef5(getCellBigDecimalValue(sheet.getRow(j).getCell(10)));
model.setRef6(getCellBigDecimalValue(sheet.getRow(j).getCell(11)));
lists.add(model);
}
AnalysisInternationalBusinessDataExample example = new AnalysisInternationalBusinessDataExample();
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/FileTypesServiceImpl.java
View file @ 428577c0
......@@ -15,6 +15,7 @@ import pwc.taxtech.atms.entity.OperationLogFileType;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 查询
......@@ -99,7 +100,7 @@ public class FileTypesServiceImpl {
criteria.andFileTypeEqualTo(fileTypes.getFileType());
}
List<FileTypes> results = fileTypesMapper.selectByExample(example);
if (results.size() > 0) {
if (results.size() > 0 && !results.stream().map(e->e.getId()).collect(Collectors.toList()).contains(fileTypes.getId())) {
throw new RuntimeException("filetype已存在: " + fileTypes.getFileType());
}
}
......@@ -129,30 +130,25 @@ public class FileTypesServiceImpl {
@Transactional
public boolean editFilesType(FileTypes fileTypes) {
try {
//检测添加类型是否已存在,存在则返回false先(后期改进为多异常)
checkFileType(fileTypes);
//对必填字段进行转换成json对象
requiredFieldFormatToJson(fileTypes);
fileTypes.setUpdateTime(new Date());
int num = fileTypesMapper.updateByPrimaryKey(fileTypes);
if (num > 0) {
OperationLogFileType actionEntity = buildOperationLogFileType();
actionEntity.setOperationAction("更新");
actionEntity.setId(fileTypes.getId().toString());
//设置更新值
actionEntity.setUpdateState(fileTypes.toString());
boolean result = operationLogFileTypeService.addFileTypesList(actionEntity);
if (result) {
return true;
} else {
throw new RuntimeException("FileTypesServiceImpl editFilesType log error");
}
//检测添加类型是否已存在,存在则返回false先(后期改进为多异常)
checkFileType(fileTypes);
//对必填字段进行转换成json对象
requiredFieldFormatToJson(fileTypes);
fileTypes.setUpdateTime(new Date());
int num = fileTypesMapper.updateByPrimaryKey(fileTypes);
if (num > 0) {
OperationLogFileType actionEntity = buildOperationLogFileType();
actionEntity.setOperationAction("更新");
actionEntity.setId(fileTypes.getId().toString());
//设置更新值
actionEntity.setUpdateState(fileTypes.toString());
boolean result = operationLogFileTypeService.addFileTypesList(actionEntity);
if (result) {
return true;
} else {
return false;
throw new RuntimeException("FileTypesServiceImpl editFilesType log error");
}
} catch (Exception e) {
log.error("FileTypesServiceImpl editFilesType error : " + e.getMessage());
} else {
return false;
}
}
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 428577c0
......@@ -10,6 +10,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
......@@ -1613,7 +1614,7 @@ public class ReportServiceImpl extends BaseService {
ebitDataDto.setEbitRate(ebitRate + "%");
}
ebitDataDto.setSixAddTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(0.06)));
ebitDataDto.setTotalAmountTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(0.16)));
ebitDataDto.setTotalAmountTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(1.06)));
ebitDataDto.setSpecialConsiderations(specialConsiderations);
} catch (Exception e) {
e.printStackTrace();
......@@ -2356,11 +2357,9 @@ public class ReportServiceImpl extends BaseService {
if (ebitCellDataMapper.selectByExample(example1).size() != 0) {
ebitCellDataMapper.deleteByExample(example1);
}
;
for (int j = 1; j <= sheet.getLastRowNum(); j++) {
if (j <= 36)
continue;
;
for (int k = 1; k < sheet.getRow(0).getLastCellNum(); k++) {
EbitCellData ebitCellData1 = new EbitCellData();
ebitCellData1.setId(idService.nextId());
......@@ -2444,7 +2443,10 @@ public class ReportServiceImpl extends BaseService {
default:
if (i == 0)
break;
sheetAt.getRow(m).getCell(i + 1).setCellValue(getCellStringValue(sheetAt1.getRow(m).getCell(2)));
Cell cell = sheetAt.getRow(m).getCell(i + 1);
cell.setCellValue(getCellStringValue(sheetAt1.getRow(m).getCell(2)));
cell.setCellFormula("B2 + C3");
//cell.setCellType(cellStyle.getAlignment());
}
}
}
......
atms-api/src/main/resources/applicationContext-job.xml
View file @ 428577c0
......@@ -13,10 +13,12 @@
<property name="queueCapacity" value="100"/>
</bean>
<bean name="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
</bean>
<!-- quartzScheduler -->
<!-- 配置调度任务-->
<bean name="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="configLocation" value="classpath:job.properties"/>
......@@ -49,45 +51,52 @@
<property name="taskExecutor" ref="executor"/>
</bean>
<!-- 配置Job详情 -->
<!-- lgGlBalanceJob -->
<bean name="lgGlBalanceJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
<property name="jobClass" value="pwc.taxtech.atms.common.schedule.LgGlBalanceJob"/>
<property name="durability" value="true"/>
<property name="requestsRecovery" value="false"/>
<property name="description" value="科目余额数据同步"/>
</bean>
<!-- 定时任务 -->
<bean id="lgApiJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="lgGlBalanceJob"/>
<property name="cronExpression" value="0 0 1 3 * ?"/>
</bean>
<!--orgSyncJob-->
<bean name="orgSyncJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
<property name="jobClass" value="pwc.taxtech.atms.common.schedule.OrgSyncJob"/>
<property name="durability" value="true"/>
<property name="requestsRecovery" value="false"/>
<property name="description" value="机构信息同步"/>
</bean>
<!-- 每月1日执行一次-->
<bean id="orgSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="orgSyncJob"/>
<property name="cronExpression" value="0 0 0 1 * ?"/>
</bean>
<!--analysisJob-->
<bean name="analysisJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
<property name="jobClass" value="pwc.taxtech.atms.common.schedule.AnalysisJob"/>
<property name="durability" value="true"/>
<property name="requestsRecovery" value="false"/>
<property name="description" value="分析模块"/>
</bean>
<!-- 每月1日执行一次-->
<bean id="orgSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="orgSyncJob"/>
<property name="cronExpression" value="0 0 0 1 * ?"/>
</bean>
<!-- 每天凌晨一点执行一次-->
<bean id="analysisJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="analysisJob"/>
<property name="cronExpression" value="0 0 1 * * ?"/>
</bean>
<!-- 分布式事务配置 end -->
</beans>
\ No newline at end of file
atms-api/src/test/java/pwc/taxtech/atms/service/impl/AnalysisTest.java
View file @ 428577c0
......@@ -10,7 +10,9 @@ import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.entity.Organization;
import pwc.taxtech.atms.entity.OrganizationExample;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: Gary J Li
......@@ -76,23 +78,24 @@ public class AnalysisTest extends CommonIT {
analysisJobService.analysisSales(orgs,period, EnumTbImportType.CoverImport.getCode());
}
@Test
public void analysisTaxReturnEnd(){
public void analysisTax(){
Integer period = DateUtils.getPeriodNow();
OrganizationExample e = new OrganizationExample();
//e.createCriteria().andIsActiveEqualTo(true);
List<Organization> orgs = organizationMapper.selectByExample(e);
logger.info(String.format("开始分析%s返还后税数据",period));
analysisJobService.analysisTaxReturnEnd(orgs,period, EnumTbImportType.CoverImport.getCode());
analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
}
@Test
public void analysisTax(){
public void analysisTaxReturnEnd(){
Integer period = DateUtils.getPeriodNow();
OrganizationExample e = new OrganizationExample();
//e.createCriteria().andIsActiveEqualTo(true);
List<Organization> orgs = organizationMapper.selectByExample(e);
logger.info(String.format("开始分析%s返还后税数据",period));
analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
analysisJobService.analysisTaxReturnEnd(orgs,period, EnumTbImportType.CoverImport.getCode());
}
}
atms-dao/etc/generator-mysql/analysisGeneratorConfig.xml
View file @ 428577c0
......@@ -41,11 +41,10 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
</javaClientGenerator>
<table tableName="analysis_tax_return_end" domainObjectName="AnalysisTaxReturnEnd">
<table tableName="analysis_international_business_data" domainObjectName="AnalysisInternationalBusinessData">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<!--
<table tableName="analysis_actual_tax_return" domainObjectName="AnalysisInternationalTaxData">
<property name="useActualColumnNames" value="false"/>
......
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ 428577c0
......@@ -41,7 +41,7 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator>
<table tableName="cit_asset_eam_mapping" domainObjectName="CitAssetEamMapping">
<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisFileManagementMapper.java
View file @ 428577c0
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.annotations.*;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyAnalysisMapper;
import pwc.taxtech.atms.analysis.entity.AnalysisFileManagement;
......@@ -105,4 +105,6 @@ public interface AnalysisFileManagementMapper extends MyAnalysisMapper {
* @mbg.generated
*/
int updateByPrimaryKey(AnalysisFileManagement record);
@Select("#{sql}")
List<AnalysisFileManagement> getYHSsql(@Param("sql") String sql );
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisExpectedTaxReturn.java
View file @ 428577c0
......@@ -37,7 +37,7 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
/**
* Database Column Remarks:
* 预期返还后增值税 预期返还后增值税_ 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
* 预期返还后税额 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_1
......@@ -68,6 +68,39 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
*/
private BigDecimal segment3;
/**
* Database Column Remarks:
* 预期返还后教育费附加
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
private BigDecimal segment4;
/**
* Database Column Remarks:
* 预期返还后城市教育费附加
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
private BigDecimal segment5;
/**
* Database Column Remarks:
* 预期返还后城建税
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
private BigDecimal segment6;
/**
* Database Column Remarks:
* 创建时间
......@@ -251,6 +284,78 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
this.segment3 = segment3;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_4
*
* @return the value of analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
public BigDecimal getSegment4() {
return segment4;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_4
*
* @param segment4 the value for analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
public void setSegment4(BigDecimal segment4) {
this.segment4 = segment4;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_5
*
* @return the value of analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
public BigDecimal getSegment5() {
return segment5;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_5
*
* @param segment5 the value for analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
public void setSegment5(BigDecimal segment5) {
this.segment5 = segment5;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_6
*
* @return the value of analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
public BigDecimal getSegment6() {
return segment6;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_6
*
* @param segment6 the value for analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
public void setSegment6(BigDecimal segment6) {
this.segment6 = segment6;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.create_time
......@@ -388,6 +493,9 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
sb.append(", segment1=").append(segment1);
sb.append(", segment2=").append(segment2);
sb.append(", segment3=").append(segment3);
sb.append(", segment4=").append(segment4);
sb.append(", segment5=").append(segment5);
sb.append(", segment6=").append(segment6);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", organizationId=").append(organizationId);
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisExpectedTaxReturnExample.java
View file @ 428577c0
......@@ -506,6 +506,186 @@ public class AnalysisExpectedTaxReturnExample {
return (Criteria) this;
}
public Criteria andSegment4IsNull() {
addCriterion("segment_4 is null");
return (Criteria) this;
}
public Criteria andSegment4IsNotNull() {
addCriterion("segment_4 is not null");
return (Criteria) this;
}
public Criteria andSegment4EqualTo(BigDecimal value) {
addCriterion("segment_4 =", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotEqualTo(BigDecimal value) {
addCriterion("segment_4 <>", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4GreaterThan(BigDecimal value) {
addCriterion("segment_4 >", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_4 >=", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4LessThan(BigDecimal value) {
addCriterion("segment_4 <", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_4 <=", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4In(List<BigDecimal> values) {
addCriterion("segment_4 in", values, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotIn(List<BigDecimal> values) {
addCriterion("segment_4 not in", values, "segment4");
return (Criteria) this;
}
public Criteria andSegment4Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_4 between", value1, value2, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_4 not between", value1, value2, "segment4");
return (Criteria) this;
}
public Criteria andSegment5IsNull() {
addCriterion("segment_5 is null");
return (Criteria) this;
}
public Criteria andSegment5IsNotNull() {
addCriterion("segment_5 is not null");
return (Criteria) this;
}
public Criteria andSegment5EqualTo(BigDecimal value) {
addCriterion("segment_5 =", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotEqualTo(BigDecimal value) {
addCriterion("segment_5 <>", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5GreaterThan(BigDecimal value) {
addCriterion("segment_5 >", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_5 >=", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5LessThan(BigDecimal value) {
addCriterion("segment_5 <", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_5 <=", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5In(List<BigDecimal> values) {
addCriterion("segment_5 in", values, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotIn(List<BigDecimal> values) {
addCriterion("segment_5 not in", values, "segment5");
return (Criteria) this;
}
public Criteria andSegment5Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_5 between", value1, value2, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_5 not between", value1, value2, "segment5");
return (Criteria) this;
}
public Criteria andSegment6IsNull() {
addCriterion("segment_6 is null");
return (Criteria) this;
}
public Criteria andSegment6IsNotNull() {
addCriterion("segment_6 is not null");
return (Criteria) this;
}
public Criteria andSegment6EqualTo(BigDecimal value) {
addCriterion("segment_6 =", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotEqualTo(BigDecimal value) {
addCriterion("segment_6 <>", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6GreaterThan(BigDecimal value) {
addCriterion("segment_6 >", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_6 >=", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6LessThan(BigDecimal value) {
addCriterion("segment_6 <", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_6 <=", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6In(List<BigDecimal> values) {
addCriterion("segment_6 in", values, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotIn(List<BigDecimal> values) {
addCriterion("segment_6 not in", values, "segment6");
return (Criteria) this;
}
public Criteria andSegment6Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_6 between", value1, value2, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_6 not between", value1, value2, "segment6");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessData.java
View file @ 428577c0
......@@ -101,6 +101,60 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
*/
private BigDecimal profit;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_1
*
* @mbg.generated
*/
private BigDecimal ref1;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_2
*
* @mbg.generated
*/
private BigDecimal ref2;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_3
*
* @mbg.generated
*/
private BigDecimal ref3;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_4
*
* @mbg.generated
*/
private BigDecimal ref4;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_5
*
* @mbg.generated
*/
private BigDecimal ref5;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_international_business_data.ref_6
*
* @mbg.generated
*/
private BigDecimal ref6;
/**
*
* This field was generated by MyBatis Generator.
......@@ -376,6 +430,150 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
this.profit = profit;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_1
*
* @return the value of analysis_international_business_data.ref_1
*
* @mbg.generated
*/
public BigDecimal getRef1() {
return ref1;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_1
*
* @param ref1 the value for analysis_international_business_data.ref_1
*
* @mbg.generated
*/
public void setRef1(BigDecimal ref1) {
this.ref1 = ref1;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_2
*
* @return the value of analysis_international_business_data.ref_2
*
* @mbg.generated
*/
public BigDecimal getRef2() {
return ref2;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_2
*
* @param ref2 the value for analysis_international_business_data.ref_2
*
* @mbg.generated
*/
public void setRef2(BigDecimal ref2) {
this.ref2 = ref2;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_3
*
* @return the value of analysis_international_business_data.ref_3
*
* @mbg.generated
*/
public BigDecimal getRef3() {
return ref3;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_3
*
* @param ref3 the value for analysis_international_business_data.ref_3
*
* @mbg.generated
*/
public void setRef3(BigDecimal ref3) {
this.ref3 = ref3;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_4
*
* @return the value of analysis_international_business_data.ref_4
*
* @mbg.generated
*/
public BigDecimal getRef4() {
return ref4;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_4
*
* @param ref4 the value for analysis_international_business_data.ref_4
*
* @mbg.generated
*/
public void setRef4(BigDecimal ref4) {
this.ref4 = ref4;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_5
*
* @return the value of analysis_international_business_data.ref_5
*
* @mbg.generated
*/
public BigDecimal getRef5() {
return ref5;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_5
*
* @param ref5 the value for analysis_international_business_data.ref_5
*
* @mbg.generated
*/
public void setRef5(BigDecimal ref5) {
this.ref5 = ref5;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.ref_6
*
* @return the value of analysis_international_business_data.ref_6
*
* @mbg.generated
*/
public BigDecimal getRef6() {
return ref6;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_international_business_data.ref_6
*
* @param ref6 the value for analysis_international_business_data.ref_6
*
* @mbg.generated
*/
public void setRef6(BigDecimal ref6) {
this.ref6 = ref6;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_international_business_data.exchange_rate
......@@ -564,6 +762,12 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
sb.append(", subsidyC=").append(subsidyC);
sb.append(", revenue=").append(revenue);
sb.append(", profit=").append(profit);
sb.append(", ref1=").append(ref1);
sb.append(", ref2=").append(ref2);
sb.append(", ref3=").append(ref3);
sb.append(", ref4=").append(ref4);
sb.append(", ref5=").append(ref5);
sb.append(", ref6=").append(ref6);
sb.append(", exchangeRate=").append(exchangeRate);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetEamMappingMapper.java
View file @ 428577c0
......@@ -105,7 +105,6 @@ public interface CitAssetEamMappingMapper extends MyMapper {
* @mbg.generated
*/
int updateByPrimaryKey(CitAssetEamMapping record);
int insertBatch(List<CitAssetEamMapping> citAssetEamMappings);
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisExpectedTaxReturnMapper.xml
View file @ 428577c0
......@@ -11,6 +11,9 @@
<result column="segment_1" jdbcType="DECIMAL" property="segment1" />
<result column="segment_2" jdbcType="DECIMAL" property="segment2" />
<result column="segment_3" jdbcType="DECIMAL" property="segment3" />
<result column="segment_4" jdbcType="DECIMAL" property="segment4" />
<result column="segment_5" jdbcType="DECIMAL" property="segment5" />
<result column="segment_6" jdbcType="DECIMAL" property="segment6" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
......@@ -88,8 +91,8 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, seq_no, segment_1, segment_2, segment_3, create_time, update_time, organization_id,
company_name, period
id, seq_no, segment_1, segment_2, segment_3, segment_4, segment_5, segment_6, create_time,
update_time, organization_id, company_name, period
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisExpectedTaxReturnExample" resultMap="BaseResultMap">
<!--
......@@ -143,11 +146,13 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into analysis_expected_tax_return (id, seq_no, segment_1,
segment_2, segment_3, create_time,
segment_2, segment_3, segment_4,
segment_5, segment_6, create_time,
update_time, organization_id, company_name,
period)
values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{segment1,jdbcType=DECIMAL},
#{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{segment4,jdbcType=DECIMAL},
#{segment5,jdbcType=DECIMAL}, #{segment6,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER})
</insert>
......@@ -173,6 +178,15 @@
<if test="segment3 != null">
segment_3,
</if>
<if test="segment4 != null">
segment_4,
</if>
<if test="segment5 != null">
segment_5,
</if>
<if test="segment6 != null">
segment_6,
</if>
<if test="createTime != null">
create_time,
</if>
......@@ -205,6 +219,15 @@
<if test="segment3 != null">
#{segment3,jdbcType=DECIMAL},
</if>
<if test="segment4 != null">
#{segment4,jdbcType=DECIMAL},
</if>
<if test="segment5 != null">
#{segment5,jdbcType=DECIMAL},
</if>
<if test="segment6 != null">
#{segment6,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -254,6 +277,15 @@
<if test="record.segment3 != null">
segment_3 = #{record.segment3,jdbcType=DECIMAL},
</if>
<if test="record.segment4 != null">
segment_4 = #{record.segment4,jdbcType=DECIMAL},
</if>
<if test="record.segment5 != null">
segment_5 = #{record.segment5,jdbcType=DECIMAL},
</if>
<if test="record.segment6 != null">
segment_6 = #{record.segment6,jdbcType=DECIMAL},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
......@@ -285,6 +317,9 @@
segment_1 = #{record.segment1,jdbcType=DECIMAL},
segment_2 = #{record.segment2,jdbcType=DECIMAL},
segment_3 = #{record.segment3,jdbcType=DECIMAL},
segment_4 = #{record.segment4,jdbcType=DECIMAL},
segment_5 = #{record.segment5,jdbcType=DECIMAL},
segment_6 = #{record.segment6,jdbcType=DECIMAL},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
......@@ -313,6 +348,15 @@
<if test="segment3 != null">
segment_3 = #{segment3,jdbcType=DECIMAL},
</if>
<if test="segment4 != null">
segment_4 = #{segment4,jdbcType=DECIMAL},
</if>
<if test="segment5 != null">
segment_5 = #{segment5,jdbcType=DECIMAL},
</if>
<if test="segment6 != null">
segment_6 = #{segment6,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -341,6 +385,9 @@
segment_1 = #{segment1,jdbcType=DECIMAL},
segment_2 = #{segment2,jdbcType=DECIMAL},
segment_3 = #{segment3,jdbcType=DECIMAL},
segment_4 = #{segment4,jdbcType=DECIMAL},
segment_5 = #{segment5,jdbcType=DECIMAL},
segment_6 = #{segment6,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
organization_id = #{organizationId,jdbcType=VARCHAR},
......
atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.xml
View file @ 428577c0
......@@ -14,6 +14,12 @@
<result column="subsidy_c" jdbcType="DECIMAL" property="subsidyC" />
<result column="revenue" jdbcType="DECIMAL" property="revenue" />
<result column="profit" jdbcType="DECIMAL" property="profit" />
<result column="ref_1" jdbcType="DECIMAL" property="ref1" />
<result column="ref_2" jdbcType="DECIMAL" property="ref2" />
<result column="ref_3" jdbcType="DECIMAL" property="ref3" />
<result column="ref_4" jdbcType="DECIMAL" property="ref4" />
<result column="ref_5" jdbcType="DECIMAL" property="ref5" />
<result column="ref_6" jdbcType="DECIMAL" property="ref6" />
<result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
......@@ -93,8 +99,9 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, exchange_rate, create_time,
update_time, organization_id, company_name, period, country
id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, ref_1, ref_2, ref_3,
ref_4, ref_5, ref_6, exchange_rate, create_time, update_time, organization_id, company_name,
period, country
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">
<!--
......@@ -149,16 +156,18 @@
-->
insert into analysis_international_business_data (id, seq_no, gmv,
trips, subsidy_b, subsidy_c,
revenue, profit, exchange_rate,
create_time, update_time, organization_id,
company_name, period, country
)
revenue, profit, ref_1,
ref_2, ref_3, ref_4, ref_5,
ref_6, exchange_rate, create_time,
update_time, organization_id, company_name,
period, country)
values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{gmv,jdbcType=DECIMAL},
#{trips,jdbcType=DECIMAL}, #{subsidyB,jdbcType=DECIMAL}, #{subsidyC,jdbcType=DECIMAL},
#{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR},
#{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR}
)
#{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{ref1,jdbcType=DECIMAL},
#{ref2,jdbcType=DECIMAL}, #{ref3,jdbcType=DECIMAL}, #{ref4,jdbcType=DECIMAL}, #{ref5,jdbcType=DECIMAL},
#{ref6,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessData">
<!--
......@@ -191,6 +200,24 @@
<if test="profit != null">
profit,
</if>
<if test="ref1 != null">
ref_1,
</if>
<if test="ref2 != null">
ref_2,
</if>
<if test="ref3 != null">
ref_3,
</if>
<if test="ref4 != null">
ref_4,
</if>
<if test="ref5 != null">
ref_5,
</if>
<if test="ref6 != null">
ref_6,
</if>
<if test="exchangeRate != null">
exchange_rate,
</if>
......@@ -238,6 +265,24 @@
<if test="profit != null">
#{profit,jdbcType=DECIMAL},
</if>
<if test="ref1 != null">
#{ref1,jdbcType=DECIMAL},
</if>
<if test="ref2 != null">
#{ref2,jdbcType=DECIMAL},
</if>
<if test="ref3 != null">
#{ref3,jdbcType=DECIMAL},
</if>
<if test="ref4 != null">
#{ref4,jdbcType=DECIMAL},
</if>
<if test="ref5 != null">
#{ref5,jdbcType=DECIMAL},
</if>
<if test="ref6 != null">
#{ref6,jdbcType=DECIMAL},
</if>
<if test="exchangeRate != null">
#{exchangeRate,jdbcType=DECIMAL},
</if>
......@@ -302,6 +347,24 @@
<if test="record.profit != null">
profit = #{record.profit,jdbcType=DECIMAL},
</if>
<if test="record.ref1 != null">
ref_1 = #{record.ref1,jdbcType=DECIMAL},
</if>
<if test="record.ref2 != null">
ref_2 = #{record.ref2,jdbcType=DECIMAL},
</if>
<if test="record.ref3 != null">
ref_3 = #{record.ref3,jdbcType=DECIMAL},
</if>
<if test="record.ref4 != null">
ref_4 = #{record.ref4,jdbcType=DECIMAL},
</if>
<if test="record.ref5 != null">
ref_5 = #{record.ref5,jdbcType=DECIMAL},
</if>
<if test="record.ref6 != null">
ref_6 = #{record.ref6,jdbcType=DECIMAL},
</if>
<if test="record.exchangeRate != null">
exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
</if>
......@@ -342,6 +405,12 @@
subsidy_c = #{record.subsidyC,jdbcType=DECIMAL},
revenue = #{record.revenue,jdbcType=DECIMAL},
profit = #{record.profit,jdbcType=DECIMAL},
ref_1 = #{record.ref1,jdbcType=DECIMAL},
ref_2 = #{record.ref2,jdbcType=DECIMAL},
ref_3 = #{record.ref3,jdbcType=DECIMAL},
ref_4 = #{record.ref4,jdbcType=DECIMAL},
ref_5 = #{record.ref5,jdbcType=DECIMAL},
ref_6 = #{record.ref6,jdbcType=DECIMAL},
exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
......@@ -381,6 +450,24 @@
<if test="profit != null">
profit = #{profit,jdbcType=DECIMAL},
</if>
<if test="ref1 != null">
ref_1 = #{ref1,jdbcType=DECIMAL},
</if>
<if test="ref2 != null">
ref_2 = #{ref2,jdbcType=DECIMAL},
</if>
<if test="ref3 != null">
ref_3 = #{ref3,jdbcType=DECIMAL},
</if>
<if test="ref4 != null">
ref_4 = #{ref4,jdbcType=DECIMAL},
</if>
<if test="ref5 != null">
ref_5 = #{ref5,jdbcType=DECIMAL},
</if>
<if test="ref6 != null">
ref_6 = #{ref6,jdbcType=DECIMAL},
</if>
<if test="exchangeRate != null">
exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
</if>
......@@ -418,6 +505,12 @@
subsidy_c = #{subsidyC,jdbcType=DECIMAL},
revenue = #{revenue,jdbcType=DECIMAL},
profit = #{profit,jdbcType=DECIMAL},
ref_1 = #{ref1,jdbcType=DECIMAL},
ref_2 = #{ref2,jdbcType=DECIMAL},
ref_3 = #{ref3,jdbcType=DECIMAL},
ref_4 = #{ref4,jdbcType=DECIMAL},
ref_5 = #{ref5,jdbcType=DECIMAL},
ref_6 = #{ref6,jdbcType=DECIMAL},
exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
......
atms-web/src/main/webapp/Gruntfile.js
View file @ 428577c0
......@@ -237,7 +237,8 @@ grunt.initConfig({
"Scripts/viewer/viewer.js",
"Scripts/xlsx/shim.min.js",
"Scripts/xlsx/xlsx.full.min.js",
"Scripts/position-calculator/position-calculator.min.js"
"Scripts/position-calculator/position-calculator.min.js",
"Scripts/bootstrp-confirm/bootstrap-confirm.js"
],
dest: '<%= pkg.bundleTemp %>/util.js'
},
......
atms-web/src/main/webapp/Scripts/bootstrp-confirm/bootstrap-confirm.js 0 → 100644
View file @ 428577c0
(function ($) {
window.Ewin = function () {
var html = '<div id="[Id]" class="modal fade" role="dialog" aria-labelledby="modalLabel">' +
'<div class="modal-dialog modal-sm">' +
'<div class="modal-content">' +
'<div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>' +
'<h4 class="modal-title" id="modalLabel">[Title]</h4>' +
'</div>' +
'<div class="modal-body">' +
'<p>[Message]</p>' +
'</div>' +
'<div class="modal-footer">' +
'<button type="button" class="btn btn-default cancel" data-dismiss="modal">[BtnCancel]</button>' +
'<button type="button" class="btn btn-primary ok" data-dismiss="modal">[BtnOk]</button>' +
'</div>' +
'</div>' +
'</div>' +
'</div>';
var dialogdHtml = '<div id="[Id]" class="modal fade" role="dialog" aria-labelledby="modalLabel">' +
'<div class="modal-dialog">' +
'<div class="modal-content">' +
'<div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>' +
'<h4 class="modal-title" id="modalLabel">[Title]</h4>' +
'</div>' +
'<div class="modal-body">' +
'</div>' +
'</div>' +
'</div>' +
'</div>';
var reg = new RegExp("\\[([^\\[\\]]*?)\\]", 'igm');
var generateId = function () {
var date = new Date();
return 'mdl' + date.valueOf();
}
var init = function (options) {
options = $.extend({}, {
title: "操作提示",
message: "提示内容",
btnok: "确定",
btncl: "取消",
width: 200,
auto: false
}, options || {});
var modalId = generateId();
var content = html.replace(reg, function (node, key) {
return {
Id: modalId,
Title: options.title,
Message: options.message,
BtnOk: options.btnok,
BtnCancel: options.btncl
}[key];
});
$('body').append(content);
$('#' + modalId).modal({
width: options.width,
backdrop: 'static'
});
$('#' + modalId).on('hide.bs.modal', function (e) {
$('body').find('#' + modalId).remove();
});
return modalId;
}
return {
alert: function (options) {
if (typeof options == 'string') {
options = {
message: options
};
}
var id = init(options);
var modal = $('#' + id);
modal.find('.ok').removeClass('btn-success').addClass('btn-primary');
modal.find('.cancel').hide();
return {
id: id,
on: function (callback) {
if (callback && callback instanceof Function) {
modal.find('.ok').click(function () { callback(true); });
}
},
hide: function (callback) {
if (callback && callback instanceof Function) {
modal.on('hide.bs.modal', function (e) {
callback(e);
});
}
}
};
},
confirm: function (options) {
var id = init(options);
var modal = $('#' + id);
modal.find('.ok').removeClass('btn-primary').addClass('btn-success');
modal.find('.cancel').show();
return {
id: id,
on: function (callback) {
if (callback && callback instanceof Function) {
modal.find('.ok').click(function () { callback(true); });
modal.find('.cancel').click(function () { callback(false); });
}
},
hide: function (callback) {
if (callback && callback instanceof Function) {
modal.on('hide.bs.modal', function (e) {
callback(e);
});
}
}
};
},
dialog: function (options) {
options = $.extend({}, {
title: 'title',
url: '',
width: 800,
height: 550,
onReady: function () { },
onShown: function (e) { }
}, options || {});
var modalId = generateId();
var content = dialogdHtml.replace(reg, function (node, key) {
return {
Id: modalId,
Title: options.title
}[key];
});
$('body').append(content);
var target = $('#' + modalId);
target.find('.modal-body').load(options.url);
if (options.onReady())
options.onReady.call(target);
target.modal();
target.on('shown.bs.modal', function (e) {
if (options.onReady(e))
options.onReady.call(target, e);
});
target.on('hide.bs.modal', function (e) {
$('body').find(target).remove();
});
}
}
}();
})(jQuery);
\ No newline at end of file
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ 428577c0
......@@ -63,7 +63,7 @@
<!--@Html.AntiForgeryToken()-->
<div class="wrapper">
<app-nav></app-nav>
<div class="page-wrapper" style="position:relative;overflow:scroll;margin-top:55px">
<div class="page-wrapper" style="position:relative;overflow-x:hidden;overflow-y:auto;margin-top:55px">
<div class="main-contents" ui-view></div>
<div class="data-import-contents" ui-view="importContent"></div><!--style="display: none"-->
</div>
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.ctrl.js
View file @ 428577c0
......@@ -23,7 +23,6 @@
};
$scope.dataGridUpdate = function (_data) {
$scope.localData = _data.items;
$scope.queryStatusType($scope.localData);
$scope.pagingOptions = {
totalItems: $scope.localData.length, //总数据
......@@ -328,6 +327,9 @@
} else {
SweetAlert.warning($translate.instant('SaveFail'));
}
if(data.code==-1){
SweetAlert.warning($translate.instant(data.message));
}
});
$('#editPopDialog').modal('hide');
};
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 428577c0
......@@ -2159,6 +2159,7 @@
};
// 取消编辑机构其他信息
// TODO 将这个方法添加到切换功能里
$scope.updateOrgExtraCancel = function () {
$scope.selectCompanyExtra = $scope.comExtraOldData;
$scope.editOrgExtraModel = $scope.editOldData;
......@@ -2397,6 +2398,8 @@
// 选中机构
$scope.selectOrganization = function (branch) {
var org = branch.data;
$scope.output = "You selected: " + org.id;
......@@ -2446,6 +2449,8 @@
loadUserRoleList(org.id);
generalSelectCompanyText();
cancelWebChange();
$scope.updateOrgExtraCancel()
});
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ 428577c0
......@@ -310,7 +310,7 @@
dataField: "companyName",
width: '28%',
allowHeaderFiltering: false,
caption: $translate.instant('CompanySimpleName')
caption: $translate.instant('CompanyName')
}, {
dataField: "segment1",
allowHeaderFiltering: false,
......@@ -411,7 +411,7 @@
dataField: "companyName",
width: '25%',
allowHeaderFiltering: false,
caption: $translate.instant('CompanySimpleName')
caption: $translate.instant('CompanyName')
}, {
dataField: "segment1",
allowHeaderFiltering: false,
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js
View file @ 428577c0
......@@ -314,6 +314,42 @@
allowHeaderFiltering: false,
width: '16%',
caption: 'Profit'
},
{
dataField: "ref1",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref1'
},
{
dataField: "ref2",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref2'
},
{
dataField: "ref3",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref3'
},
{
dataField: "ref4",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref4'
},
{
dataField: "ref5",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref5'
},
{
dataField: "ref6",
allowHeaderFiltering: false,
width: '16%',
caption: 'ref6'
}],
onContentReady: function (e) {
$scope.accountingRateListInstance = e.component;
......@@ -606,14 +642,14 @@
case 100:
$scope.showInternationalBUDataGrid = true;
loadinternationalBUDatagrid();
$scope.selectCountry = '';
$scope.selectCompany = '';
/*$scope.selectCountry = '';
$scope.selectCompany = '';*/
break;
case 101:
$scope.showInternationalTaxDataGrid = true;
loadInternationalTaxDataGrid();
$scope.selectCountry = '';
$scope.selectCompany = '';
/* $scope.selectCountry = '';
$scope.selectCompany = '';*/
break;
default:
break;
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ 428577c0
......@@ -29,14 +29,14 @@
</li>
</ul>
</div>
<span class="text-bold" translate="Period"></span>:
<span class="text-bold" style="margin-left: 39px;" translate="Period"></span>:
<div class="period-picker" style="margin-left:10px; width:141px;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style=" width: 111px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
</div>
<div class="col-sm-5 rightNav" style="width:46%;padding-left: 0px; left: 20%;">
<div class="col-sm-5 rightNav" style="width:46%;padding-left: 0px; left: 14%;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" >
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js
View file @ 428577c0
......@@ -2940,7 +2940,6 @@
}).error(function (error) {
});*/
calculateEbitAndInsert($scope.relation.sheet, true);
spreadTODb();
}
var spreadTODb = function (front) {
......@@ -2948,7 +2947,8 @@
SweetAlert.error("请选择机构");
return;
}
var json = $scope.spread.toJSON({includeBindingSource: true});
//{includeBindingSource: true}
var json = $scope.spread.toJSON({includeBindingSource: true});
var excelIo = new GC.Spread.Excel.IO();
var url = apiInterceptor.webApiHostUrl + '/Report/spreadToDb?orgId=' + $scope.relation.orgId + "&period=" + $scope.relation.period;
//var apiTokenObj = JSON.parse(getCookie('AtmsApiToken'));
......@@ -2997,6 +2997,8 @@
return;
}
file = file[0];
// 转圈圈
$('#busy-indicator-container').show();
frontImport(file);//前端导入
/*if(file.length == 0)
return
......@@ -3074,8 +3076,7 @@
if ($scope.spread != undefined && $scope.spread) {
var excelIo = new GC.Spread.Excel.IO();
excelIo.open(file, function (json) {
var workbookObj = json;
$scope.spread.fromJSON(workbookObj);
$scope.spread.fromJSON(json);
var sheet = $scope.spread.sheets[0];
$scope.relation.sheet = $scope.spread.sheets[0];
/*vatReportService.saveAndRefresh($scope.relation.orgId, $scope.relation.period, 0, "1").success(function (res) {
......@@ -3089,7 +3090,10 @@
$scope.relation.addEbitRow(sheet);
calculateEbitAndInsert(sheet, true);
$scope.relation.lockCell($scope.spread);
$('#busy-indicator-container').hide();
//关闭弹出层
spreadTODb(true);
}, function (e) {
alert(e.errorMessage);
if (e.errorCode === 2/*noPassword*/ || e.errorCode === 3 /*invalidPassword*/) {
......@@ -3117,7 +3121,6 @@
var glfy = nullToZero(sheet.getValue(15, 2));//管理费用
var yffy = nullToZero(sheet.getValue(16, 2));//研发费用
var zcjzss = nullToZero(sheet.getValue(18, 2));//资产减值损失
var ts = nullToZero(sheet.getValue(38, 2));
var rate = 1;
if(sheet.getValue(40, 2) != null){
......@@ -3135,7 +3138,7 @@
$scope._ebitResult.rate = rate;
$scope._ebitResult.gljyye = Number(((rate/ 100) * $scope._ebitResult.kltsys).toFixed(4));
$scope._ebitResult.sixAddtax = Number((0.06 * $scope._ebitResult.gljyye).toFixed(4));
$scope._ebitResult.tsklys = Number(($scope._ebitResult.gljyye * 0.106).toFixed(4));
$scope._ebitResult.tsklys = Number(($scope._ebitResult.gljyye * 1.06).toFixed(4));
if (insert) {
sheet.setValue(37, 2, $scope._ebitResult.klzcjsz);
sheet.setValue(38, 2, $scope._ebitResult.tsyskl);
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
View file @ 428577c0
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="col-sm-5 bar-export navRight" style=" margin-top: 20px;width: 30%; float: right;">
<div class="col-sm-5 bar-export navRight" style=" margin-top: 20px;width: 38%; float: right;">
<span ngf-select="" ngf-change="upload($files)" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="" ><i class="fa fa-file">&nbsp;{{'uploadProfileTable' | translate}}</i></span>
<span ng-click="saveAndRefresh()"><i class="fa fa-refresh"></i>&nbsp;{{'saveAndRefresh' | translate}}</span>
......@@ -51,8 +51,7 @@
</table-report-sheet>
<form name="myform" style="disply:none;" id="myform" enctype="multipart/form-data" method="post">
    
   </form>
</form>
<a href="#" id = "a"></a>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/vat-report-upload-view/vat-report-upload-detail.ctrl.js
View file @ 428577c0
......@@ -5,9 +5,13 @@
$log.debug('vatReportUploadDetailController.ctor()...');
//表格配置
$scope.reportOneGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
$scope.reportOneGridOptions = {
selection: {
mode: "single"
},
hoverStateEnabled: true,
showBorders: true,
columns: [
{
dataField: 'serialNo',
caption: $translate.instant('RepUploadDtlColSerialNo'),
......@@ -59,12 +63,16 @@
bindingOptions: {
dataSource: 'reportOneDataSource'
}
});
};
$scope.reportTwoGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
$scope.reportTwoGridOptions = {
selection: {
mode: "single"
},
hoverStateEnabled: true,
showBorders: true,
columns: [
{
caption: $translate.instant('RepUploadDtlColSerialNo'),
fixed: true,
......@@ -159,12 +167,16 @@
bindingOptions: {
dataSource: 'reportTwoDataSource'
}
});
};
$scope.reportThreeGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
$scope.reportThreeGridOptions = {
selection: {
mode: "single"
},
hoverStateEnabled: true,
showBorders: true,
columns: [
{
caption: $translate.instant('RepUploadDtlColSerialNo'),
fixed: true,
......@@ -259,7 +271,7 @@
bindingOptions: {
dataSource: 'reportThreeDataSource'
}
});
};
var uploadFile = function (file, reportType) {
var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
......
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
View file @ 428577c0
......@@ -19,7 +19,7 @@ frameworkModule.controller('appUsrOperateLogController',
}
});
}
if($scope.thisModuleId.length===0){
if($("body[ng-controller='AppController']").length==1 && $scope.thisModuleId.length===0){
SweetAlert.warning($translate.instant("NeedChecked"));
return;
}
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 428577c0
......@@ -478,16 +478,18 @@
<span translate="CorporationName"></span>
</div>
<div class="TDL-query-val">
<select ng-model="queryFieldModel.companyName" class="form-control radius3"
title="{{queryFieldModel.companyName}}" required
ng-change="matchCompanyId(queryFieldModel,companyNameOptionsMap)"
placeholder="{{'PleaseSelected' | translate}}">
<option value=""></option>
<option ng-repeat="(key,companyName) in companyNameOptionsMap"
ng-slected="queryFieldModel.companyName == companyName"
value="{{companyName}}">{{companyName}}
</option>
</select>
<div dx-select-box="queryOrgOptions"></div>
<!--<select ng-model="queryFieldModel.companyName" class="form-control radius3"-->
<!--title="{{queryFieldModel.companyName}}" required-->
<!--ng-change="matchCompanyId(queryFieldModel,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">-->
<!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-slected="queryFieldModel.companyName == companyName"-->
<!--value="{{companyName}}">{{companyName}}-->
<!--</option>-->
<!--</select>-->
</div>
</div>
<div class="TDL-query-block">
......@@ -743,17 +745,19 @@
<span class="required-tip"> * </span>
{{'CorporationName' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%" id="companyNameOptionsMap">
<select ng-model="editFieldModel.companyName" class="form-control"
title="{{editFieldModel.companyName}}" required
ng-change="matchCompanyId(editFieldModel,companyNameOptionsMap)"
placeholder="{{'PleaseSelected' | translate}}">
<option value=""></option>
<option ng-repeat="(key,companyName) in companyNameOptionsMap"
ng-selected="(editFieldModel.companyName == companyName)"
value="{{companyName}}">{{companyName}}
</option>
</select>
<div class="col-sm-11" style="width:61.67%;height: 13px" id="companyNameOptionsMap">
<div dx-select-box="editOrgOptions"></div>
<!--<select ng-model="editFieldModel.companyName" class="form-control"-->
<!--title="{{editFieldModel.companyName}}" required-->
<!--ng-change="matchCompanyId(editFieldModel,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">-->
<!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-selected="(editFieldModel.companyName == companyName)"-->
<!--value="{{companyName}}">{{companyName}}-->
<!--</option>-->
<!--</select>-->
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -985,18 +989,20 @@
<span class="required-tip"> * </span>
{{'CorporationName' | translate}}
</label>
<div class="col-sm-11" style="width:61.67%">
<select ng-model="editFieldItem.companyName" class="form-control"
title="{{editFieldItem.companyName}}"
ng-class="{'upload-fail-mark':!editFieldItem.companyName}"
ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"
placeholder="{{'PleaseSelected' | translate}}">
<option value=""></option>
<option ng-repeat="(key,companyName) in companyNameOptionsMap"
ng-selected="(editFieldItem.companyName == companyName)"
value="{{companyName}}">{{companyName}}
</option>
</select>
<div class="col-sm-11" style="width:61.67%;height: 13px">
<div dx-select-box="editFieldItemOrgOptions"></div>
<!--<select ng-model="editFieldItem.companyName" class="form-control"-->
<!--title="{{editFieldItem.companyName}}"-->
<!--ng-class="{'upload-fail-mark':!editFieldItem.companyName}"-->
<!--ng-change="matchCompanyId(editFieldItem,companyNameOptionsMap)"-->
<!--placeholder="{{'PleaseSelected' | translate}}">-->
<!--<option value=""></option>-->
<!--<option ng-repeat="(key,companyName) in companyNameOptionsMap"-->
<!--ng-selected="(editFieldItem.companyName == companyName)"-->
<!--value="{{companyName}}">{{companyName}}-->
<!--</option>-->
<!--</select>-->
</div>
</div>
<div class="col-sm-6 form-group">
......@@ -1398,28 +1404,13 @@
</div>
</div>-->
<div class="modal fade" id="filePreviewPop" file-preview tabindex="-1" role="dialog" aria-labelledby="myModal"
data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width:80%;" role="document">
<div class="modal-content">
<div class="modal-header">
<span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideFilePreviewPop()">×</span>
<div class="modal-title">{{currentSheetName}}</div>
</div>
<div class="modal-body">
<div class="dx-viewport demo-container" id="preview_dataGrid">
</div>
</div>
</div>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging_xls()" title="上一页">&lt;
</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging_xls()" title="下一页">&gt;
</button>
<div class="TDL-pdf-layout-dialog" id="filePreviewPop" file-preview >
<div class="wrapper TDL-pdf-preview-pop" id="excetlContainer">
</div>
</div>
<button class="TDL-pdf-preview-pop-close-btn" ng-click="hideFilePreviewPop()">×</button>
</div>
<div class="modal fade" id="uploadResultPop" tabindex="-1" role="dialog" aria-labelledby="myModal"
data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width:60%;max-width:960px" role="document">
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js
View file @ 428577c0
......@@ -165,6 +165,33 @@ taxDocumentManageModule.factory('taxDocumentListService',
xhr.send(JSON.stringify(params));
return defer.promise;
},
viewExcelBySpread:function (url) {
var deferred = $q.defer();
var promise = deferred.promise;
var xhr = new XMLHttpRequest();
xhr.open('GET', url, true); // 也可以使用POST方式，根据接口
xhr.responseType = "blob"; // 返回类型blob
// 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑
xhr.onload = function () {
// 请求完成
if (this.status === 200) {
// 返回200
var blob = this.response;
var excelIo = new GC.Spread.Excel.IO();
excelIo.open(blob, function (json) {
deferred.resolve(json);
}, function (e) {
// console.error(e.errorMessage);
//alert(e.errorMessage);
deferred.reject(e.errorMessage);
}, {});
}
};
// 发送ajax请求
xhr.send();
return promise;
}
};
}]);
\ 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