Skip to content

T
traffic-front
Commit e0b65cf5 authored by chase's avatar chase
Browse files
Options

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

parents bfce74e3 a096c438
Expand all Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 184 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/CitPreviewDataController.java
View file @ e0b65cf5
...@@ -22,6 +22,8 @@ import java.io.OutputStream; ...@@ -22,6 +22,8 @@ import java.io.OutputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.servlet.http.HttpServletResponse.SC_OK;
...@@ -60,8 +62,8 @@ public class CitPreviewDataController extends BaseController { ...@@ -60,8 +62,8 @@ public class CitPreviewDataController extends BaseController {
} }
//预提重分类数据源 //预提重分类数据源
@RequestMapping(value = "exportDataSalaryAdvance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "exportDataSalaryAdvance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportDataSalaryAdvance(@RequestBody CitEAMAssetsDisposalDto citEAMAssetsDisposalDto, HttpServletResponse response) { public void exportDataSalaryAdvance(@RequestBody CitSalaryDataDto citSalaryDataDto, HttpServletResponse response) {
int count = citPreviewDataService.exportDataSalaryAdvance(citEAMAssetsDisposalDto, response); int count = citPreviewDataService.exportDataSalaryAdvance(citSalaryDataDto, response);
if (count == 0) { if (count == 0) {
response.setStatus(SC_NO_CONTENT); response.setStatus(SC_NO_CONTENT);
} else { } else {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitPreviewDataServiceImpl.java
View file @ e0b65cf5
...@@ -148,9 +148,9 @@ public class CitPreviewDataServiceImpl extends BaseService { ...@@ -148,9 +148,9 @@ public class CitPreviewDataServiceImpl extends BaseService {
return 1; return 1;
} }
public int exportDataSalaryAdvance(CitEAMAssetsDisposalDto citEAMAssetsDisposalDto, HttpServletResponse response) { public int exportDataSalaryAdvance(CitSalaryDataDto citSalaryDataDto , HttpServletResponse response) {
CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample(); CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
List<CitEAMAssetsDisposal> list = citEAMAssetsDisposalMapper.selectByCondition(citEAMAssetsDisposalDto); List<CitSalaryAdvance> list = citSalaryAdvanceMapper.selectByCondition(citSalaryDataDto);
if(list.size()==0){ if(list.size()==0){
return 0; return 0;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
View file @ e0b65cf5
...@@ -2319,7 +2319,7 @@ public class OrganizationServiceImpl extends BaseService{ ...@@ -2319,7 +2319,7 @@ public class OrganizationServiceImpl extends BaseService{
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private OperationResultDto checkOrgNameOrOrgCode(OrganizationDto orgDto) { private OperationResultDto checkOrgNameOrOrgCode(OrganizationDto orgDto) {
OrganizationExample example = new OrganizationExample(); OrganizationExample example = new OrganizationExample();
if (null!=orgDto.getOversea()&&orgDto.getOversea()) { if (null!=orgDto.getOversea()&&orgDto.getOversea()&&null!=orgDto.getEnglishName()) {
example.or().andEnglishNameEqualTo(orgDto.getEnglishName()); example.or().andEnglishNameEqualTo(orgDto.getEnglishName());
} else if (orgDto.getId() == null) { } else if (orgDto.getId() == null) {
example.or().andClientCodeEqualTo(orgDto.getClientCode()).andNameEqualTo(orgDto.getName()); example.or().andClientCodeEqualTo(orgDto.getClientCode()).andNameEqualTo(orgDto.getName());
......
atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java
View file @ e0b65cf5
...@@ -30,7 +30,7 @@ public class EbsApiServiceImplTest extends CommonIT { ...@@ -30,7 +30,7 @@ public class EbsApiServiceImplTest extends CommonIT {
} }
@Test @Test
public void queryRemoteServerThenUpdateOrg(){ public void queryRemoteServerThenUpdateOrg(){
List<OrganizationQueryDto> items =new ArrayList<>(); List<OrganizationQueryDto> items = new ArrayList();
for(int i=0;i<2;i++){ for(int i=0;i<2;i++){
OrganizationQueryDto dto = new OrganizationQueryDto(); OrganizationQueryDto dto = new OrganizationQueryDto();
dto.setTaxPayerNumber("sadsafsdf3232"); dto.setTaxPayerNumber("sadsafsdf3232");
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitEAMAssetsDisposalMapper.java
View file @ e0b65cf5
...@@ -110,5 +110,4 @@ public interface CitEAMAssetsDisposalMapper extends MyMapper { ...@@ -110,5 +110,4 @@ public interface CitEAMAssetsDisposalMapper extends MyMapper {
int insertBatch(List<CitEAMAssetsDisposal> citEAMAssetsDisposalList); int insertBatch(List<CitEAMAssetsDisposal> citEAMAssetsDisposalList);
List<CitEAMAssetsDisposal> selectByCondition(@Param("citEAMAssetsDisposal") CitEAMAssetsDisposal citEAMAssetsDisposal); List<CitEAMAssetsDisposal> selectByCondition(@Param("citEAMAssetsDisposal") CitEAMAssetsDisposal citEAMAssetsDisposal);
List<CitSalaryAdvance> selectByCondition(@Param("citPreviewSalaryAdvance") CitSalaryAdvance citEAMAssetsDisposal);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitSalaryAdvanceMapper.java
View file @ e0b65cf5
...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper; import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
import pwc.taxtech.atms.entity.CitSalaryAdvance; import pwc.taxtech.atms.entity.CitSalaryAdvance;
import pwc.taxtech.atms.entity.CitSalaryAdvanceExample; import pwc.taxtech.atms.entity.CitSalaryAdvanceExample;
...@@ -107,4 +108,6 @@ public interface CitSalaryAdvanceMapper extends MyMapper { ...@@ -107,4 +108,6 @@ public interface CitSalaryAdvanceMapper extends MyMapper {
int updateByPrimaryKey(CitSalaryAdvance record); int updateByPrimaryKey(CitSalaryAdvance record);
int insertBatch(List<CitSalaryAdvance> list); int insertBatch(List<CitSalaryAdvance> list);
List<CitSalaryAdvance> selectByCondition(@Param("citPreviewSalaryAdvance") CitSalaryAdvance citSalaryAdvance);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dpo/ReportDto.java
View file @ e0b65cf5
...@@ -13,6 +13,15 @@ public class ReportDto { ...@@ -13,6 +13,15 @@ public class ReportDto {
private Date createTime; private Date createTime;
private String updater; private String updater;
private Date updateTime; private Date updateTime;
private Integer reportType;
public Integer getReportType() {
return reportType;
}
public void setReportType(Integer reportType) {
this.reportType = reportType;
}
public String getId() { public String getId() {
return id; return id;
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvance.java
View file @ e0b65cf5
...@@ -473,7 +473,6 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable { ...@@ -473,7 +473,6 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
* @mbg.generated * @mbg.generated
*/ */
@JsonSerialize(using = CustomDateSerializer.class) @JsonSerialize(using = CustomDateSerializer.class)
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitEAMADisposalExtendsMapper.xml
View file @ e0b65cf5
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper"> <mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
<sql id="QueryCondition"> <sql id="QueryCondition">
1 = 1 1 = 1
<!-- <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)"> <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)">
AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR} AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
</if>--> </if>
<if test="citEAMAssetsDisposal.compensationSaleAmount!=null and citEAMAssetsDisposal.compensationSaleAmount != '' "> <if test="citEAMAssetsDisposal.compensationSaleAmount!=null and citEAMAssetsDisposal.compensationSaleAmount != '' ">
AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER} AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
</if> </if>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitSalaryAdvanceExtendsMapper.xml
View file @ e0b65cf5
...@@ -3,23 +3,20 @@ ...@@ -3,23 +3,20 @@
<mapper namespace="pwc.taxtech.atms.dao.CitSalaryAdvanceMapper"> <mapper namespace="pwc.taxtech.atms.dao.CitSalaryAdvanceMapper">
<sql id="QueryCondition"> <sql id="QueryCondition">
1 = 1 1 = 1
<!-- <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)"> <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citPreviewSalaryAdvance.period)">
AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR} AND period= #{citPreviewSalaryAdvance.period,jdbcType=VARCHAR}
</if>-->
<if test="citPreviewSalaryAdvance.compensationSaleAmount!=null and citPreviewSalaryAdvance.compensationSaleAmount != '' ">
AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
</if> </if>
<if test="citPreviewSalaryAdvance.assetLabelNumber!=null and citPreviewSalaryAdvance.assetLabelNumber!='' "> <if test="citPreviewSalaryAdvance.poSubjectName!=null and citPreviewSalaryAdvance.poSubjectName != '' ">
AND asset_label_number &lt;= #{citEAMAssetsDisposal.assetLabelNumber,jdbcType=INTEGER} AND po_subject_name &gt;= #{citPreviewSalaryAdvance.poSubjectName,jdbcType=INTEGER}
</if> </if>
<if test="citPreviewSalaryAdvance.periodStart!=null and citPreviewSalaryAdvance.periodStart!= '' and citPreviewSalaryAdvance.periodEnd!= null and citPreviewSalaryAdvance.periodEnd!= ''"> <if test="citPreviewSalaryAdvance.periodStart!=null and citPreviewSalaryAdvance.periodStart!= '' and citPreviewSalaryAdvance.periodEnd!= null and citPreviewSalaryAdvance.periodEnd!= ''">
AND period between ${citEAMAssetsDisposal.periodStart} and ${citEAMAssetsDisposal.periodEnd} AND period between ${citPreviewSalaryAdvance.periodStart} and ${citPreviewSalaryAdvance.periodEnd}
</if> </if>
<if test="citEAMAssetsDisposal.periodStart == null and citEAMAssetsDisposal.periodStart != '' and citEAMAssetsDisposal.periodEnd != null and citEAMAssetsDisposal.periodEnd != ''"> <if test="citPreviewSalaryAdvance.periodStart == null and citPreviewSalaryAdvance.periodStart != '' and citPreviewSalaryAdvance.periodEnd != null and citPreviewSalaryAdvance.periodEnd != ''">
AND period &lt; ${citEAMAssetsDisposal.periodEnd} or period = ${citEAMAssetsDisposal.periodEnd} AND period &lt; ${citPreviewSalaryAdvance.periodEnd} or period = ${citPreviewSalaryAdvance.periodEnd}
</if> </if>
<if test="citEAMAssetsDisposal.periodStart != null and citEAMAssetsDisposal.periodStart != '' and citEAMAssetsDisposal.periodEnd == null and citEAMAssetsDisposal.periodEnd != '' "> <if test="citPreviewSalaryAdvance.periodStart != null and citPreviewSalaryAdvance.periodStart != '' and citPreviewSalaryAdvance.periodEnd == null and citPreviewSalaryAdvance.periodEnd != '' ">
AND period &gt; ${citEAMAssetsDisposal.periodStart} or period = ${citEAMAssetsDisposal.periodStart} AND period &gt; ${citPreviewSalaryAdvance.periodStart} or period = ${citPreviewSalaryAdvance.periodStart}
</if> </if>
</sql> </sql>
...@@ -94,7 +91,18 @@ ...@@ -94,7 +91,18 @@
<select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance" resultType="pwc.taxtech.atms.entity.CitSalaryAdvance"> <select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance" resultType="pwc.taxtech.atms.entity.CitSalaryAdvance">
select select
* organization_id organizationId,
project_id projectId,
period ,
source,
po_no poNo,
po_subject_code poSubjectCode,
po_subject_name poSubjectName,
advance advance,
approved_standard_invoice_amount approvedStandardInvoiceAmount,
created_by createdBy,
create_time createTime
from cit_salary_advance
WHERE WHERE
<include refid="QueryCondition"/> <include refid="QueryCondition"/>
</select> </select>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml
View file @ e0b65cf5
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
<result column="TEMPLATE_ID" jdbcType="INTEGER" property="templateId"/> <result column="TEMPLATE_ID" jdbcType="INTEGER" property="templateId"/>
<result column="TEMPLATE_NAME" jdbcType="VARCHAR" property="templateName"/> <result column="TEMPLATE_NAME" jdbcType="VARCHAR" property="templateName"/>
<result column="TEMPLATE_CODE" jdbcType="VARCHAR" property="templateCode"/> <result column="TEMPLATE_CODE" jdbcType="VARCHAR" property="templateCode"/>
<result column="REPORT_TYPE" jdbcType="INTEGER" property="reportType"/>
</resultMap> </resultMap>
<!--TODO: 考虑项目库表迁移--> <!--TODO: 考虑项目库表迁移-->
...@@ -112,13 +113,15 @@ ...@@ -112,13 +113,15 @@
D.period AS PERIOD, D.period AS PERIOD,
C.id AS TEMPLATE_ID, C.id AS TEMPLATE_ID,
C.name AS TEMPLATE_NAME, C.name AS TEMPLATE_NAME,
C.code AS TEMPLATE_CODE C.code AS TEMPLATE_CODE,
C.reportType AS REPORT_TYPE
FROM FROM
( (
SELECT SELECT
A.id as ID, A.id as ID,
A.name AS NAME, A.name AS NAME,
A.code AS CODE A.code AS CODE,
A.report_type AS reportType
FROM FROM
template A template A
WHERE WHERE
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="bsCondition.periodStart!=null"> <if test="bsCondition.periodStart!=null">
AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="bsCondition.periodEnd!=null"> <if test="bsCondition.periodEnd!=null">
AND period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetFinalExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="bsCondition.periodStart!=null"> <if test="bsCondition.periodStart!=null">
AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="bsCondition.periodEnd!=null"> <if test="bsCondition.periodEnd!=null">
AND period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/BalanceSheetManualExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{bsCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="bsCondition.periodStart!=null"> <if test="bsCondition.periodStart!=null">
AND period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{bsCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="bsCondition.periodEnd!=null"> <if test="bsCondition.periodEnd!=null">
AND period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{bsCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR} AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="cfCondition.periodStart!=null"> <if test="cfCondition.periodStart!=null">
AND period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="cfCondition.periodEnd!=null"> <if test="cfCondition.periodEnd!=null">
AND period &lt;= #{cfCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{cfCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CertifiedInvoicesListExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{cilCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{cilCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="cilCondition.periodStart!=null"> <if test="cilCondition.periodStart!=null">
AND period &gt;= #{cilCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{cilCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="cilCondition.periodEnd!=null"> <if test="cilCondition.periodEnd!=null">
AND period &lt;= #{cilCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{cilCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CoupaPurchasingReportExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{cprCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{cprCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="cprCondition.periodStart!=null"> <if test="cprCondition.periodStart!=null">
AND period &gt;= #{cprCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{cprCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="cprCondition.periodEnd!=null"> <if test="cprCondition.periodEnd!=null">
AND period &lt;= #{cprCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{cprCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceDataExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{idCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{idCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="idCondition.periodStart!=null"> <if test="idCondition.periodStart!=null">
AND period &gt;= #{idCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{idCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="idCondition.periodEnd!=null"> <if test="idCondition.periodEnd!=null">
AND period &lt;= #{idCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{idCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{irCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{irCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="irCondition.periodStart!=null"> <if test="irCondition.periodStart!=null">
AND period &gt;= #{irCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{irCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="irCondition.periodEnd!=null"> <if test="irCondition.periodEnd!=null">
AND period &lt;= #{irCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{irCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/JournalEntryExtendsMapper.xml
View file @ e0b65cf5
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
AND description= #{jeCondition.description,jdbcType=VARCHAR} AND description= #{jeCondition.description,jdbcType=VARCHAR}
</if> </if>
<if test="jeCondition.periodStart!=null"> <if test="jeCondition.periodStart!=null">
AND period &gt;= #{jeCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{jeCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="jeCondition.periodEnd!=null"> <if test="jeCondition.periodEnd!=null">
AND period &lt;= #{jeCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{jeCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
<if test="jeCondition.containsAdjustmentRecord!=null"> <if test="jeCondition.containsAdjustmentRecord!=null">
AND contains_adjustment_record = #{jeCondition.containsAdjustmentRecord,jdbcType=BYTE} AND contains_adjustment_record = #{jeCondition.containsAdjustmentRecord,jdbcType=BYTE}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="plCondition.periodStart!=null"> <if test="plCondition.periodStart!=null">
AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="plCondition.periodEnd!=null"> <if test="plCondition.periodEnd!=null">
AND period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementFinalExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="plCondition.periodStart!=null"> <if test="plCondition.periodStart!=null">
AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="plCondition.periodEnd!=null"> <if test="plCondition.periodEnd!=null">
AND period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/ProfitLossStatementManualExtendsMapper.xml
View file @ e0b65cf5
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{plCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="plCondition.periodStart!=null"> <if test="plCondition.periodStart!=null">
AND period &gt;= #{plCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{plCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="plCondition.periodEnd!=null"> <if test="plCondition.periodEnd!=null">
AND period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{plCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/RedLetterInfoTableExtendsMapper.xml
View file @ e0b65cf5
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
AND organization_id= #{rlitCondition.orgId,jdbcType=VARCHAR} AND organization_id= #{rlitCondition.orgId,jdbcType=VARCHAR}
</if> </if>
<if test="rlitCondition.periodStart!=null"> <if test="rlitCondition.periodStart!=null">
AND fill_in_date &gt;= #{rlitCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{rlitCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="rlitCondition.periodEnd!=null"> <if test="rlitCondition.periodEnd!=null">
AND fill_in_date &lt;= #{rlitCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{rlitCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
</sql> </sql>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceMapper.xml
View file @ e0b65cf5
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
AND segment6_name= #{tbCondition.segment6Name,jdbcType=VARCHAR} AND segment6_name= #{tbCondition.segment6Name,jdbcType=VARCHAR}
</if> </if>
<if test="tbCondition.periodStart!=null"> <if test="tbCondition.periodStart!=null">
AND period &gt;= #{tbCondition.periodStart,jdbcType=INTEGER} AND tms_period &gt;= #{tbCondition.periodStart,jdbcType=INTEGER}
</if> </if>
<if test="tbCondition.periodEnd!=null"> <if test="tbCondition.periodEnd!=null">
AND period &lt;= #{tbCondition.periodEnd,jdbcType=INTEGER} AND tms_period &lt;= #{tbCondition.periodEnd,jdbcType=INTEGER}
</if> </if>
<if test="tbCondition.containsAdjustmentTable!=null"> <if test="tbCondition.containsAdjustmentTable!=null">
AND contains_adjustment_table = #{tbCondition.containsAdjustmentTable,jdbcType=BYTE} AND contains_adjustment_table = #{tbCondition.containsAdjustmentTable,jdbcType=BYTE}
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-asset-list/cit-preview-asset-list.html
View file @ e0b65cf5
...@@ -18,37 +18,6 @@ ...@@ -18,37 +18,6 @@
<button class="btn btn-vat-primary" translate="AssetClassification" ng-click="setAssetsGroup()"></button> <button class="btn btn-vat-primary" translate="AssetClassification" ng-click="setAssetsGroup()"></button>
</div> </div>
<form class="form-inline"> <form class="form-inline">
<!--<div class="form-group" ng-style="setButtonWrapStyle()">-->
<!--<div class="import-wrapper">-->
<!--<button type="button" ng-show="hasEditPermission" -->
<!--ngf-select="" ng-model="fileNameWrapper" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx,.xlsm"-->
<!--ngf-multiple="false" ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px">-->
<!--{{'SelectFile' | translate}}-->
<!--</button>-->
<!--<div class="import-info-wrapper" ng-show="fileName">-->
<!--<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|-->
<!--<span translate="WorkSheet"></span>-->
<!--<div class="ui-select-no-border">-->
<!--<ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">-->
<!--<ui-select-match placeholder="{{'SelectASheet' | translate}}">{{$select.selected.name}}</ui-select-match>-->
<!--<ui-select-choices repeat="sheetName in sheetData.sheetNameList | propsFilter: {name: $select.search}">-->
<!--<div title="{{sheetName.name}}" ng-bind-html="sheetName.name | limitString:9"></div>-->
<!--</ui-select-choices>-->
<!--</ui-select>-->
<!--</div>-->
<!--&nbsp;&nbsp;&nbsp;&nbsp;|-->
<!--<span translate="StartRowNum"></span>-->
<!--<input id="StartRowNum" ng-model="StartRowNum" type="text"-->
<!--onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
<!--onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" />-->
<!--</div>-->
<!--<button class="btn btn-vat-primary" style="float:right; margin-right: 10px;" ng-if="isShowImportTotalBtn && hasEditPermission" translate="ImportBtn" ng-click="importData(importEnum.Import)"></button>-->
<!--<div class="btn-wrapper" ng-if="!isShowImportTotalBtn && hasEditPermission">-->
<!--<button class="btn btn-vat-primary" translate="ConverImportBtn" ng-click="importData(importEnum.CoverImport)"></button>|<button class="btn btn-vat-primary" translate="AddImportBtn" ng-click="importData(importEnum.AddImport)"></button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="form-group"> <div class="form-group">
<div class="col-sm-5"> <div class="col-sm-5">
<input class="form-control" type="text" name="fileName" <input class="form-control" type="text" name="fileName"
...@@ -65,13 +34,6 @@ ...@@ -65,13 +34,6 @@
</div> </div>
</div> </div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!showImportTable">-->
<!--<div class="page-footer">-->
<!--<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshInvoiceDataGrid()" hide-page-size-selector="true"></ack-pagination>-->
<!--</div>-->
<!--</div>-->
</form> </form>
<!--导入数据界面--> <!--导入数据界面-->
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html
View file @ e0b65cf5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<i class="fa fa-filter" aria-hidden="true"></i> <i class="fa fa-filter" aria-hidden="true"></i>
</button> </button>
<span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>： <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px; width: 200px;" id="input-invoice-period-picker" /> <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px; width: 200px;" id="input-invoice-period-picker" />
<span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span> <span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
<div class="dt-init-wrapper" style=" position: relative; top: -41px;"> <div class="dt-init-wrapper" style=" position: relative; top: -41px;">
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ e0b65cf5
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
function initAssetResultDxGrid() { function initAssetResultDxGrid() {
var dupColumns = [ var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true }, { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
{ caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: 200, allowEditing: false, fixed: true }, { caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: '30%', allowEditing: false, fixed: true },
/* { caption: $translate.instant('organizationId'), dataField: "organizationId", width: 120, allowEditing: false, fixed: true }, /* { caption: $translate.instant('organizationId'), dataField: "organizationId", width: 120, allowEditing: false, fixed: true },
{ caption: $translate.instant('ProjectNameCol'), dataField: "projectName", width: 120, allowEditing: false, fixed: true },*/ { caption: $translate.instant('ProjectNameCol'), dataField: "projectName", width: 120, allowEditing: false, fixed: true },*/
{ caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true }, { caption: $translate.instant('period'), dataField: "period", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true }, { caption: $translate.instant('source'), dataField: "source", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('advancePrice'), dataField: "advance", width: 200, allowEditing: false, fixed: true }, { caption: $translate.instant('advancePrice'), dataField: "advance", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('approvedPrice'), dataField: "approvedStandardInvoiceAmount", width: 200, allowEditing: false, fixed: true }, { caption: $translate.instant('approvedPrice'), dataField: "approvedStandardInvoiceAmount", width: 200, allowEditing: false, fixed: true },
/* { caption: $translate.instant('createBy'), dataField: "createdBy", width: 200, allowEditing: false, fixed: true },*/ /* { caption: $translate.instant('createBy'), dataField: "createdBy", width: 200, allowEditing: false, fixed: true },*/
{ caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true } { caption: $translate.instant('createTime'), dataField: "createTime", width: '15%', allowEditing: false, fixed: true }
]; ];
$scope.assetsResultGridOptions = { $scope.assetsResultGridOptions = {
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
//导出数据 //导出数据
$scope.downloadTB = function () { $scope.downloadTB = function () {
citPreviewDataService.exportData( $scope.queryParams).success(function (data, status, headers) { citPreviewDataService.exportDataSalaryAdvance( $scope.queryParams).success(function (data, status, headers) {
if(status===204){ if(status===204){
SweetAlert.warning("没有数据可以下载"); SweetAlert.warning("没有数据可以下载");
return; return;
...@@ -101,8 +101,7 @@ ...@@ -101,8 +101,7 @@
$scope.doDataReset = function () { $scope.doDataReset = function () {
$scope.queryParams.period = null; $scope.queryParams.period = null;
$scope.queryParams.compensationSaleAmount = null; $scope.queryParams.poSubjectName = null;
$scope.queryParams.assetLabelNumber = null;
$scope.refreshConfigGrid(); $scope.refreshConfigGrid();
} }
$scope.doSearch = function () { $scope.doSearch = function () {
...@@ -110,7 +109,7 @@ ...@@ -110,7 +109,7 @@
} }
var initListData = function(){ var initListData = function(){
citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope).success(function (res) { citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope.queryParams).success(function (res) {
$scope.listData = commonWebService._index(res.list); $scope.listData = commonWebService._index(res.list);
$scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount; $scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
...@@ -163,13 +162,15 @@ ...@@ -163,13 +162,15 @@
$scope.queryParams.periodEnd = commonWebService._dateByPicker(start, end).end; $scope.queryParams.periodEnd = commonWebService._dateByPicker(start, end).end;
$scope.refreshConfigGrid(); $scope.refreshConfigGrid();
}); });
$scope.queryParams = {};
$scope.formParam = {};
//分页的设置 //分页的设置
$scope.queryParams.pagingOptions = { $scope.queryParams.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 20, //每页多少条数据 pageSize: 20, //每页多少条数据
}; };
$scope.formParam = {};
initAssetResultDxGrid(); initAssetResultDxGrid();
initListData(); initListData();
})(); })();
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html
View file @ e0b65cf5
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<i class="fa fa-filter" aria-hidden="true"></i> <i class="fa fa-filter" aria-hidden="true"></i>
</button> </button>
<span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：--> <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：-->
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px; width: 200px;" id="input-invoice-period-picker" /> <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px; width: 200px;" id="input-invoice-period-picker" />
<span ng-click="downloadTB()" style=" position: absolute; z-index: 99999999; top: 14px; right: 2%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span> <span ng-click="downloadTB()" style=" position: absolute; z-index: 99999999; top: 14px; right: 2%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
<div class="dt-init-wrapper" style=" position: relative; top: -20px;"> <div class="dt-init-wrapper" style=" position: relative; top: -20px;">
<div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div> <div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="queryParams.pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination> refresh-table="refreshConfigGrid()"></ack-pagination>
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
......
atms-web/src/main/webapp/app/common/controls/mention-input/mention-input.js
View file @ e0b65cf5
...@@ -48,7 +48,6 @@ commonModule ...@@ -48,7 +48,6 @@ commonModule
txt = txt.replace(/\xA0/g, ' ').replace(/\n/g, '').replace(/\r/g, ''); txt = txt.replace(/\xA0/g, ' ').replace(/\n/g, '').replace(/\r/g, '');
txt = _.unescape(txt); txt = _.unescape(txt);
} }
ngModel.$setViewValue(txt); ngModel.$setViewValue(txt);
}; };
...@@ -117,7 +116,6 @@ commonModule ...@@ -117,7 +116,6 @@ commonModule
} }
}); });
} }
element.html(viewValue || ''); element.html(viewValue || '');
}; };
...@@ -897,7 +895,6 @@ commonModule ...@@ -897,7 +895,6 @@ commonModule
var txtNode = document.createTextNode(text); var txtNode = document.createTextNode(text);
range.insertNode(txtNode); range.insertNode(txtNode);
// Preserve the selection // Preserve the selection
range = range.cloneRange(); range = range.cloneRange();
range.setStart(txtNode, txtNode.length); range.setStart(txtNode, txtNode.length);
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ e0b65cf5
var constant = {}; var constant = {};
constant.apiUrl = "http://dts.erp.didichuxing.com:8180/";
constant.regesterInformation = { constant.regesterInformation = {
active: true, active: true,
userKey: "dts.erp.didichuxing.com,164826354976336#A0jDtCLiYzMzYzN9QTNzYjM8QjNxIiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TP7JGMrVjMIV5YHh4L5BTUMNGa9wkc4hzL4QURnpGVPxWWulVQQZDRkRGV7d4NvlVNll5RvJVVohWT98GN5QjQHV5LDlWTNN6SIdVb9Y4QzZUNsZWdwVnI0IyUiwCM8kjMxIjNwQTM0IicfJye&Qf35VfiMjY6cmI0IyQiwiIxEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsISO5UDMxADI7IjMwkTMwIjI0ICdyNkIsISbvNmLn9Wa8VHajlGZpRmLwJXZuMHdkJiOiMXbEJCLig1jlzahlbIilfbtmrIukj1jlzahlDZmpnInmnIvvPLnlH1tmjIvvL0rojqklPZgpjLsm1Yjl1ammLieiom" userKey: "dts.erp.didichuxing.com,164826354976336#A0jDtCLiYzMzYzN9QTNzYjM8QjNxIiOiQWSiwSflNHbhZmOiI7ckJye0ICbuFkI1pjIEJCLi4TP7JGMrVjMIV5YHh4L5BTUMNGa9wkc4hzL4QURnpGVPxWWulVQQZDRkRGV7d4NvlVNll5RvJVVohWT98GN5QjQHV5LDlWTNN6SIdVb9Y4QzZUNsZWdwVnI0IyUiwCM8kjMxIjNwQTM0IicfJye&Qf35VfiMjY6cmI0IyQiwiIxEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsISO5UDMxADI7IjMwkTMwIjI0ICdyNkIsISbvNmLn9Wa8VHajlGZpRmLwJXZuMHdkJiOiMXbEJCLig1jlzahlbIilfbtmrIukj1jlzahlDZmpnInmnIvvPLnlH1tmjIvvL0rojqklPZgpjLsm1Yjl1ammLieiom"
...@@ -54,9 +56,11 @@ constant.payTaxTypeList = [ ...@@ -54,9 +56,11 @@ constant.payTaxTypeList = [
{value: 2, name: '小规模纳税人'}]; {value: 2, name: '小规模纳税人'}];
constant.citReportTypeList = [ constant.citReportTypeList = [
{value: 1, name: '纳税申报表'}, { value: 1, name: 'TaxReturnType',orderIndex:1 },
{value: 2, name: '季度预缴表'}, { value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 2 },
{value: 3, name: '工作底稿'}]; { value: 3, name: 'WorkingPaperType', orderIndex: 3 },
{ value: 4, name: 'DocumentListType', orderIndex: 4 },
{ value: 5, name: 'OtherTaxes', orderIndex: 5 }];
constant.cfReportTypeList = [ constant.cfReportTypeList = [
{value: 1, name: '企业所得税预算'}, {value: 1, name: '企业所得税预算'},
...@@ -1475,7 +1479,8 @@ constant.fileTypeList = [ ...@@ -1475,7 +1479,8 @@ constant.fileTypeList = [
{code:4,type:"资产负债表"}, {code:4,type:"资产负债表"},
{code:5,type:"利润表"}, {code:5,type:"利润表"},
{code:6,type:"直接法现金流量表"}, {code:6,type:"直接法现金流量表"},
{code:7,type:"所有者权益变动表和汇率表"} {code:7,type:"所有者权益变动表"},
{code:8,type:"汇率表"}
]; ];
constant.NationalEconomicIndustryList =[ constant.NationalEconomicIndustryList =[
......
atms-web/src/main/webapp/app/common/utils/enums.js
View file @ e0b65cf5
...@@ -129,7 +129,13 @@ commonModule.factory('enums', ['$translate', function ($translate) { ...@@ -129,7 +129,13 @@ commonModule.factory('enums', ['$translate', function ($translate) {
CF: "11", CF: "11",
AssetsManage: "12" AssetsManage: "12"
}, },
reportType: {
taxReturn: 1,
prepay: 2,
workingPaper: 3,
documentList: 4,
others: 5
},
//发票类型 //发票类型
invoiceType: { invoiceType: {
VATInvoice: 1, VATInvoice: 1,
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
View file @ e0b65cf5
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFile()" <li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFile()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li> <span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0; <li role="separator" class="divider" style="height: 2px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li> overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in fileTypeList"> <li ng-repeat="i in fileTypeList">
<div class="checkbox-custom checkbox-default"> <div class="checkbox-custom checkbox-default">
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.less
View file @ e0b65cf5
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
.dt-init-wrapper { .dt-init-wrapper {
margin: 60px 0; margin: 60px 0;
max-width: 99%; max-width: 99%;
height: calc(~'100% - 25px'); height: calc(100% - 200px);
position: relative; position: relative;
.dropdown { .dropdown {
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.html
View file @ e0b65cf5
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()" <li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li> <span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0; <li role="separator" class="divider" style="height: 2px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li> overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList"> <li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default"> <div class="checkbox-custom checkbox-default">
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.less
View file @ e0b65cf5
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
.dt-init-wrapper { .dt-init-wrapper {
margin: 60px 0; margin: 60px 0;
max-width: 99%; max-width: 99%;
height: calc(~'100% - 25px'); height: calc(100% - 200px);
position: relative; position: relative;
.dropdown { .dropdown {
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js
View file @ e0b65cf5
...@@ -124,6 +124,11 @@ ...@@ -124,6 +124,11 @@
rowAlternationEnabled: true, //单双行颜色 rowAlternationEnabled: true, //单双行颜色
noDataText: $translate.instant('NoDataText'), noDataText: $translate.instant('NoDataText'),
selectAllText: $translate.instant('SelectAll'), selectAllText: $translate.instant('SelectAll'),
searchPanel: {
placeholder: $translate.instant('Search'),
width: 518,
visible: true
},
headerFilter: { headerFilter: {
visible: false, visible: false,
texts: { texts: {
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
.dt-init-wrapper { .dt-init-wrapper {
max-width: 99%; max-width: 99%;
height: calc(~'100% - 25px'); height: calc(100% - 200px);
position: relative; position: relative;
.dropdown { .dropdown {
......
atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.ctrl.js
View file @ e0b65cf5
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
rowAlternationEnabled: true, //单双行颜色 rowAlternationEnabled: true, //单双行颜色
noDataText: $translate.instant('NoDataText'), noDataText: $translate.instant('NoDataText'),
selectAllText: $translate.instant('SelectAll'), selectAllText: $translate.instant('SelectAll'),
searchPanel: {
placeholder: $translate.instant('Search'),
width: 518,
visible: true
},
headerFilter: { headerFilter: {
visible: false, visible: false,
texts: { texts: {
......
atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.less
View file @ e0b65cf5
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 100px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
.dt-init-wrapper { .dt-init-wrapper {
max-width: 99%; max-width: 99%;
height: calc(~'100% - 25px'); height: calc(~'100% - 200px');
position: relative; position: relative;
.dropdown { .dropdown {
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.less
View file @ e0b65cf5
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
.dt-init-wrapper { .dt-init-wrapper {
margin: 30px 0; margin: 30px 0;
max-width: 99%; max-width: 99%;
height: calc(~'100% - 25px'); height: calc(~'100% - 200px');
position: relative; position: relative;
.dropdown { .dropdown {
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html
View file @ e0b65cf5
<div id="app-data-import" class="app-data-import "> <div id="app-data-import" class="app-data-import ">
<nav class="navbar navbar-custom" role="navigation" <nav class="navbar navbar-custom" role="navigation"
style="margin-bottom: 0; border-radius: 0px; background-image:url(../../../app-resources/images/leftbarbg.png); height: 100%;width: 260px"> style="margin-bottom: 0; border-radius: 0px; height: 100%;width: 260px">
<div class="sidebar navbarfix" role="navigation" style="height: 100%;"> <div class="sidebar navbarfix" role="navigation" style="height: 100%;">
<div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 260px"> <div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 260px">
<div class="app-data-import-side-bar" style="height: 100%"> <div class="app-data-import-side-bar" style="height: 100%">
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.less
View file @ e0b65cf5
...@@ -12,66 +12,35 @@ ...@@ -12,66 +12,35 @@
.side-menu-title { .side-menu-title {
margin-left: 6px; margin-left: 6px;
color: black;
font-weight: bold;
} }
.dropdown-collapse{ .dropdown-collapse{
padding: 0 6px; padding: 0 6px;
} }
.app-data-import-side-bar { .nav > li > a.active{
//padding: 10px 0px 0px; font-weight: bold;
/* margin: auto; */ background-color: #a32020 !important;
height: 100%; text-decoration: none;
}
min-height: 594px; .nav > li{
/*background-image:url(../../app-resources/images/login-user-below.png); display: table;
background-repeat:no-repeat; height: 50px;
-moz-background-size:100% 100%; list-style: none;
filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')"; border-bottom: 1px solid #ccc;
background-size:255px 100%; */ position: relative;
.ps-scrollbar-y-rail {
z-index: 9999;
background-color: transparent !important;
.ps-scrollbar-y {
background-color: #ffffff !important;
}
}
.active {
background-color: @color-light-gray-f2;
}
.first-module {
width: 32%;
display: inline-block;
text-align: center;
vertical-align: middle; vertical-align: middle;
padding: 40px; width: 100%;
}
.menu-wrapper {
.img {
padding: 10px;
}
}
}
/* .menu-width{
width: 160px;
}*/
.popover.bottom > .arrow:after {
border-bottom-color: @color-light-gray-e4;
}
.popover { .nav > li > a.active span{
background-color: @color-light-gray-e4; color: #fff;
} }
a { .menu-icons {
text-decoration: none; color: black !important;
b {
color: #ffffff;
}
}
} }
.data-import-wrapper { .data-import-wrapper {
...@@ -84,10 +53,18 @@ ...@@ -84,10 +53,18 @@
height: 100%; height: 100%;
} }
.ps-scrollbar-y-rail {
z-index: 9999;
background-color: transparent !important;
}
.ps-scrollbar-y {
background-color: #aaa !important;
}
.app-data-import { .app-data-import {
height: 101%; height: 101%;
width: 100%; width: 100%;
background-color: #ffffff; background-color: #f2f2f2;
//padding: 0px 15% 0px 5%; //padding: 0px 15% 0px 5%;
/*.center-title { /*.center-title {
...@@ -147,6 +124,58 @@ ...@@ -147,6 +124,58 @@
} }
.app-data-import-side-bar {
//padding: 10px 0px 0px;
/* margin: auto; */
height: 100%;
min-height: 594px;
/*background-image:url(../../app-resources/images/login-user-below.png);
background-repeat:no-repeat;
-moz-background-size:100% 100%;
filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
background-size:255px 100%; */
.active {
background-color: @color-light-gray-f2;
}
.first-module {
width: 32%;
display: inline-block;
text-align: center;
vertical-align: middle;
padding: 40px;
.menu-wrapper {
.img {
padding: 10px;
}
}
}
/* .menu-width{
width: 160px;
}*/
.popover.bottom > .arrow:after {
border-bottom-color: @color-light-gray-e4;
}
.popover {
background-color: @color-light-gray-e4;
}
a {
text-decoration: none;
b {
color: #ffffff;
}
}
}
#importBasicData { #importBasicData {
z-index:9999; z-index:9999;
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html
View file @ e0b65cf5
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<a ui-sref-active="active" data-template-id="{{menu.id}}" <a ui-sref-active="active" data-template-id="{{menu.id}}"
ng-class="{'active':selectedTemplateId===menu.id}" ng-class="{'active':selectedTemplateId===menu.id}"
ui-sref=".reportView({ id: menu.reportId, templateid: menu.id, name:menu.name,templatecode:menu.code })" ui-sref=".reportView({ id: menu.reportId, templateid: menu.id, name:menu.name,templatecode:menu.code })"
ng-bind-html="::menu.name"></a> ng-bind-html="::menu.code+'_'+menu.name"></a>
</div> </div>
</div> </div>
</li> </li>
......
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