Skip to content

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

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

# Conflicts:
#	atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js
parent cccebe28
Hide whitespace changes
Inline Side-by-side
Showing with 922 additions and 2219 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/ResponseUtil.java 0 → 100644
View file @ dfb937a0
package pwc.taxtech.atms.common.util;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.UUID;
public class ResponseUtil {
private static HttpServletResponse response;
public static ServletOutputStream response(HttpServletResponse response, String fileName, String type){
if(type != null){
}
response.setContentType("application/vnd.ms-excel;charset=utf-8");
response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
response.setCharacterEncoding("UTF-8");
response.addHeader("Content-Disposition", "attachment;filename="
+ UUID.randomUUID() + ".xls");
response.addHeader("x-file-name", fileName);
try {
return response.getOutputStream();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
public static ServletOutputStream response(HttpServletResponse response, String fileName){
return response(response, fileName, null );
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/CitPreviewDataController.java
View file @ dfb937a0
package pwc.taxtech.atms.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import pwc.taxtech.atms.common.util.ResponseUtil;
import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
import pwc.taxtech.atms.dto.previewData.CitEAMAssetsDisposalDto;
import pwc.taxtech.atms.dto.previewData.CitSalaryDataDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
import pwc.taxtech.atms.entity.CitSalaryAdvance;
import pwc.taxtech.atms.service.impl.CitPreviewDataServiceImpl;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
@Controller
@RequestMapping("api/v1/citPreviewDataController")
public class CitPreviewDataController {
public class CitPreviewDataController extends BaseController {
@Autowired
private CitPreviewDataServiceImpl citPreviewDataService;
......@@ -22,4 +38,26 @@ public class CitPreviewDataController {
public CamelPagingResultDto<CitSalaryAdvance> getSalaryAdvaceListData(@RequestBody CitSalaryDataDto citSalaryDataDto){
return new CamelPagingResultDto<>(citPreviewDataService.getCitSalaryAdvanceDataList(citSalaryDataDto));
}
@RequestMapping("getCitPreviewEamDisposalDataList")
@ResponseBody
public CamelPagingResultDto<CitEAMAssetsDisposal> getCitPreviewEamDisposalDataList(@RequestBody CitEAMAssetsDisposalDto citSalaryDataDto){
return new CamelPagingResultDto<>(citPreviewDataService.getCitPreviewEamDisposalDataList(citSalaryDataDto));
}
@RequestMapping(value = "exportDataEAM/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportDataEAM(@RequestBody CitEAMAssetsDisposal citEAMAssetsDisposal, HttpServletResponse response) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "yyyy-MM-dd hh:MM:ss");
String format = simpleDateFormat.format(new Date());
String fileName = "EAM资产处理金额记录表"+ format;
int count = citPreviewDataService.exportDataEAM(citEAMAssetsDisposal, ResponseUtil.response(response, fileName));
if (count == 0) {
response.setStatus(SC_NO_CONTENT);
} else {
response.setStatus(SC_OK);
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
View file @ dfb937a0
package pwc.taxtech.atms.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.enums.EnumServiceType;
import pwc.taxtech.atms.dpo.ReportDto;
import pwc.taxtech.atms.dto.FileDto;
......
atms-api/src/main/java/pwc/taxtech/atms/dto/previewData/CitEAMAssetsDisposalDto.java 0 → 100644
View file @ dfb937a0
package pwc.taxtech.atms.dto.previewData;
import com.github.pagehelper.PageInfo;
import pwc.taxtech.atms.dto.input.CamelPagingDto;
public class CitEAMAssetsDisposalDto {
private CamelPagingDto pageInfo;
public CamelPagingDto getPageInfo() {
return this.pageInfo;
}
public void setPageInfo(CamelPagingDto pageInfo) {
this.pageInfo = pageInfo;
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitPreviewDataServiceImpl.java
View file @ dfb937a0
......@@ -5,17 +5,32 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper;
import pwc.taxtech.atms.dao.CitSalaryAdvanceMapper;
import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
import pwc.taxtech.atms.dto.previewData.CitEAMAssetsDisposalDto;
import pwc.taxtech.atms.dto.previewData.CitSalaryDataDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
import pwc.taxtech.atms.dto.vatdto.dd.BalanceSheetDto;
import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceExportDto;
import pwc.taxtech.atms.entity.CitEAMAssetsDisposal;
import pwc.taxtech.atms.entity.CitEAMAssetsDisposalExample;
import pwc.taxtech.atms.entity.CitSalaryAdvance;
import pwc.taxtech.atms.entity.CitSalaryAdvanceExample;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
import pwc.taxtech.atms.vat.dpo.TrialBalanceCondition;
import pwc.taxtech.atms.vat.entity.TrialBalance;
import javax.servlet.ServletOutputStream;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static pwc.taxtech.atms.common.util.SpringContextUtil.trialBalanceMapper;
@Service
public class CitPreviewDataServiceImpl {
public class CitPreviewDataServiceImpl extends BaseService {
@Autowired
private CitSalaryAdvanceMapper citSalaryAdvanceMapper;
......@@ -32,4 +47,54 @@ public class CitPreviewDataServiceImpl {
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
@Autowired
private CitEAMAssetsDisposalMapper citEAMAssetsDisposalMapper;
public PageInfo<CitEAMAssetsDisposal> getCitPreviewEamDisposalDataList(CitEAMAssetsDisposalDto citEAMAssetsDisposalDto) {
CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
CitEAMAssetsDisposalExample.Criteria criteria = example.createCriteria();
Page page = PageHelper.startPage(citEAMAssetsDisposalDto.getPageInfo().getPageIndex(), citEAMAssetsDisposalDto.getPageInfo().getPageSize());
List<CitEAMAssetsDisposal> citSalaryAdvances = citEAMAssetsDisposalMapper.selectByExample(example);
PageInfo<CitEAMAssetsDisposal> pageInfo =new PageInfo<CitEAMAssetsDisposal>(citSalaryAdvances);
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
private Map<String, String> generalEAMHeader() {
Map<String, String> header = new LinkedHashMap<>();
header.put("Date","数据日期");
header.put("Source","来源");
header.put("Period","期间");
header.put("LedgerId","账套ID");
header.put("OccurPeriod","发生期间");
header.put("AssetLabelNumber","资产标签号");
header.put("CompensationSaleAmount","赔偿/变卖金额");
header.put("CreatedBy","主体性质");
return header;
}
public int exportDataEAM(CitEAMAssetsDisposal citEAMAssetsDisposal, ServletOutputStream response) {
try {
CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
List<CitEAMAssetsDisposal> list = citEAMAssetsDisposalMapper.selectByCondition(citEAMAssetsDisposal);
Map<String, String> header = generalEAMHeader();
/*
TrialBalanceCondition condition = new TrialBalanceCondition();
beanUtil.copyProperties(param, condition);
List<TrialBalance> trialBalances = trialBalanceMapper.selectByCondition(condition);*/
/*
Map<String, String> header = generalTBHeader();
List<TrialBalanceExportDto> cellList = new ArrayList<>();
trialBalances.forEach(tb -> {
TrialBalanceExportDto d = new TrialBalanceExportDto();
d = beanUtil.copyProperties(tb, d);
cellList.add(d);
});*/
ExcelUtil.exportExcel(header, list, response);
return list.size();
} catch (Exception e) {
logger.error("EAM资产处理金额记录表: %s", e.getMessage());
return 0;
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ dfb937a0
......@@ -12,7 +12,6 @@ import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.config.SystemConfig;
import pwc.taxtech.atms.common.message.ErrorMessage;
import pwc.taxtech.atms.common.message.ErrorMessageCN;
import pwc.taxtech.atms.common.util.DateUtils;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ dfb937a0
......@@ -36,10 +36,12 @@ import pwc.taxtech.atms.service.impl.BaseService;
import pwc.taxtech.atms.service.impl.CellConfigTranslater;
import pwc.taxtech.atms.service.impl.DistributedIdService;
import pwc.taxtech.atms.vat.dao.*;
import pwc.taxtech.atms.vat.dao.DataValidateLogMapper;
import pwc.taxtech.atms.vat.dpo.DataSourceCellDataDto;
import pwc.taxtech.atms.vat.dpo.DataSourceExtendDto;
import pwc.taxtech.atms.vat.dpo.InputVATInvoiceItemExtendDto;
import pwc.taxtech.atms.vat.entity.*;
import pwc.taxtech.atms.vat.entity.DataValidateLog;
import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper;
import java.io.File;
......@@ -633,14 +635,14 @@ public class ReportServiceImpl extends BaseService {
public void insertDataValidateResult(Map map){
DataValidateLog dataValidateLog = new DataValidateLog();
dataValidateLog.setCreateTime(new Date());
dataValidateLog.setPeriod((String)map.get("period"));
dataValidateLog.setPeriod((Integer) map.get("period"));
dataValidateLog.setProjectId((String)map.get("projectId"));
dataValidateLog.setValidateResult((String)map.get("validateResult"));
dataValidateLog.setResult((String)map.get("result"));
dataValidateLog.setOrganizationId((String)map.get("organizationId"));
dataValidateLog.setCompanyCode((String)map.get("companyCode"));
dataValidateLog.setCompanyName((String)map.get("companyName"));
dataValidateLog.setTmsPeriod(Long.parseLong(map.get("tmsPeriod").toString()));
dataValidateLog.setTmsPeriod((Integer) map.get("tmsPeriod"));
dataValidateLogMapper.insert(dataValidateLog);
}
......
atms-api/src/main/resources/conf/conf_profile_pub.properties
View file @ dfb937a0
jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
jdbc_user=tax_admin
jdbc_password=taxadmin2018
jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc_user=fintax_user_test
jdbc_password=Fintaxuser@123Test
#jdbc_password=111111
jdbc_admin_db=tax_admin
jdbc_admin_db=taxadmin2018
jdbc2_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
jdbc2_user=pwc_invoice
......@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa
mail_jdbc_password=atmsunittestSQL
web.url=http://dts.erp.didichuxing.com:8080
web.url=http://172.20.201.164:9001
#web.url=*
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
......@@ -23,7 +23,7 @@ jwt.expireSecond=180000
jwt.refreshSecond=600
#File Server Config
file.server.url=http://etms.longi-silicon.com:9111
file.server.url=http://172.20.201.164:9001
file.server.upload=/api/v1/upload
#upload
......@@ -33,7 +33,7 @@ max_file_length=104857600
distributed_id_datacenter=10
distributed_id_machine=15
api.url=http://dts.erp.didichuxing.com:8180
api.url=http://172.20.201.164:8180
# Longi config
longi_api_basic_user=
......
atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
View file @ dfb937a0
......@@ -46,7 +46,7 @@
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>-->
<table tableName="bill_detail" domainObjectName="BillDetail">
<table tableName="data_validate_log" domainObjectName="DataValidateLog">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitEAMAssetsDisposalMapper.java
View file @ dfb937a0
......@@ -107,4 +107,6 @@ public interface CitEAMAssetsDisposalMapper extends MyMapper {
int updateByPrimaryKey(CitEAMAssetsDisposal record);
int insertBatch(List<CitEAMAssetsDisposal> citEAMAssetsDisposalList);
List<CitEAMAssetsDisposal> selectByCondition(@Param("citEAMAssetsDisposal") CitEAMAssetsDisposal citEAMAssetsDisposal);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/dao/DataValidateLogMapper.java deleted 100644 → 0
View file @ cccebe28
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.DataValidateLog;
import pwc.taxtech.atms.entity.DataValidateLogExample;
@Mapper
public interface DataValidateLogMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
long countByExample(DataValidateLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int deleteByExample(DataValidateLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int insert(DataValidateLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int insertSelective(DataValidateLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
List<DataValidateLog> selectByExampleWithRowbounds(DataValidateLogExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
List<DataValidateLog> selectByExample(DataValidateLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
DataValidateLog selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int updateByExample(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DataValidateLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
int updateByPrimaryKey(DataValidateLog record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitEAMAssetsDisposal.java
View file @ dfb937a0
package pwc.taxtech.atms.entity;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
......@@ -400,6 +403,7 @@ public class CitEAMAssetsDisposal extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
@JsonSerialize(using = CustomDateSerializer.class)
public Date getCreateTime() {
return createTime;
}
......@@ -424,6 +428,7 @@ public class CitEAMAssetsDisposal extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
@JsonSerialize(using = CustomDateSerializer.class)
public Date getUpdateTime() {
return updateTime;
}
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/DataValidateLog.java deleted 100644 → 0
View file @ cccebe28
package pwc.taxtech.atms.entity;
import java.io.Serializable;
import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table data_validate_log
*
* @mbg.generated do_not_delete_during_merge
*/
public class DataValidateLog extends BaseEntity implements Serializable {
/**
* Database Column Remarks:
* 唯一编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.id
*
* @mbg.generated
*/
private Long id;
/**
* Database Column Remarks:
* 机构ID
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.organization_id
*
* @mbg.generated
*/
private String organizationId;
/**
* Database Column Remarks:
* 项目编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.project_id
*
* @mbg.generated
*/
private String projectId;
/**
* Database Column Remarks:
* 机构代码 org code
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.company_code
*
* @mbg.generated
*/
private String companyCode;
/**
* Database Column Remarks:
* 公司名称 org name
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.company_name
*
* @mbg.generated
*/
private String companyName;
/**
* Database Column Remarks:
* 税务系统期间 yyyyMM 201901-201912
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.tms_period
*
* @mbg.generated
*/
private Integer tmsPeriod;
/**
* Database Column Remarks:
* 期间yyyyMM 201901-201913
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 校验内容
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.validate_content
*
* @mbg.generated
*/
private String validateContent;
/**
* Database Column Remarks:
* 校验结果(end or error )
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.validate_result
*
* @mbg.generated
*/
private String validateResult;
/**
* Database Column Remarks:
* 结果信息
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.result
*
* @mbg.generated
*/
private String result;
/**
* Database Column Remarks:
* 校验人
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.validate_user
*
* @mbg.generated
*/
private String validateUser;
/**
* Database Column Remarks:
* 创建时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.create_time
*
* @mbg.generated
*/
private Date createTime;
/**
* Database Column Remarks:
* 更新时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column data_validate_log.update_time
*
* @mbg.generated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_validate_log
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.id
*
* @return the value of data_validate_log.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.id
*
* @param id the value for data_validate_log.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.organization_id
*
* @return the value of data_validate_log.organization_id
*
* @mbg.generated
*/
public String getOrganizationId() {
return organizationId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.organization_id
*
* @param organizationId the value for data_validate_log.organization_id
*
* @mbg.generated
*/
public void setOrganizationId(String organizationId) {
this.organizationId = organizationId == null ? null : organizationId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.project_id
*
* @return the value of data_validate_log.project_id
*
* @mbg.generated
*/
public String getProjectId() {
return projectId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.project_id
*
* @param projectId the value for data_validate_log.project_id
*
* @mbg.generated
*/
public void setProjectId(String projectId) {
this.projectId = projectId == null ? null : projectId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.company_code
*
* @return the value of data_validate_log.company_code
*
* @mbg.generated
*/
public String getCompanyCode() {
return companyCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.company_code
*
* @param companyCode the value for data_validate_log.company_code
*
* @mbg.generated
*/
public void setCompanyCode(String companyCode) {
this.companyCode = companyCode == null ? null : companyCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.company_name
*
* @return the value of data_validate_log.company_name
*
* @mbg.generated
*/
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.company_name
*
* @param companyName the value for data_validate_log.company_name
*
* @mbg.generated
*/
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.tms_period
*
* @return the value of data_validate_log.tms_period
*
* @mbg.generated
*/
public Integer getTmsPeriod() {
return tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.tms_period
*
* @param tmsPeriod the value for data_validate_log.tms_period
*
* @mbg.generated
*/
public void setTmsPeriod(Integer tmsPeriod) {
this.tmsPeriod = tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.period
*
* @return the value of data_validate_log.period
*
* @mbg.generated
*/
public Integer getPeriod() {
return period;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.period
*
* @param period the value for data_validate_log.period
*
* @mbg.generated
*/
public void setPeriod(Integer period) {
this.period = period;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.validate_content
*
* @return the value of data_validate_log.validate_content
*
* @mbg.generated
*/
public String getValidateContent() {
return validateContent;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.validate_content
*
* @param validateContent the value for data_validate_log.validate_content
*
* @mbg.generated
*/
public void setValidateContent(String validateContent) {
this.validateContent = validateContent == null ? null : validateContent.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.validate_result
*
* @return the value of data_validate_log.validate_result
*
* @mbg.generated
*/
public String getValidateResult() {
return validateResult;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.validate_result
*
* @param validateResult the value for data_validate_log.validate_result
*
* @mbg.generated
*/
public void setValidateResult(String validateResult) {
this.validateResult = validateResult == null ? null : validateResult.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.result
*
* @return the value of data_validate_log.result
*
* @mbg.generated
*/
public String getResult() {
return result;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.result
*
* @param result the value for data_validate_log.result
*
* @mbg.generated
*/
public void setResult(String result) {
this.result = result == null ? null : result.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.validate_user
*
* @return the value of data_validate_log.validate_user
*
* @mbg.generated
*/
public String getValidateUser() {
return validateUser;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.validate_user
*
* @param validateUser the value for data_validate_log.validate_user
*
* @mbg.generated
*/
public void setValidateUser(String validateUser) {
this.validateUser = validateUser == null ? null : validateUser.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.create_time
*
* @return the value of data_validate_log.create_time
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.create_time
*
* @param createTime the value for data_validate_log.create_time
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column data_validate_log.update_time
*
* @return the value of data_validate_log.update_time
*
* @mbg.generated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column data_validate_log.update_time
*
* @param updateTime the value for data_validate_log.update_time
*
* @mbg.generated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId);
sb.append(", projectId=").append(projectId);
sb.append(", companyCode=").append(companyCode);
sb.append(", companyName=").append(companyName);
sb.append(", tmsPeriod=").append(tmsPeriod);
sb.append(", period=").append(period);
sb.append(", validateContent=").append(validateContent);
sb.append(", validateResult=").append(validateResult);
sb.append(", result=").append(result);
sb.append(", validateUser=").append(validateUser);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/DataValidateLogExample.java deleted 100644 → 0
View file @ cccebe28
package pwc.taxtech.atms.entity;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class DataValidateLogExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_validate_log
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_validate_log
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table data_validate_log
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public DataValidateLogExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table data_validate_log
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNull() {
addCriterion("organization_id is null");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNotNull() {
addCriterion("organization_id is not null");
return (Criteria) this;
}
public Criteria andOrganizationIdEqualTo(String value) {
addCriterion("organization_id =", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotEqualTo(String value) {
addCriterion("organization_id <>", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThan(String value) {
addCriterion("organization_id >", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
addCriterion("organization_id >=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThan(String value) {
addCriterion("organization_id <", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
addCriterion("organization_id <=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLike(String value) {
addCriterion("organization_id like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotLike(String value) {
addCriterion("organization_id not like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdIn(List<String> values) {
addCriterion("organization_id in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotIn(List<String> values) {
addCriterion("organization_id not in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdBetween(String value1, String value2) {
addCriterion("organization_id between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotBetween(String value1, String value2) {
addCriterion("organization_id not between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andProjectIdIsNull() {
addCriterion("project_id is null");
return (Criteria) this;
}
public Criteria andProjectIdIsNotNull() {
addCriterion("project_id is not null");
return (Criteria) this;
}
public Criteria andProjectIdEqualTo(String value) {
addCriterion("project_id =", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotEqualTo(String value) {
addCriterion("project_id <>", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThan(String value) {
addCriterion("project_id >", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
addCriterion("project_id >=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThan(String value) {
addCriterion("project_id <", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThanOrEqualTo(String value) {
addCriterion("project_id <=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLike(String value) {
addCriterion("project_id like", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotLike(String value) {
addCriterion("project_id not like", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdIn(List<String> values) {
addCriterion("project_id in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotIn(List<String> values) {
addCriterion("project_id not in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdBetween(String value1, String value2) {
addCriterion("project_id between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotBetween(String value1, String value2) {
addCriterion("project_id not between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andCompanyCodeIsNull() {
addCriterion("company_code is null");
return (Criteria) this;
}
public Criteria andCompanyCodeIsNotNull() {
addCriterion("company_code is not null");
return (Criteria) this;
}
public Criteria andCompanyCodeEqualTo(String value) {
addCriterion("company_code =", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeNotEqualTo(String value) {
addCriterion("company_code <>", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeGreaterThan(String value) {
addCriterion("company_code >", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeGreaterThanOrEqualTo(String value) {
addCriterion("company_code >=", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeLessThan(String value) {
addCriterion("company_code <", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeLessThanOrEqualTo(String value) {
addCriterion("company_code <=", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeLike(String value) {
addCriterion("company_code like", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeNotLike(String value) {
addCriterion("company_code not like", value, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeIn(List<String> values) {
addCriterion("company_code in", values, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeNotIn(List<String> values) {
addCriterion("company_code not in", values, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeBetween(String value1, String value2) {
addCriterion("company_code between", value1, value2, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyCodeNotBetween(String value1, String value2) {
addCriterion("company_code not between", value1, value2, "companyCode");
return (Criteria) this;
}
public Criteria andCompanyNameIsNull() {
addCriterion("company_name is null");
return (Criteria) this;
}
public Criteria andCompanyNameIsNotNull() {
addCriterion("company_name is not null");
return (Criteria) this;
}
public Criteria andCompanyNameEqualTo(String value) {
addCriterion("company_name =", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotEqualTo(String value) {
addCriterion("company_name <>", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThan(String value) {
addCriterion("company_name >", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
addCriterion("company_name >=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThan(String value) {
addCriterion("company_name <", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
addCriterion("company_name <=", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameLike(String value) {
addCriterion("company_name like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotLike(String value) {
addCriterion("company_name not like", value, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameIn(List<String> values) {
addCriterion("company_name in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotIn(List<String> values) {
addCriterion("company_name not in", values, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameBetween(String value1, String value2) {
addCriterion("company_name between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andCompanyNameNotBetween(String value1, String value2) {
addCriterion("company_name not between", value1, value2, "companyName");
return (Criteria) this;
}
public Criteria andTmsPeriodIsNull() {
addCriterion("tms_period is null");
return (Criteria) this;
}
public Criteria andTmsPeriodIsNotNull() {
addCriterion("tms_period is not null");
return (Criteria) this;
}
public Criteria andTmsPeriodEqualTo(Integer value) {
addCriterion("tms_period =", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotEqualTo(Integer value) {
addCriterion("tms_period <>", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThan(Integer value) {
addCriterion("tms_period >", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("tms_period >=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThan(Integer value) {
addCriterion("tms_period <", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThanOrEqualTo(Integer value) {
addCriterion("tms_period <=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodIn(List<Integer> values) {
addCriterion("tms_period in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotIn(List<Integer> values) {
addCriterion("tms_period not in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodBetween(Integer value1, Integer value2) {
addCriterion("tms_period between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("tms_period not between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
}
public Criteria andPeriodIsNotNull() {
addCriterion("period is not null");
return (Criteria) this;
}
public Criteria andPeriodEqualTo(Integer value) {
addCriterion("period =", value, "period");
return (Criteria) this;
}
public Criteria andPeriodNotEqualTo(Integer value) {
addCriterion("period <>", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThan(Integer value) {
addCriterion("period >", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("period >=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThan(Integer value) {
addCriterion("period <", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThanOrEqualTo(Integer value) {
addCriterion("period <=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodIn(List<Integer> values) {
addCriterion("period in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodNotIn(List<Integer> values) {
addCriterion("period not in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodBetween(Integer value1, Integer value2) {
addCriterion("period between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("period not between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andValidateContentIsNull() {
addCriterion("validate_content is null");
return (Criteria) this;
}
public Criteria andValidateContentIsNotNull() {
addCriterion("validate_content is not null");
return (Criteria) this;
}
public Criteria andValidateContentEqualTo(String value) {
addCriterion("validate_content =", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentNotEqualTo(String value) {
addCriterion("validate_content <>", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentGreaterThan(String value) {
addCriterion("validate_content >", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentGreaterThanOrEqualTo(String value) {
addCriterion("validate_content >=", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentLessThan(String value) {
addCriterion("validate_content <", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentLessThanOrEqualTo(String value) {
addCriterion("validate_content <=", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentLike(String value) {
addCriterion("validate_content like", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentNotLike(String value) {
addCriterion("validate_content not like", value, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentIn(List<String> values) {
addCriterion("validate_content in", values, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentNotIn(List<String> values) {
addCriterion("validate_content not in", values, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentBetween(String value1, String value2) {
addCriterion("validate_content between", value1, value2, "validateContent");
return (Criteria) this;
}
public Criteria andValidateContentNotBetween(String value1, String value2) {
addCriterion("validate_content not between", value1, value2, "validateContent");
return (Criteria) this;
}
public Criteria andValidateResultIsNull() {
addCriterion("validate_result is null");
return (Criteria) this;
}
public Criteria andValidateResultIsNotNull() {
addCriterion("validate_result is not null");
return (Criteria) this;
}
public Criteria andValidateResultEqualTo(String value) {
addCriterion("validate_result =", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultNotEqualTo(String value) {
addCriterion("validate_result <>", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultGreaterThan(String value) {
addCriterion("validate_result >", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultGreaterThanOrEqualTo(String value) {
addCriterion("validate_result >=", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultLessThan(String value) {
addCriterion("validate_result <", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultLessThanOrEqualTo(String value) {
addCriterion("validate_result <=", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultLike(String value) {
addCriterion("validate_result like", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultNotLike(String value) {
addCriterion("validate_result not like", value, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultIn(List<String> values) {
addCriterion("validate_result in", values, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultNotIn(List<String> values) {
addCriterion("validate_result not in", values, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultBetween(String value1, String value2) {
addCriterion("validate_result between", value1, value2, "validateResult");
return (Criteria) this;
}
public Criteria andValidateResultNotBetween(String value1, String value2) {
addCriterion("validate_result not between", value1, value2, "validateResult");
return (Criteria) this;
}
public Criteria andResultIsNull() {
addCriterion("result is null");
return (Criteria) this;
}
public Criteria andResultIsNotNull() {
addCriterion("result is not null");
return (Criteria) this;
}
public Criteria andResultEqualTo(String value) {
addCriterion("result =", value, "result");
return (Criteria) this;
}
public Criteria andResultNotEqualTo(String value) {
addCriterion("result <>", value, "result");
return (Criteria) this;
}
public Criteria andResultGreaterThan(String value) {
addCriterion("result >", value, "result");
return (Criteria) this;
}
public Criteria andResultGreaterThanOrEqualTo(String value) {
addCriterion("result >=", value, "result");
return (Criteria) this;
}
public Criteria andResultLessThan(String value) {
addCriterion("result <", value, "result");
return (Criteria) this;
}
public Criteria andResultLessThanOrEqualTo(String value) {
addCriterion("result <=", value, "result");
return (Criteria) this;
}
public Criteria andResultLike(String value) {
addCriterion("result like", value, "result");
return (Criteria) this;
}
public Criteria andResultNotLike(String value) {
addCriterion("result not like", value, "result");
return (Criteria) this;
}
public Criteria andResultIn(List<String> values) {
addCriterion("result in", values, "result");
return (Criteria) this;
}
public Criteria andResultNotIn(List<String> values) {
addCriterion("result not in", values, "result");
return (Criteria) this;
}
public Criteria andResultBetween(String value1, String value2) {
addCriterion("result between", value1, value2, "result");
return (Criteria) this;
}
public Criteria andResultNotBetween(String value1, String value2) {
addCriterion("result not between", value1, value2, "result");
return (Criteria) this;
}
public Criteria andValidateUserIsNull() {
addCriterion("validate_user is null");
return (Criteria) this;
}
public Criteria andValidateUserIsNotNull() {
addCriterion("validate_user is not null");
return (Criteria) this;
}
public Criteria andValidateUserEqualTo(String value) {
addCriterion("validate_user =", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserNotEqualTo(String value) {
addCriterion("validate_user <>", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserGreaterThan(String value) {
addCriterion("validate_user >", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserGreaterThanOrEqualTo(String value) {
addCriterion("validate_user >=", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserLessThan(String value) {
addCriterion("validate_user <", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserLessThanOrEqualTo(String value) {
addCriterion("validate_user <=", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserLike(String value) {
addCriterion("validate_user like", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserNotLike(String value) {
addCriterion("validate_user not like", value, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserIn(List<String> values) {
addCriterion("validate_user in", values, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserNotIn(List<String> values) {
addCriterion("validate_user not in", values, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserBetween(String value1, String value2) {
addCriterion("validate_user between", value1, value2, "validateUser");
return (Criteria) this;
}
public Criteria andValidateUserNotBetween(String value1, String value2) {
addCriterion("validate_user not between", value1, value2, "validateUser");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table data_validate_log
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table data_validate_log
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/DataValidateLogMapper.xml deleted 100644 → 0
View file @ cccebe28
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.DataValidateLogMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.DataValidateLog">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="company_code" jdbcType="VARCHAR" property="companyCode" />
<result column="company_name" jdbcType="VARCHAR" property="companyName" />
<result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="validate_content" jdbcType="VARCHAR" property="validateContent" />
<result column="validate_result" jdbcType="VARCHAR" property="validateResult" />
<result column="result" jdbcType="VARCHAR" property="result" />
<result column="validate_user" jdbcType="VARCHAR" property="validateUser" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, company_code, company_name, tms_period, period,
validate_content, validate_result, result, validate_user, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.DataValidateLogExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from data_validate_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from data_validate_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from data_validate_log
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.DataValidateLogExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from data_validate_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.entity.DataValidateLog">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into data_validate_log (id, organization_id, project_id,
company_code, company_name, tms_period,
period, validate_content, validate_result,
result, validate_user, create_time,
update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{companyCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER},
#{period,jdbcType=INTEGER}, #{validateContent,jdbcType=VARCHAR}, #{validateResult,jdbcType=VARCHAR},
#{result,jdbcType=VARCHAR}, #{validateUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.DataValidateLog">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into data_validate_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="organizationId != null">
organization_id,
</if>
<if test="projectId != null">
project_id,
</if>
<if test="companyCode != null">
company_code,
</if>
<if test="companyName != null">
company_name,
</if>
<if test="tmsPeriod != null">
tms_period,
</if>
<if test="period != null">
period,
</if>
<if test="validateContent != null">
validate_content,
</if>
<if test="validateResult != null">
validate_result,
</if>
<if test="result != null">
result,
</if>
<if test="validateUser != null">
validate_user,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="organizationId != null">
#{organizationId,jdbcType=VARCHAR},
</if>
<if test="projectId != null">
#{projectId,jdbcType=VARCHAR},
</if>
<if test="companyCode != null">
#{companyCode,jdbcType=VARCHAR},
</if>
<if test="companyName != null">
#{companyName,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
#{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
<if test="validateContent != null">
#{validateContent,jdbcType=VARCHAR},
</if>
<if test="validateResult != null">
#{validateResult,jdbcType=VARCHAR},
</if>
<if test="result != null">
#{result,jdbcType=VARCHAR},
</if>
<if test="validateUser != null">
#{validateUser,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entity.DataValidateLogExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from data_validate_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update data_validate_log
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.organizationId != null">
organization_id = #{record.organizationId,jdbcType=VARCHAR},
</if>
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=VARCHAR},
</if>
<if test="record.companyCode != null">
company_code = #{record.companyCode,jdbcType=VARCHAR},
</if>
<if test="record.companyName != null">
company_name = #{record.companyName,jdbcType=VARCHAR},
</if>
<if test="record.tmsPeriod != null">
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
<if test="record.validateContent != null">
validate_content = #{record.validateContent,jdbcType=VARCHAR},
</if>
<if test="record.validateResult != null">
validate_result = #{record.validateResult,jdbcType=VARCHAR},
</if>
<if test="record.result != null">
result = #{record.result,jdbcType=VARCHAR},
</if>
<if test="record.validateUser != null">
validate_user = #{record.validateUser,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update data_validate_log
set id = #{record.id,jdbcType=BIGINT},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
project_id = #{record.projectId,jdbcType=VARCHAR},
company_code = #{record.companyCode,jdbcType=VARCHAR},
company_name = #{record.companyName,jdbcType=VARCHAR},
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
period = #{record.period,jdbcType=INTEGER},
validate_content = #{record.validateContent,jdbcType=VARCHAR},
validate_result = #{record.validateResult,jdbcType=VARCHAR},
result = #{record.result,jdbcType=VARCHAR},
validate_user = #{record.validateUser,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.DataValidateLog">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update data_validate_log
<set>
<if test="organizationId != null">
organization_id = #{organizationId,jdbcType=VARCHAR},
</if>
<if test="projectId != null">
project_id = #{projectId,jdbcType=VARCHAR},
</if>
<if test="companyCode != null">
company_code = #{companyCode,jdbcType=VARCHAR},
</if>
<if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
tms_period = #{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
<if test="validateContent != null">
validate_content = #{validateContent,jdbcType=VARCHAR},
</if>
<if test="validateResult != null">
validate_result = #{validateResult,jdbcType=VARCHAR},
</if>
<if test="result != null">
result = #{result,jdbcType=VARCHAR},
</if>
<if test="validateUser != null">
validate_user = #{validateUser,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.DataValidateLog">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update data_validate_log
set organization_id = #{organizationId,jdbcType=VARCHAR},
project_id = #{projectId,jdbcType=VARCHAR},
company_code = #{companyCode,jdbcType=VARCHAR},
company_name = #{companyName,jdbcType=VARCHAR},
tms_period = #{tmsPeriod,jdbcType=INTEGER},
period = #{period,jdbcType=INTEGER},
validate_content = #{validateContent,jdbcType=VARCHAR},
validate_result = #{validateResult,jdbcType=VARCHAR},
result = #{result,jdbcType=VARCHAR},
validate_user = #{validateUser,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.DataValidateLogExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from data_validate_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitEAMADisposalExtendsMapper.xml
View file @ dfb937a0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
<sql id="QueryCondition">
1 = 1
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.orgId)">
AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
</if>
<if test="citEAMAssetsDisposal.periodStart!=null">
AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
</if>
<if test="citEAMAssetsDisposal.periodEnd!=null">
AND asset_label_number &lt;= #{citEAMAssetsDisposal.assetLabelNumber,jdbcType=INTEGER}
</if>
</sql>
<insert id="insertBatch" parameterType="java.util.List">
insert into cit_eam_assets_disposal
(<include refid="Base_Column_List"/>)
......@@ -61,4 +72,10 @@
SELECT 1 FROM DUAL;
</insert>
<select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitEAMAssetsDisposal">
select * from cit_eam_assets_disposal
WHERE
<include refid="QueryCondition"/>
</select>
</mapper>
\ No newline at end of file
atms-web/src/main/resources/conf_profile_pub.properties
View file @ dfb937a0
api.url=http://dts.erp.didichuxing.com:8180/
api.url=http://172.20.201.164:8180/
cookie.maxAgeSeconds=86400
......
atms-web/src/main/webapp/Scripts/module-part2.js
View file @ dfb937a0
......@@ -866,7 +866,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
appTranslation.load([appTranslation.cit]);
}
],
template: '<cit-preview-account-voucher></cit-preview-account-voucher>'
template: '<cit-preview-eam-disposal-list></cit-preview-eam-disposal-list>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ dfb937a0
......@@ -1125,9 +1125,10 @@
"approvedPrice": "已批准标准发票金额",
"createBy": "创建人",
"createTime" : "创建时间",
"citSalaryAdvance" : "预提重分类数据源"
"citSalaryAdvance" : "预提重分类数据源",
"assetLabelNumber" : "资产标签号",
"compensationSaleAmount" : "赔偿/变卖金额",
"EAMDisposal" : "EAM资产处理金额"
}
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js 0 → 100644
View file @ dfb937a0
citModule.controller('citPreviewEamDisposalController', ['$scope', '$log', '$translate', '$timeout', '$compile', '$uibModal', 'apiInterceptor',
'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatSessionService', 'citSessionService', 'vatImportService', 'loginContext',
'browserService', 'enums', 'vatOperationLogService', 'citPreviewDataService', 'vatCommonService', 'ackMessageBox','commonWebService',
function ($scope, $log, $translate, $timeout, $compile, $uibModal, apiInterceptor, SweetAlert, $q, uiGridConstants,
$interval, vatSessionService, citSessionService, vatImportService, loginContext, browserService, enums, vatOperationLogService, citPreviewDataService,
vatCommonService, ackMessageBox, commonWebService) {
'use strict';
$scope.listData = [];
/* $scope.formOptions = {
formData: salaryData,
colCount: 2,
items: [{
dataField: "FirstName",
editorOptions: {
value: ""
}
},
{
itemType: "button",
horizontalAlignment: "left",
buttonOptions: {
text: "查询",
type: "success",
useSubmitBehavior: true
}
}]
};*/
/* $scope.onFormSubmit = function(e) {//执行查询
e.preventDefault();
};*/
//初始化dx控件
function initAssetResultDxGrid() {
var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
{ caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('createdBy'), dataField: "createBy", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true }
];
$scope.assetsResultGridOptions = {
columns: dupColumns,
bindingOptions: {
"dataSource": "listData",
},
editing: {
mode: "batch",
allowUpdating:true,
},
onInitialized: function (e) {
$scope.dataGridInstance = e.component;
},
onCellPrepared: function (e) {
},
loadPanel: {
enabled: true
},
paging: {
pageSize: 100,
},
searchPanel: {
visible: true,
width: 240,
placeholder: $translate.instant('SearchPlaceholder')
},
showBorders: true,
hoverStateEnabled: true,
//scrolling: { mode: "virtual" },
noDataText: $translate.instant('AccountVoucher_DataGrid_NoDataText'),
height: '99%',
width: '98%',
filterRow: {
visible: true
},
onRowUpdating: function (e) {
},
onToolbarPreparing: function (e) {
}
}
}
//导出数据
$scope.downloadTB = function () {
citPreviewDataService.exportData($scope.queryParams).success(function (data, status, headers) {
if(status===204){
SweetAlert.warning("没有数据可以下载");
return;
}
vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表.xls');
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
}
$scope.doDataReset = function () {
$scope.queryParams.period = "";
$scope.queryParams.compensationSaleAmount = "";
$scope.queryParams.assetLabelNumber = "";
}
$scope.doSearch = function () {
refreshConfigGrid();
}
var initListData = function(){
citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams).success(function (res) {
$scope.listData = commonWebService._index(res.list);
$scope.pagingOptions.totalItems = res.pageInfo.totalCount;
//$scope.$apply();
}).error(function (error) {
swal({
title: "信息",
text: error,
type: "info"
});
});
}
//刷新页面
$scope.refreshConfigGrid = function () {
citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams)
.success(function (res) {
if (res && res.list) {
$scope.listData =commonWebService._index(res.list);
$scope.pagingOptions.totalItems = res.pageInfo.totalCount;
}else {
SweetAlert.error($translate.instant('SystemError'));
}
})
};
//开始
(function initialize() {
$('#input-invoice-period-picker').focus(function () {
$('.filter-button').popover("hide");
});
//初始化month-picker
$('#input-invoice-period-picker').rangePicker({
minDate: minDate,
maxDate: maxDate,
setDate: setDate,
months: $scope.monthList,//['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
ConfirmBtnText: $translate.instant('Confirm'),
CancelBtnText: $translate.instant('ButtonCancel')
})
$scope.queryParams = {};
//分页的设置
$scope.queryParams.pagingOptions = {
pageIndex: 1, //当前页码
totalItems: 0, //总数据
pageSize: 20, //每页多少条数据
};
initAssetResultDxGrid();
initListData();
if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "280px";
}else{
$('.periodInput')[0].style.left = "150px";
}
})();
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html 0 → 100644
View file @ dfb937a0
<div class="cit-import-asset-list">
<div class="top-area-wrapper" style="margin-top: 10px">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
data-templateurl="app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<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;" 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>
</div>
<!-- <div class="widget-container">
<div>查询条件:</div>
<div id="form" dx-form="formOptions"></div>
</div>-->
<div class="dt-init-wrapper">
<div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshConfigGrid()"></ack-pagination>
</div>
</div>
<!-- <div class="error-list-modal">
<div class="modal fade" id="errorListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width: 720px; height: 200px;" role="document">
<div class="modal-content">
<div class="modal-header">
<div class="modal-title">
{{'ImportErrorPopUpTitle' | translate}}
</div>
</div>
<div class="modal-body">
{{'ImportErrorPopUpErrorDetail' | translate}}：
<br/>
<table>
<thead>
<tr>
<th width="10%" style="text-align:center;">{{'ImportErrorPopUpNoCol' | translate}}</th>
<th width="20%">{{'ImportErrorPopUpErrorTypeCol' | translate}}</th>
<th width="10%" style="text-align:center;">{{'ImportErrorPopUpErrorCountCol' |
translate}}
</th>
<th width="60%">{{'ImportErrorPopUpErrorDescCol' | translate}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="error in errorMsgMap track by $index">
<td width="10%" style="text-align:center;">{{$index + 1}}</td>
<td width="20%">{{error.errorType}}</td>
<td width="10%" style="text-align:center;">{{error.errorCount}}</td>
<td width="60%" ng-bind-html="error.errorContent"></td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" data-dismiss="modal"></button>
</div>
</div>
</div>
</div>
</div>-->
<!--资产分类设置界面-->
<!--<script type="text/ng-template" id="set-asset-group-modal.html">
<div class="modal-content">
<div class="modal-header">
<div class="modal-title">
{{'SetAssetGroup' | translate}}
</div>
</div>
<div class="modal-body">
<div class="grid-container">
<div id="assetsGroupGrid" dx-data-grid="assetsGridOptions"
style="max-width: 760px; margin-top: -40px;">
</div>
</div>
</div>
<div class="modal-footer">
<button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"
ng-disabled="!hasEditPermission">{{'Confirm' | translate }}
</button>
<button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled"
ng-disabled="isDisabled">{{'ButtonCancel' | translate }}
</button>
</div>
</div>
</script>-->
<vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.js 0 → 100644
View file @ dfb937a0
citModule.directive('citPreviewEamDisposalList', ['$log', '$translate',
function ($log, $translate) {
'use strict';
$log.debug('citPreviewSalaryAdvanceList.load...');
return {
restrict: 'E',
templateUrl: '/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html' + '?_=' + Math.random(),
scope: {},
controller: 'citPreviewEamDisposalController',
link: function (scope, element) {
}
};
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.less 0 → 100644
View file @ dfb937a0
@import "~/app-resources/less/theme.less";
.cit-import-asset-list {
padding-left: 20px;
height: 96%;
.sweet-alert {
background-color: #eeeeee;
}
.nav-wrapper {
padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
}
.nav-tab {
/*display: inline-block;*/
span {
display: inline-block;
height: 34px;
width: 80px;
text-align: center;
line-height: 34px;
padding: 0 10px;
background-color: #B90808;
color: #FFF;
font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal;
font-size: 14px;
cursor: pointer;
}
.active {
background-color: #F91000;
}
}
}
.alert-warning {
background-color: #FDE2DE;
cursor: pointer;
}
.alert {
color: #CF2D1B;
font-weight: bold;
display: inline-block;
padding: 5px;
float: left;
margin: -45px 0 0 350px;
i {
font-size: 20px;
vertical-align: middle;
margin-right: 5px;
}
}
.dropdown-common() {
display: inline-block;
.select-button {
background-color: #F5F5F5;
padding: 6px 0;
width: 110px;
}
.caret {
margin-top: 8px;
}
.dropdown-menu {
min-width: 140px;
max-height: 400px;
overflow-y: scroll;
li {
text-align: left;
min-height: 0px;
height: 30px;
color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
cursor: pointer;
}
i {
float: right;
font-size: 15px;
}
}
}
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.operation-wrapper {
margin: -40px 15px 0 0;
span {
cursor: pointer;
}
}
.import-wrapper {
margin-top: 10px;
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei";
font-style: normal;
font-size: 14px;
font-weight: bold;
}
.dropdown {
.dropdown-common();
}
input {
width: 50px;
outline: none;
border-radius: 3px;
border: 1px solid #3c3a36;
padding: 2px;
text-align: center;
}
> button:last-child {
float: right;
margin-right: 20px;
}
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
.btn-vat-primary {
min-width: 80px;
}
}
.import-info-wrapper {
display: inline-block;
}
}
.dt-init-wrapper {
margin: 10px 0;
max-width: 99%;
height: calc(~'100% - 80px');
position: relative;
z-index: 1;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.total-Wrapper {
width: 99%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-bottom: 5px;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
/*.balance-ouput-grid-wrapper {
height: calc(~'100% - -10px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 150px;
left: 0;
right: 0;
background-color: #FFF;
}*/
}
.dt-import-wrapper {
margin: 10px 0;
max-width: 99%;
overflow: auto;
height: calc(~"100% - 70px");
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
button {
color: #333;
}
}
}
.error-info-wrapper {
position: absolute;
height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -39px;
z-index: 2;
}
#content-resizer {
width: 110%;
position: absolute;
height: 4px;
bottom: 150px;
left: 0;
right: 0;
background-color: red;
cursor: n-resize;
margin-left: -39px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -200px;
text-align: center;
display: block !important;
}
}
}
#tab_Assets {
display: block;
height: calc(~'100% - 80px');
position: relative;
.total-Wrapper {
width: 72%;
margin-left: 0px;
font-size: 13px;
font-family: 'Microsoft YaHei';
padding-top: 5px;
position: absolute;
z-index: 9;
.total_span {
color: #B4122A !important;
background-color: #ddd !important;
font-size: 12px !important;
font-weight: bold !important;
border-radius: 10px !important;
padding-left: 8px !important;
padding-right: 8px !important;
}
}
.dt-asset-result {
margin: 0px 0;
max-width: 99%;
height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
.herder-center {
text-align: center !important;
vertical-align: middle !important;
/*font-size:13px !important;*/
}
}
}
.error-list-modal {
.modal-title {
color: #FF0000;
}
.modal-body {
max-height: 300px;
overflow-y: auto;
table {
border: 1px solid #CCC;
thead tr th {
height: 30px;
border: 1px solid #CCC;
}
tbody tr td {
height: 25px;
border: 1px solid #CCC;
}
}
}
.modal-footer {
text-align: center;
}
}
.page-form-group {
float: right;
margin-top: 10px;
.page-size {
margin: 0;
}
.pagination {
margin: 0;
}
}
#gridInitData {
border-radius: 3px;
border: 1px solid #d4d4d4;
}
}
.set-asset-list-modal .modal-dialog {
height: 500px;
width: 800px;
.modal-content {
height: 100%;
width: 100%;
}
.modal-title {
color: #333;
font-size: 16px;
font-weight: bold;
}
.modal-body {
height: 76%;
max-width: 760px !important;
margin-left: 22px;
overflow-y: auto;
.herder-center {
text-align: center !important;
}
.column-color {
color: red !important;
}
}
.modal-footer {
text-align:left;
}
}
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html 0 → 100644
View file @ dfb937a0
<div class="popover">
<div class="arrow"></div>
<div class="popover-content">
<div>
<table class="table table-responsive">
<tr>
<td>
<span translate="period"></span>
<input class="form-control input-width-middle" type="text" id="segment3" ng-model="queryParams.period" />
</td>
</tr>
<tr>
<td>
<span translate="compensationSaleAmount"></span>
<input class="form-control input-width-middle" type="text" id="segment3Name" ng-model="queryParams.compensationSaleAmount" />
</td>
</tr>
<tr>
<td>
<span translate="assetLabelNumber"></span>
<input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.assetLabelNumber" />
</td>
</tr>
</table>
</div>
<div class="row">
<div style="float:right;margin-right:10px;">
<button class="btn btn-default btn-primary" ng-click="doSearch()">
<span class="fa fa-chevron-down" aria-hidden="true"> </span> <span translate="Confirm"></span>
</button>
<button class="btn btn-default margin-right10" ng-click="doDataReset()">
<span class="fa fa-times" aria-hidden="true"> </span> <span translate="Reset"></span>
</button>
</div>
</div>
</div>
</div>
atms-web/src/main/webapp/app/common/webservices/citPreviewData.svc.js
View file @ dfb937a0
......@@ -5,6 +5,12 @@ webservices.factory('citPreviewDataService', ['$http', 'apiConfig', function ($h
//获取 预提分类数据源列表数据
getCitPreviewSalaryAdvanceDataList : function(params){
return $http.post('/citPreviewDataController/getSalaryAdvaceListData', {pageInfo: params.pagingOptions, poSubjectName : params.poSubjectName }, apiConfig.createVat());
}
},
getCitPreviewEamDisposalDataList : function (params) {
return $http.post('/citPreviewDataController/getCitPreviewEamDisposalDataList', {pageInfo: params.pagingOptions}, apiConfig.createVat());
},
exportData: function (params) {
return $http.post('/citPreviewDataController/exportDataEAM', params, apiConfig.create({ responseType: 'arraybuffer' }));
}
};
}]);
\ 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