Skip to content

T
traffic-front
Commit 69bb5f36 authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_oracle_neo' into 'dev_oracle' 

Dev oracle neo

See merge request root/atms!120
parents fb389b47 f1e52b40
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 448 additions and 97 deletions
atms-api/pom.xml
View file @ 69bb5f36
......@@ -330,6 +330,13 @@
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcomponents-client -->
<!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-commons -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.1.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
......
atms-api/src/main/java/pwc/taxtech/atms/common/AuthUserHelper.java
View file @ 69bb5f36
package pwc.taxtech.atms.common;
import java.util.Optional;
public interface AuthUserHelper {
String getCurrentAuditor();
Optional<String> getCurrentAuditor();
String getCurrentUserId();
......
atms-api/src/main/java/pwc/taxtech/atms/common/AuthUserHelperImpl.java
View file @ 69bb5f36
......@@ -17,6 +17,7 @@ import pwc.taxtech.atms.exception.ApplicationException;
import pwc.taxtech.atms.security.JwtUser;
import javax.servlet.http.HttpServletRequest;
import java.util.Optional;
@Component
public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper {
......@@ -33,7 +34,7 @@ public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper
* @see pwc.taxtech.atms.common.AuthUserHelper#getCurrentAuditor()
*/
@Override
public String getCurrentAuditor() {
public Optional<String> getCurrentAuditor() {
SecurityContext context = SecurityContextHolder.getContext();
if (context == null) {
throw new ApplicationException("security context is null");
......@@ -46,7 +47,7 @@ public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper
if (Strings.isEmpty(result)) {
throw new ApplicationException("failed to get user name from authentication");
}
return result;
return Optional.of(result);
}
/*
......
atms-api/src/main/java/pwc/taxtech/atms/controller/InputInvoiceImportController.java
View file @ 69bb5f36
package pwc.taxtech.atms.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import pwc.taxtech.atms.dpo.PagingResultDto;
import pwc.taxtech.atms.dto.PagingResultDto;
import pwc.taxtech.atms.dto.vatdto.ImportInputInvoiceDto;
import pwc.taxtech.atms.dto.vatdto.ImportInputInvoiceItemDto;
import pwc.taxtech.atms.dto.vatdto.InputInvoice;
import pwc.taxtech.atms.dto.vatdto.InputVATInvoiceBaseDto;
import pwc.taxtech.atms.dto.vatdto.InputVATInvoiceDto;
import pwc.taxtech.atms.service.IdentityService;
import pwc.taxtech.atms.thirdparty.ExcelSheet;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
......@@ -40,10 +43,11 @@ public class InputInvoiceImportController {
InputInvoiceDataImportServiceImpl inputInvoiceDataImportService;
@Autowired
private IdentityService identityService;
private Logger logger = LoggerFactory.getLogger(InputInvoiceImportController.class);
@RequestMapping(value = "inputInvoicePreviewList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public @ResponseBody
PagingResultDto<InputVATInvoiceDto> getInputInvoiceTreeViewData(@RequestBody InputInvoicePreviewQueryParam paras) {
PagingResultDto<InputInvoice> getInputInvoiceTreeViewData(@RequestBody InputInvoicePreviewQueryParam paras) {
return inputInvoiceDataImportService.getInputInvoiceTreeViewData(paras);
}
......@@ -80,7 +84,7 @@ public class InputInvoiceImportController {
}
private int getDownloadFilePath(InputInvoicePreviewQueryParam paras, OutputStream outputStream) {
List<InputVATInvoiceDto> list = inputInvoiceDataImportService.getInputInvoiceTreeViewData(paras).getList();
List<InputInvoice> list = inputInvoiceDataImportService.getInputInvoiceTreeViewData(paras).getList();
if (list.size() == 0) {
return 0;
}
......@@ -115,7 +119,7 @@ public class InputInvoiceImportController {
excelSheetB.setSheetName("sheetB");
List<InputVatInvoiceItem> inputInvoiceItemList = new ArrayList<>();
for (InputVATInvoiceDto item : list) {
for (InputInvoice item : list) {
inputInvoiceItemList.addAll(inputInvoiceDataImportService.getInputInvoiceItemTreeViewData(item.getId()));
}
excelSheetB.setDataset(inputInvoiceItemList);
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputInvoice.java 0 → 100644
View file @ 69bb5f36
package pwc.taxtech.atms.dto.vatdto;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class InputInvoice {
private String id;
private String fpdm;
private String fphm;
private String kprq;
private String gfsh;
private String gfmc;
private String gfdzdh;
private String gfyhzh;
private String xfsh;
private String xfmc;
private String xfdzdh;
private String xfyhzh;
private String jym;
private String fplx;
private String fplc;
private String jqbh;
private String hjje;
private String hjse;
private String jshj;
private String mwq;
private String kpr;
private String skr;
private String fhr;
private String bz;
private String pzh;
private String dzdh;
private String xtly;
private String fpzt;
private String cyzt;
private String rzzt;
private String rzsq;
private String rzsj;
private String rzjg;
private String rzjgms;
private String cjsj;
private String lcbh;
private String fpyx;
private String blyy;
private String lrrq;
private String companyid;
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/OutputInvoice.java 0 → 100644
View file @ 69bb5f36
package pwc.taxtech.atms.dto.vatdto;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class OutputInvoice {
private String id;
private String fpqqlsh;
private String fpdm;
private String fphm;
private String kprq;
private String fplxdm;
private String ewm;
private String jqbh;
private String jym;
private String gfmc;
private String gfsh;
private String gfdzdh;
private String gfyhzh;
private String xfsh;
private String xfmc;
private String xfdzdh;
private String xfyhzh;
private String bz;
private String skr;
private String fhr;
private String kpr;
private String kddh;
private String kduuid;
private String fplx;
private String kpzt;
private String fpzt;
private String yfpdm;
private String yfphm;
private String gfgsbm;
private String xfgsbm;
private String spbh;
private String xtly;
private String cjsj;
private String hjje;
private String hjse;
private String jshj;
private String xxbbh;
private String dyzt;
private String gdjlh;
private String zkje;
private String zkse;
private String zkjshj;
private String slv;
private String qy;
private String jszt;
private String kdgs;
private String shzt;
private String thkpsq;
private String jsfj;
private String sqr;
private String bscdm;
private String bsc;
private String qydm;
private String sqbh;
private String htbh;
private String sqrq;
private String yzrq;
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/RestResponsePage.java 0 → 100644
View file @ 69bb5f36
package pwc.taxtech.atms.dto.vatdto;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import java.util.ArrayList;
import java.util.List;
@Getter
@Setter
public class RestResponsePage<T> extends PageImpl<T> {
private int number;
private int size;
private int totalPages;
private int numberOfElements;
private long totalElements;
private boolean previousPage;
private boolean first;
private boolean nextPage;
private boolean last;
private List<T> content;
private Sort sort;
public RestResponsePage(List<T> content, Pageable pageable, long total) {
super(content, pageable, total);
}
public RestResponsePage(List<T> content) {
super(content);
}
public RestResponsePage() {
super(new ArrayList<T>());
}
public PageImpl<T> pageImpl() {
return new PageImpl<T>(getContent(), new PageRequest(getNumber(),
getSize(), getSort()), getTotalElements());
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaRegionServiceImpl.java
View file @ 69bb5f36
......@@ -165,7 +165,7 @@ public class AreaRegionServiceImpl implements pwc.taxtech.atms.service.AreaRegio
updateLogParams.setOperationContent("");
updateLogParams.setOriginalState(originalArea);
updateLogParams.setUpdateState(updateToArea);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationObject(updateToArea.getName());
updateLogParams.setOperationAction(OperationAction.Update.value());
operationLogService.updateDataAddLog(updateLogParams);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaServiceImpl.java
View file @ 69bb5f36
......@@ -149,7 +149,7 @@ public class AreaServiceImpl implements AreaService {
// OperationLog
operationLogDto = new OperationLogDto();
operationLogDto.setId(CommonUtils.getUUID());
operationLogDto.setOperationUser(authUserHelper.getCurrentAuditor());
operationLogDto.setOperationUser(authUserHelper.getCurrentAuditor().get());
operationLogDto.setIp("");
operationLogDto.setOperationContent(LogMessage.IsActive);
operationLogDto.setAction(OperationAction.Update.value());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/BusinessUnitServiceImpl.java
View file @ 69bb5f36
......@@ -159,7 +159,7 @@ public class BusinessUnitServiceImpl implements BusinessUnitService {
updateLogParams.setOperationObject(originBusinessUnit.getName());
updateLogParams.setOriginalState(originBusinessUnit);
updateLogParams.setUpdateState(businessUnit);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationModule(OperationModule.BasicDataBusinessUnit.value());
updateLogParams.setOperationAction(OperationAction.Update.value());
updateLogParams.setOperateLogType(OperateLogType.OperationLogBasicData.value());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CustomerServiceImpl.java
View file @ 69bb5f36
......@@ -202,7 +202,7 @@ public class CustomerServiceImpl implements CustomerService {
customerDto.getCode() + CommonConstants.PLUS_SIGN_SEPARATOR + customerDto.getName());
updateLogParams.setOriginalState(originCustomer);
updateLogParams.setUpdateState(existedCustomer);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationModule(OperationModule.BasicDataCustomer.value());
updateLogParams.setComment(getAccountNameById(customerDto.getEnterPriseAccountId()));
updateLogParams.setOperationAction(OperationAction.Update.value());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountServiceImpl.java
View file @ 69bb5f36
......@@ -230,7 +230,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
EnterpriseAccountSet enterpriseAccountSet = enterpriseAccountSetMapper.selectByPrimaryKey(enterpriseAccountDto.getEnterpriseAccountSetId());
//add operational log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
updateLogParams.setOperationContent(enterpriseAccountDto.getCode() + " " + enterpriseAccountDto.getName());
......@@ -340,7 +340,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
EnterpriseAccountSet enterpriseAccountSet = enterpriseAccountSetMapper.selectByPrimaryKey(enterpriseAccountDto.getEnterpriseAccountSetId());
//operation log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState(getEnterpriseAccountInfo(entityToUpdate));
updateLogParams.setOriginalState(getEnterpriseAccountInfo(entityCopy));
updateLogParams.setOperationContent(enterpriseAccountDto.getCode() + " " + enterpriseAccountDto.getName());
......@@ -525,7 +525,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
//create operationlog for creating enterprise account set
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
updateLogParams.setOperationContent("");
......@@ -989,7 +989,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
manual.setStandardCode(stdAccount.getCode());
manual.setOrganizationId(organization.getId());
manual.setEnterpriseAccountSetId(accountSetId);
manual.setUpdateBy(authUserHelper.getCurrentAuditor());
manual.setUpdateBy(authUserHelper.getCurrentAuditor().get());
manual.setUpdateTime(new Date());
addManualMappingRecord(manual);
//endregion
......@@ -1133,7 +1133,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
manual.setOrganizationId(orgId);
manual.setEnterpriseAccountSetId(accountSetId);
manual.setIndustryId(industryId);
manual.setUpdateBy(authUserHelper.getCurrentAuditor());
manual.setUpdateBy(authUserHelper.getCurrentAuditor().get());
manual.setUpdateTime(new Date());
addManualMappingRecord(manual);
//endregion
......@@ -1575,7 +1575,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
updateLogParams.setOriginalState(parentNodeOriginal);
updateLogParams.setUpdateState(parentNode);
updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setComment(LogMessage.EnterpriceAccountImportUpdate);
updateLogParams.setOperationObject(parentNodeOriginal.getName());
updateLogParams.setOperationContent("operation content");
......@@ -1623,7 +1623,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
updateLogParams.setOriginalState(parentNodeOriginal);
updateLogParams.setUpdateState(parentNodeEntity);
updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setComment(LogMessage.EnterpriceAccountImportUpdate);
updateLogParams.setOperationObject(parentNodeOriginal.getName());
updateLogParams.setOperationContent("operation content");
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountSetServiceImpl.java
View file @ 69bb5f36
......@@ -150,7 +150,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
if(isChangeEnterpriseAccountSetName || isChangeEnterpriseAccountSetCode) {
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState(updateToEntity);
updateLogParams.setOriginalState(entity);
updateLogParams.setOperationContent("");
......@@ -326,7 +326,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
List<UpdateLogParams> updateLogParamsList = new ArrayList<>();
for(EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto : enterpriseAccountSetOrgDtoList) {
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
updateLogParams.setOperationContent(enterpriseAccountSetOrgDto.getOrganizationName());
......@@ -386,7 +386,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
//operational log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationObject(enterpriseAccountSetOrgDto.getEnterpriseAccountSetName());
updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
updateLogParams.setOperateLogType(OperateLogType.OperationLogEnterPrise.value());
......@@ -434,7 +434,7 @@ public class EnterpriseAccountSetServiceImpl implements EnterpriseAccountSetServ
List<UpdateLogParams> updateLogParamsList = new ArrayList<>();
for(EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto : enterpriseAccountSetOrgDtoList) {
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
updateLogParams.setOperationContent(enterpriseAccountSetOrgDto.getOrganizationName());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OperationLogServiceImpl.java
View file @ 69bb5f36
......@@ -57,7 +57,7 @@ public class OperationLogServiceImpl extends AbstractService implements Operatio
record.setId(CommonUtils.getUUID());
record.setIp(authUserHelper.getClientIp());
record.setOperationUser(authUserHelper.getCurrentAuditor());
record.setOperationUser(authUserHelper.getCurrentAuditor().get());
record.setCreateTime(new Date());
record.setOperationContent(operationLogDto.getOperationContent());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationStructureServiceImpl.java
View file @ 69bb5f36
......@@ -164,7 +164,7 @@ public class OrganizationStructureServiceImpl implements OrganizationStructureSe
updateLogParams.setOperationObject(originOrganizationStructure.getName());
updateLogParams.setOriginalState(originOrganizationStructure);
updateLogParams.setUpdateState(organizationStructure);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationModule(OperationModule.BasicDataOrganizationStructure.value());
updateLogParams.setOperationAction(OperationAction.Update.value());
updateLogParams.setOperateLogType(OperateLogType.OperationLogBasicData.value());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectServiceImpl.java
View file @ 69bb5f36
......@@ -136,7 +136,7 @@ public class ProjectServiceImpl implements ProjectService {
List<ProjectDisplayDto> data = projectMapper.getProjectList(orgId, serviceId, projectYear);
//获取每个项目的项目状态
data.forEach(p -> {
List<ProjectStatusManage> manageStatus = projectMapper.getProjectSatusListByDbName(p.getId());
List<ProjectStatusManage> manageStatus = projectMapper.getStatusesByProjectId(p.getId());
Map<Integer, Integer> dic = new HashMap<>();
manageStatus.forEach(m -> {
dic.put(m.getPeriodId(), m.getStatus());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/RoleServiceImpl.java
View file @ 69bb5f36
......@@ -1003,7 +1003,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// operation log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationContent(user.getUserName());
updateLogParams.setOperationObject(role.getName());
updateLogParams.setOperationAction(OperationAction.New.value());
......@@ -1035,7 +1035,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
User user = userMapper.selectByPrimaryKey(userId);
Role role = roleMapper.selectByPrimaryKey(roleId);
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationContent(user == null ? "" : user.getUserName());
updateLogParams.setOperationObject(role == null ? "" : role.getName());
updateLogParams.setOperationAction(OperationAction.DeleteUser.value());
......@@ -1096,7 +1096,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// operation log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationContent("");
updateLogParams.setOperationObject(roleCategoryName);
updateLogParams.setOperationAction(OperationAction.New.value());
......@@ -1133,7 +1133,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
updateLogParams.setOperationObject(roleCategoryOriginal.getName());
updateLogParams.setOriginalState(roleCategoryOriginal);
updateLogParams.setUpdateState(roleCategoryToUpdate);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setComment("");
updateLogParams.setOperationAction(OperationAction.Update.value());
......@@ -1168,7 +1168,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// operation log
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationContent("");
updateLogParams.setOperationObject(roleCategoryToDelete.getName());
updateLogParams.setOperationAction(OperationAction.Delete.value());
......@@ -1208,7 +1208,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// operation log for add role
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationModule(OperationModule.Role.value());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationContent("");
updateLogParams.setOperationObject(roleToAdd.getName());
updateLogParams.setOperationAction(OperationAction.New.value());
......@@ -1233,7 +1233,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// 增加权限日志
UpdateLogParams permissionLogParams = new UpdateLogParams();
permissionLogParams.setOperationModule(OperationModule.Role.value());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
permissionLogParams.setOperationContent(permission.getName());
permissionLogParams.setOperationObject(roleToAdd.getName());
permissionLogParams.setOperationAction(OperationAction.AddNewPermission.value());
......@@ -1277,7 +1277,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
updateRoleLogParams.setOperationObject(roleOriginal.getName());
updateRoleLogParams.setOriginalState(roleOriginal);
updateRoleLogParams.setUpdateState(roleToUpdate);
updateRoleLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateRoleLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateRoleLogParams.setOperationModule(OperationModule.Role.value());
updateRoleLogParams.setComment("");
updateRoleLogParams.setOperationAction(OperationAction.Update.value());
......@@ -1315,7 +1315,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
UpdateLogParams permissionLogParams = new UpdateLogParams();
permissionLogParams.setOperationModule(OperationModule.Role.value());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
permissionLogParams.setOperationContent(permission.getName());
permissionLogParams.setOperationObject(roleOriginal.getName());
permissionLogParams.setOperationAction(OperationAction.Delete.value());
......@@ -1338,7 +1338,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
UpdateLogParams permissionLogParams = new UpdateLogParams();
permissionLogParams.setOperationModule(OperationModule.Role.value());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
permissionLogParams.setOperationContent(permission.getName());
permissionLogParams.setOperationObject(roleOriginal.getName());
permissionLogParams.setOperationAction(OperationAction.New.value());
......@@ -1394,7 +1394,7 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
// operation log
UpdateLogParams permissionLogParams = new UpdateLogParams();
permissionLogParams.setOperationModule(OperationModule.Role.value());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
permissionLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
permissionLogParams.setOperationContent(roleDto.getName());
permissionLogParams.setOperationObject(roleDto.getName());
permissionLogParams.setOperationAction(OperationAction.Delete.value());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserAccountServiceImpl.java
View file @ 69bb5f36
......@@ -76,7 +76,7 @@ public class UserAccountServiceImpl extends AbstractService implements UserAccou
@Override
public OperationResultDto<LoginOutputDto> changeExternalUserPassword(UserPasswordDto userPasswordDto) {
logger.debug("修改密码 Start");
final String userName = authUserHelper.getCurrentAuditor();
final String userName = authUserHelper.getCurrentAuditor().get();
// find exist user
User tempUser = userMapper.selectByUserNameIgnoreCase(userName);
......@@ -291,7 +291,7 @@ public class UserAccountServiceImpl extends AbstractService implements UserAccou
@Override
public OperationResultDto<User> addUser(UserAndUserRoleSaveDto userAndUserRoleSaveDto) {
String userName = authUserHelper.getCurrentAuditor();
String userName = authUserHelper.getCurrentAuditor().get();
OperationResultDto<User> operationResultDto = new OperationResultDto<>();
OperationResultDto<User> result = userService.checkUserExist(userAndUserRoleSaveDto.getUserName(),
CommonConstants.EMPTY_UUID);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserRoleServiceImpl.java
View file @ 69bb5f36
......@@ -767,7 +767,7 @@ public class UserRoleServiceImpl extends AbstractService implements UserRoleServ
updateLogParams.setOriginalState(originalObj);
updateLogParams.setOperationContent(operationContent);
updateLogParams.setUpdateState(updateObj);
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor());
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setOperationModule(operationModule);
updateLogParams.setOperationAction(OperationAction.Update.value());
updateLogParams.setOperateLogType(logType);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java
View file @ 69bb5f36
......@@ -702,7 +702,7 @@ public class UserServiceImpl extends AbstractService implements UserService {
User user = userMapper.selectByPrimaryKey(userDto.getId());
Assert.notNull(user, "Null user");
if (!Objects.equals(userDto.getIsAdmin(), BooleanUtils.isTrue(user.getIsAdmin()))) {
String userName = authUserHelper.getCurrentAuditor();
String userName = authUserHelper.getCurrentAuditor().get();
User operateUser = userMapper.selectByUserNameIgnoreCase(userName);
if (operateUser != null && BooleanUtils.isFalse(operateUser.getIsAdmin())) {
operationResultDto.setResult(false);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java
View file @ 69bb5f36
package pwc.taxtech.atms.vat.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.apache.ibatis.session.SqlSession;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.constant.enums.EnumValidationType;
import pwc.taxtech.atms.dpo.PagingResultDto;
import pwc.taxtech.atms.dto.FieldsMapper;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.PagingResultDto;
import pwc.taxtech.atms.dto.vatdto.InputInvoice;
import pwc.taxtech.atms.dto.vatdto.InputVATInvoiceDto;
import pwc.taxtech.atms.dto.vatdto.RestResponsePage;
import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Comparator;
......@@ -33,25 +42,27 @@ public class InputInvoiceDataImportServiceImpl extends VatAbstractService {
@Autowired
private SqlSessionTemplate dynamicSqlSessionTemplate;
public PagingResultDto<InputVATInvoiceDto> getInputInvoiceTreeViewData(InputInvoicePreviewQueryParam paras) {
PagingResultDto<InputVATInvoiceDto> qResult = new PagingResultDto<>();
qResult.setPageInfo(paras.getPageInfo());
qResult.setList(new ArrayList<>());
long result = inputVATInvoiceMapper.getInputVATInvoiceCountByCondition(paras);
qResult.getPageInfo().setTotalCount((int) result);
if (result > 0) {
int limitFrom = paras.getPageInfo().getPageSize() * (paras.getPageInfo().getPageIndex() - 1);
List<InputVATInvoiceDto> fResult = new ArrayList<>();
inputVATInvoiceMapper.getInputVATInvoiceCountByConditionWithPaging(paras, limitFrom).forEach(a -> {
InputVATInvoiceDto inputVATInvoiceDto = new InputVATInvoiceDto();
CommonUtils.copyProperties(a, inputVATInvoiceDto);
fResult.add(inputVATInvoiceDto);
});
qResult.setList(fResult);
public PagingResultDto<InputInvoice> getInputInvoiceTreeViewData(InputInvoicePreviewQueryParam paras) {
return get(paras.getInvoiceCode(), paras.getPeriodStart(), paras.getPageInfo().getPageIndex(), paras.getPageInfo().getPageSize());
}
private PagingResultDto<InputInvoice> get(String code, int period, int page, int size) {
PagingResultDto<InputInvoice> pageInput = null;
try (CloseableHttpClient httpclient = HttpClients.createDefault();) {
HttpGet httpget = new HttpGet("http://localhost:8089/input_invoices?page=" + page + "&size=" + size
+ "&code=" + code + "&period=" + period);
try (CloseableHttpResponse response = httpclient.execute(httpget)) {
String inputStr = EntityUtils.toString(response.getEntity());
pageInput = JSONObject.parseObject(inputStr, new TypeReference<PagingResultDto<InputInvoice>>() {
}.getType());
}
} catch (IOException e) {
e.printStackTrace();
}
return qResult;
return pageInput;
}
public List<InputVatInvoiceItem> getInputInvoiceItemTreeViewData(String id) {
InputVatInvoiceItemExample example = new InputVatInvoiceItemExample();
example.createCriteria().andInputVATInvoiceIdEqualTo(id);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java
View file @ 69bb5f36
package pwc.taxtech.atms.vat.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.apache.ibatis.session.SqlSession;
import org.mybatis.spring.SqlSessionTemplate;
......@@ -13,6 +20,8 @@ import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.dpo.PagingResultDto;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.vatdto.ImportOutputInvoiceDto;
import pwc.taxtech.atms.dto.vatdto.InputInvoice;
import pwc.taxtech.atms.dto.vatdto.OutputInvoice;
import pwc.taxtech.atms.dto.vatdto.QueryEvidenceDto;
import pwc.taxtech.atms.vat.dao.ImportFileMapper;
import pwc.taxtech.atms.vat.dpo.OutputVATInvoiceInfoDto;
......@@ -23,6 +32,7 @@ import pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample;
import java.io.IOException;
import java.io.StringReader;
import java.math.BigDecimal;
import java.util.ArrayList;
......@@ -57,6 +67,22 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
return qResult;
}
private PagingResultDto<OutputInvoice> get(String code, int period, int page, int size) {
PagingResultDto<OutputInvoice> pageInput = null;
try (CloseableHttpClient httpclient = HttpClients.createDefault();) {
HttpGet httpget = new HttpGet("http://localhost:8089/output_invoices?page=" + page + "&size=" + size
+ "&code=" + code + "&period=" + period);
try (CloseableHttpResponse response = httpclient.execute(httpget)) {
String inputStr = EntityUtils.toString(response.getEntity());
pageInput = JSONObject.parseObject(inputStr, new TypeReference<PagingResultDto<OutputInvoice>>() {
}.getType());
}
} catch (IOException e) {
e.printStackTrace();
}
return pageInput;
}
public OperationResultDto<List<OutputVATInvoiceInfoDto>> getExportOutputInvoiceList(QueryOutputDto queryDto) {
OperationResultDto<List<OutputVATInvoiceInfoDto>> result = new OperationResultDto<>();
List<OutputVATInvoiceInfoDto> finalList = getQueryList(queryDto);
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
View file @ 69bb5f36
......@@ -165,13 +165,13 @@ public interface ProjectMapper extends MyMapper {
@Param("projectYear") Integer projectYear);
@Select("SELECT " +
" p.PERIOD_ID, p.Status " +
" p.PERIOD_ID AS periodId, p.STATUS AS status " +
"FROM " +
" PROJECT_STATUS_MANAGE p " +
"WHERE " +
" p.DB_NAME = #{projectID} " +
"ORDER BY PERIOD_ID , Status")
List<ProjectStatusManage> getProjectSatusListByDbName(String projectID);
" p.PROJECT_ID = #{projectId} " +
"ORDER BY PERIOD_ID , STATUS")
List<ProjectStatusManage> getStatusesByProjectId(String projectId);
@Select("<script>" +
"SELECT " +
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateConfigExample.java
View file @ 69bb5f36
......@@ -7,7 +7,7 @@ import java.util.List;
public class PeriodCellTemplateConfigExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -15,7 +15,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -23,7 +23,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -31,7 +31,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -41,7 +41,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -51,7 +51,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -61,7 +61,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -71,7 +71,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -81,7 +81,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -91,7 +91,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -101,7 +101,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -113,7 +113,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -127,7 +127,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -138,7 +138,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -150,7 +150,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......@@ -1844,11 +1844,81 @@ public class PeriodCellTemplateConfigExample {
addCriterion("KEY_VALUE_PARSED_FORMULA not between", value1, value2, "keyValueParsedFormula");
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;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated do_not_delete_during_merge
*/
......@@ -1861,7 +1931,7 @@ public class PeriodCellTemplateConfigExample {
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE_CONFIG
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE_CONFIG
*
* @mbg.generated
*/
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateExample.java
View file @ 69bb5f36
......@@ -7,7 +7,7 @@ import java.util.List;
public class PeriodCellTemplateExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -15,7 +15,7 @@ public class PeriodCellTemplateExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -23,7 +23,7 @@ public class PeriodCellTemplateExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This field corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -31,7 +31,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -41,7 +41,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -51,7 +51,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -61,7 +61,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -71,7 +71,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -81,7 +81,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -91,7 +91,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -101,7 +101,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -113,7 +113,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -127,7 +127,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -138,7 +138,7 @@ public class PeriodCellTemplateExample {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -150,7 +150,7 @@ public class PeriodCellTemplateExample {
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......@@ -1204,11 +1204,81 @@ public class PeriodCellTemplateExample {
addCriterion("UPDATE_BY not between", value1, value2, "updateBy");
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;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated do_not_delete_during_merge
*/
......@@ -1221,7 +1291,7 @@ public class PeriodCellTemplateExample {
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.PERIOD_CELL_TEMPLATE
* This class corresponds to the database table TAX_ADMIN.PERIOD_CELL_TEMPLATE
*
* @mbg.generated
*/
......
atms-invoice/.gitignore 0 → 100644
View file @ 69bb5f36
This diff is collapsed.
atms-invoice/pom.xml 0 → 100644
View file @ 69bb5f36
This diff is collapsed.
atms-invoice/src/main/resources/application.yml 0 → 100644
View file @ 69bb5f36
This diff is collapsed.
pom.xml
View file @ 69bb5f36
This diff is collapsed.
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