Skip to content

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

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

parents 281e5c4d 7a2d3f63
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 499 additions and 351 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/AuthUserHelperImpl.java
View file @ bd6d6fa1
......@@ -128,6 +128,6 @@ public class AuthUserHelperImpl implements AuditorAware<String>, AuthUserHelper
if (jwtUser == null) {
return null;
}
return (DDUserInfo)jwtUser.getClientUserInfo();
return (DDUserInfo)jwtUser.getDefaultClaims().get("dduserInfo");
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/AnalysisController.java
View file @ bd6d6fa1
......@@ -79,13 +79,13 @@ public class AnalysisController extends BaseController {
@ResponseBody
@RequestMapping(value = "DomesitcExcelFile", method = RequestMethod.POST)
public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file, @RequestParam String period, @RequestParam Integer type,@RequestParam String companyName) {
public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file, @RequestParam String period, @RequestParam Integer type) {
try {
String valMsg = valParameter(file,period,type);
if(StringUtils.isNotEmpty(valMsg)){
return OperationResultDto.error(valMsg);
}
return analysisServiceImpl.importDomesitcExcelFile(file,period, type,companyName);
return analysisServiceImpl.importDomesitcExcelFile(file,period, type);
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
} catch (Exception e) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CellCommentController.java
View file @ bd6d6fa1
......@@ -24,6 +24,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.locks.ReentrantLock;
@RestController
@RequestMapping(value = "api/v1/CellComment")
......@@ -104,10 +105,11 @@ public class CellCommentController {
}
@RequestMapping("selectEntryLog")
public OperationResultDto selectEntryLog(String code) {
public OperationResultDto selectEntryLog(String code, Long id ) {
OperationResultDto operationResultDto = new OperationResultDto();
OperationLogEntryLogExample operationLogEntryLogExample = new OperationLogEntryLogExample();
OperationLogEntryLogExample.Criteria criteria = operationLogEntryLogExample.createCriteria();
criteria.andIdEqualTo(id);
criteria.andSubjectCodeEqualTo(code);
operationResultDto.setData(operationLogEntryLogMapper.selectByExample(operationLogEntryLogExample));
return operationResultDto;
......@@ -118,6 +120,8 @@ public class CellCommentController {
*/
@RequestMapping("addLog")
public OperationResultDto addLog(@RequestBody List<OperationLogEntryLog> operationLogEntryLogs) {
for (OperationLogEntryLog operationLogEntryLog : operationLogEntryLogs) {
operationLogEntryLog.setMyId(distributedIdService.nextId());
operationLogEntryLogMapper.insert(operationLogEntryLog);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CitReportController.java
View file @ bd6d6fa1
package pwc.taxtech.atms.controller;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,7 +13,9 @@ import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.CitAssetsListDto;
import pwc.taxtech.atms.dto.CitJournalAdjustDto;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.vatdto.ManualDataSourceDto;
import pwc.taxtech.atms.dto.vatdto.PeriodJobDto;
import pwc.taxtech.atms.dto.vatdto.ReportDataDto;
import pwc.taxtech.atms.service.impl.CitReportServiceImpl;
import pwc.taxtech.atms.vat.entity.PeriodJob;
import pwc.taxtech.atms.vat.service.impl.ReportServiceImpl;
......@@ -34,7 +37,7 @@ public class CitReportController {
private static Logger logger = LoggerFactory.getLogger(CitReportController.class);
@Autowired
ReportServiceImpl reportService;
CitReportServiceImpl reportService;
@Autowired
CitReportServiceImpl citReportService;
......@@ -134,6 +137,23 @@ public class CitReportController {
}
}
@RequestMapping(value = "reportData/{reportId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public OperationResultDto<ReportDataDto> getReportData(@PathVariable Long reportId, @RequestHeader String from) {
OperationResultDto resultDto = new OperationResultDto();
if (reportId == null || reportId == 0L) {
resultDto.setResult(false);
return resultDto;
}
return reportService.getCellData(reportId, from);
}
@RequestMapping(value = "addCellManualData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity addCellManualDataSource(@RequestBody ManualDataSourceDto data, @RequestHeader String from) {
String projectId = StringUtils.EMPTY;
if (StringUtils.isNotBlank(from) && from.split("@").length > 0) {
projectId = from.split("@")[0];
}
return ResponseEntity.ok(reportService.addCellManualDataSource(data, from));
}
}
\ No newline at end of file
atms-api/src/main/java/pwc/taxtech/atms/controller/DataImportController.java
View file @ bd6d6fa1
......@@ -7,7 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.message.ErrorMessage;
import pwc.taxtech.atms.dpo.PagingDto;
import pwc.taxtech.atms.dto.*;
import pwc.taxtech.atms.dto.analysis.AnalysisInternationlParam;
import pwc.taxtech.atms.dto.dataimport.DataImportAllParam;
import pwc.taxtech.atms.dto.dataimport.DataImportParam;
import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
......@@ -222,6 +222,12 @@ public class DataImportController extends BaseController {
return new CamelPagingResultDto<>(dataImportService.displayImportLog(param));
}
@ResponseBody
@RequestMapping(value = "displayImportLogAll", method = RequestMethod.POST)
public CamelPagingResultDto<DataImportLogDto> displayImportLogAll(@RequestBody DataImportAllParam param) {
return new CamelPagingResultDto<>(dataImportService.displayImportLogAll(param));
}
@ResponseBody
@RequestMapping(value = "displayProcessLog", method = RequestMethod.POST)
public CamelPagingResultDto<DataValidateLogDto> displayProcessLog(@RequestBody DataProcessParam param) {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/dataimport/DataImportAllParam.java 0 → 100644
View file @ bd6d6fa1
package pwc.taxtech.atms.dto.dataimport;
import pwc.taxtech.atms.dto.input.CamelPagingDto;
public class DataImportAllParam {
private CamelPagingDto pageInfo;
private String startDate;
private String endDate;
private Integer type;
public CamelPagingDto getPageInfo() {
return this.pageInfo;
}
public void setPageInfo(CamelPagingDto pageInfo) {
this.pageInfo = pageInfo;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
}
atms-api/src/main/java/pwc/taxtech/atms/dto/dataimport/DataProcessParam.java
View file @ bd6d6fa1
......@@ -2,10 +2,16 @@ package pwc.taxtech.atms.dto.dataimport;
import pwc.taxtech.atms.dto.input.CamelPagingDto;
import java.util.Date;
public class DataProcessParam {
private CamelPagingDto pageInfo;
private String startDate;
private String endDate;
//后续添加查询条件
public CamelPagingDto getPageInfo() {
......@@ -16,4 +22,19 @@ public class DataProcessParam {
this.pageInfo = pageInfo;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
}
atms-api/src/main/java/pwc/taxtech/atms/security/JwtAuthenticationFilter.java
View file @ bd6d6fa1
......@@ -50,48 +50,17 @@ public class JwtAuthenticationFilter extends AbstractAuthenticationProcessingFil
@Override
public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) {
String header = request.getHeader("Authorization");
if (header == null || !(header.startsWith("bearer ") || header.startsWith("Bearer "))) {
throw new AuthenticationCredentialsNotFoundException("No JWT token found in request headers");
}
String authToken = header.substring(7);
if (!StringUtils.hasText(authToken)) {
throw new AuthenticationCredentialsNotFoundException("Empty Bearer token");
}
JwtAuthenticationToken authRequest = new JwtAuthenticationToken(authToken);
setDetails(request, authRequest);
Authentication authResult = getAuthenticationManager().authenticate(authRequest);
if (checkTicket) {
Cookie[] cookies = request.getCookies();
String ticket = "";
try {
for (Cookie cookie : cookies) {
if ("ddTicket".equals(cookie.getName())) {
ticket = cookie.getValue();
break;
}
}
JSONObject object;
String ddResp = HttpUtil.post(getUserInfoUrl + "check_ticket", "ticket=" + ticket + "&app_id=" + appId, "application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
object = JSONObject.parseObject(ddResp);
Map<String, Object> res = object.getInnerMap();
int code = (int) res.get("errno");
if (code != 0) {
logger.warn(String.format("DD Ticket Check Failed:[%s]", object.toJSONString()));
return null;
}
logger.debug("ddTicket校验CODE:"+code);
} catch (Exception e) {
logger.error(String.format("调用DD获取用户信息失败:[%s]", e.getMessage()), e);
}
}
return authResult;
return getAuthenticationManager().authenticate(authRequest);
}
protected void setDetails(HttpServletRequest request,
......@@ -113,7 +82,7 @@ public class JwtAuthenticationFilter extends AbstractAuthenticationProcessingFil
DefaultClaims claims = jwtUser.getDefaultClaims();
if (claims.getExpiration().getTime() - System.currentTimeMillis() <= jwtRefreshSecond * 1000) {
String newToken = jwtUtil.generateToken(jwtUser.getUsername(), jwtUser.getDatabaseUsername(),
jwtUser.getUserid(),jwtUser.getTicket());
jwtUser.getUserid(),(String)claims.get("ticket"));
response.setHeader("Access-Control-Expose-Headers", "refreshToken");
response.setHeader("refreshToken", newToken);
logger.debug("refreshToken: " + newToken);
......
atms-api/src/main/java/pwc/taxtech/atms/security/JwtUser.java
View file @ bd6d6fa1
......@@ -17,21 +17,15 @@ public class JwtUser implements UserDetails {
/** 数据库用户名, 比如Admin */
private final String databaseUsername;
private final String ticket;
private Object clientUserInfo;
private final Collection<? extends GrantedAuthority> authorities;
private DefaultClaims defaultClaims;
public JwtUser(String userid, String username, String databaseUsername,String ticket,Object clientUserInfo,
public JwtUser(String userid, String username, String databaseUsername,
DefaultClaims defaultClaims, Collection<? extends GrantedAuthority> authorities) {
this.userid = userid;
this.username = username;
this.databaseUsername = databaseUsername;
this.ticket = ticket;
this.clientUserInfo = clientUserInfo;
this.authorities = authorities;
this.defaultClaims = defaultClaims;
}
......@@ -71,17 +65,10 @@ public class JwtUser implements UserDetails {
return true;
}
public String getTicket() {
return ticket;
}
public static long getSerialVersionUId() {
return serialVersionUId;
}
public Object getClientUserInfo() {
return clientUserInfo;
}
public String getUserid() {
return userid;
......
atms-api/src/main/java/pwc/taxtech/atms/security/JwtUtil.java
View file @ bd6d6fa1
......@@ -61,6 +61,9 @@ public class JwtUtil implements InitializingBean {
@SuppressWarnings({ "unchecked", "rawtypes" })
public JwtUser parseToken(String token) {
if (StringUtils.hasText(jwtPowerToken) && jwtPowerToken.equals(token)) {
return new JwtUser("test_userid", "admin", "Admin", null, getAuthorities());
}
JwtParser parser = Jwts.parser().setSigningKey(jwtBase64Secret);
Jwt jwt = parser.parseClaimsJws(token);
DefaultJws<DefaultClaims> defaultJws = (DefaultJws<DefaultClaims>) jwt;
......@@ -68,25 +71,8 @@ public class JwtUtil implements InitializingBean {
String databaseUsername = String.valueOf(defaultClaims.get("databaseUsername"));
String username = String.valueOf(defaultClaims.get("username"));
String userid = String.valueOf(defaultClaims.get("userid"));
String ticket = "";
JSONObject object;
Object userInfo = null;
if(checkTicket){
ticket = String.valueOf(defaultClaims.get("ticket"));
try {
String response = HttpUtil.post(getUserInfoUrl+"get_user_by_ticket", "ticket=" + ticket + "&app_id=" + appId, "application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
object = JSONObject.parseObject(response);
Map<String, Object> res = object.getInnerMap();
userInfo = res.get("data");
} catch (Exception e) {
logger.error(String.format("调用DD获取用户信息失败:[%s]", e.getMessage()), e);
}
}
if (StringUtils.hasText(jwtPowerToken) && jwtPowerToken.equals(token)) {
return new JwtUser("test_userid", "admin", "Admin", ticket, userInfo, null, getAuthorities());
}
// 原版 UserDetails return new JwtUser(userid, username, databaseUsername, defaultClaims, getAuthorities());
return new JwtUser(userid, username, databaseUsername, ticket, userInfo, defaultClaims, getAuthorities(userid));
return new JwtUser(userid, username, databaseUsername, defaultClaims, getAuthorities(userid));
}
private List<SimpleGrantedAuthority> getAuthorities() {
......@@ -141,6 +127,18 @@ public class JwtUtil implements InitializingBean {
jwtBuilder.claim("databaseUsername", databaseUsername);
jwtBuilder.claim("userid", userid);
jwtBuilder.claim("ticket", ticket);
DDUserInfo dduserInfo = null;
if(checkTicket){
try {
String response = HttpUtil.post(getUserInfoUrl+"get_user_by_ticket", "ticket=" + ticket + "&app_id=" + appId, "application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
JSONObject object = JSONObject.parseObject(response);
Map<String, Object> res = object.getInnerMap();
dduserInfo = (DDUserInfo)res.get("data");
} catch (Exception e) {
logger.error(String.format("调用DD获取用户信息失败:[%s]", e.getMessage()), e);
}
}
jwtBuilder.claim("dduserInfo", dduserInfo);
// 设置body.username为数据库用户名
jwtBuilder.signWith(SignatureAlgorithm.HS512, jwtBase64Secret);
return jwtBuilder.compact();
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisJobServiceImpl.java
View file @ bd6d6fa1
......@@ -183,10 +183,10 @@ public class AnalysisJobServiceImpl extends BaseService {
* 19/03/2019 15:55
* VAT、CIT申报表取数
* 1、根据机构、项目、期间、报表名称查出所有机构的增值税申报表
* 2、获取该表的row、column、value 计算出部分segment
* 2、获取该表的row、column、value 计算出部分segment[]1
* 3、根据项目、机构、期间、Code-VAT100 查出对应机构的小微纳税人报表
* 4、计算小微segment并合并
* 5、获取利润表segment
* 4、计算小微segment[]2并segment[]1合并
* 5、获取利润表segment[]3
* [orgs,period]
*
* @return
......@@ -333,7 +333,7 @@ public class AnalysisJobServiceImpl extends BaseService {
/**
* 19/03/2019 15:56
* 计算返还后各税种税额
* 计算返还后各税种税额 tax - actualReturn
* [orgs,period]
*
* @return
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ bd6d6fa1
......@@ -34,6 +34,7 @@ import pwc.taxtech.atms.dto.DataExtractParam;
import pwc.taxtech.atms.dto.DataImportLogDto;
import pwc.taxtech.atms.dto.DataValidateLogDto;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.dataimport.DataImportAllParam;
import pwc.taxtech.atms.dto.dataimport.DataImportParam;
import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
import pwc.taxtech.atms.dto.ebsdto.EbsCallRateResp;
......@@ -262,20 +263,20 @@ public class DataImportService extends BaseService {
Sheet sheet = workbook.getSheetAt(i);
if (isSheetEmpty(sheet)) continue;
List<ProfitLossStatement> pls = Lists.newArrayList();
String companyCode = getCellStringValue(sheet.getRow(5).getCell(1));
String companyName = getCellStringValue(sheet.getRow(4).getCell(1));
OrganizationExample example = new OrganizationExample();
example.createCriteria().andCodeEqualTo(companyCode);
example.createCriteria().andNameEqualTo(companyName);
List<Organization> organizations = organizationMapper.selectByExample(example);
String orgId = "";
String companyCode = "";
String taxPayerId = "";
if (organizations.size() > 0) {
orgId = organizations.get(0).getId();
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
companyCode = organizations.get(0).getCode();
}
String periodStr = getCellStringValue(sheet.getRow(2).getCell(2)).substring(3);
String companyName = getCellStringValue(sheet.getRow(4).getCell(1));
String fileType = getCellStringValue(sheet.getRow(0).getCell(2));
Integer period = DateUtils.strToPeriod(periodStr);
......@@ -1798,6 +1799,36 @@ public class DataImportService extends BaseService {
return pageInfo;
}
/**
* 25/02/2019 18:52
*
* [type]
* @author Gary J Li
* @return
*
*/
public PageInfo<DataImportLogDto> displayImportLogAll(DataImportAllParam param) {
Date strDate = DateUtils.strToDate2(param.getStartDate());
Date endDate = DateUtils.strToDate2(param.getEndDate());
DataImportLogExample example = new DataImportLogExample();
DataImportLogExample.Criteria criteria =example.createCriteria();
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate,endDate);
example.setOrderByClause("update_time desc");
PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
.map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
/**
* 25/02/2019 18:52
*
......@@ -1808,6 +1839,9 @@ public class DataImportService extends BaseService {
*/
public PageInfo<DataValidateLogDto> displayProcessLog(DataProcessParam param) {
Date strDate = DateUtils.strToDate2(param.getStartDate());
Date endDate = DateUtils.strToDate2(param.getEndDate());
DataValidateLogExample example = new DataValidateLogExample();
DataValidateLogExample.Criteria criteria =example.createCriteria();
......@@ -1817,7 +1851,7 @@ public class DataImportService extends BaseService {
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
// 这里会导致任何人都可以看到未映射到主体的数据
orgIds.add("");
criteria.andOrganizationIdIn(orgIds);
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate,endDate);
example.setOrderByClause("update_time desc");
PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream()
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/MenuServiceImpl.java
View file @ bd6d6fa1
......@@ -4,7 +4,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import pwc.taxtech.atms.common.CommonConstants;
import pwc.taxtech.atms.common.CommonUtils;
......@@ -14,12 +13,10 @@ import pwc.taxtech.atms.dao.RolePermissionMapper;
import pwc.taxtech.atms.dao.UserRoleMapper;
import pwc.taxtech.atms.dto.MenuDisplayDto;
import pwc.taxtech.atms.dto.MenuDto;
import pwc.taxtech.atms.dto.navtree.DevTreeDto;
import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.exception.ApplicationException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
......@@ -121,62 +118,6 @@ public class MenuServiceImpl {
permissionExample.createCriteria().andIdIn(permissionIds);
List<String> menuIds = permissionMapper.selectByExample(permissionExample)
.stream().map(Permission::getMenuId).collect(Collectors.toList());
// admin权限暂时不做控制
if(moduleId==1){
menuIds.add("91223c21-c15a-4882-89cc-42f3807ec9e3");
menuIds.add("9bf855fb-6b44-49cd-b95b-41a6a9a8c098");
menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C3");
menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C4");
menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C7");
}else if(moduleId==3){
// 这里的权限之后需要在数据库中加上对应的权限数据
menuIds.add("6b404066-2200-4d11-9436-d0870dfd3188");
menuIds.add("6b404066-2200-4d11-9436-d0870dfd3189");
menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eb");
menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13ec");
menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eg");
menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eh");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0813");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0814");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0815");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0816");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0817");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0818");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0819");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0820");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0821");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0822");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0823");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0824");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0825");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0826");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0827");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0828");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0829");
menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0830");
// menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0831");
menuIds.add("b8c74ee9-e5d7-467b-8565-e77efe6a499f");
}else if(moduleId==4){
// 这里的权限之后需要在数据库中加上对应的权限数据
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75047");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75048");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75049");
menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad29");
menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad30");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74046");
menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad30");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74050");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74051");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d740510");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74052");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74053");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74054");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74055");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74056");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74057");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74058");
menuIds.add("12776533-9c54-4737-a28c-0cd2a3d74059");
}
// List<MenuDto> menus = getMenus(moduleId).stream().filter(x -> permissionNames.contains(x.getName())).collect(Collectors.toList());
return menuIds;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ bd6d6fa1
......@@ -1378,35 +1378,17 @@ public class ReportServiceImpl extends BaseService {
data.setCellId(cellData.getId());
} else {
PeriodCellData cellData = periodCellDataMapper.selectByPrimaryKey(data.getCellId());
/*if (StringUtils.isNotBlank(data.getKeyinData())) {
if(StringUtils.isNotBlank(data.getKeyinData())){
cellData.setKeyinData(data.getKeyinData());
if (StringUtils.isEmpty(cellData.getFormulaExp()))
cellData.setFormulaExp(data.getKeyinData());
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
}*/ /*else if (data.getAmount() != null && cellData.getData() != data.getAmount().toString()) {
}else if (data.getAmount() != null && cellData.getData() != data.getAmount().toString()) {
cellData.setData(data.getAmount().toString());
if (StringUtils.isEmpty(cellData.getFormulaExp()))
cellData.setFormulaExp(data.getAmount().toString());
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
}*//* else if (StringUtils.isNotBlank(data.getPenValue())) {//穿透调整数据
cellData.setData(data.getPenValue());
if (StringUtils.isEmpty(cellData.getFormulaExp()))
cellData.setFormulaExp(data.getAmount().toString());
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
}*/
boolean boo1 = StringUtils.isNotBlank(data.getPenValue());//穿透合并值
boolean boo2 = StringUtils.isNotBlank(data.getKeyinData());//手工输入
if (boo1 && boo2) {
cellData.setData(String.valueOf((Double.parseDouble(data.getPenValue()) + Double.parseDouble(data.getKeyinData()))));
} else if (boo1 && !boo2) {
cellData.setData(String.valueOf((Double.parseDouble(data.getPenValue()))));
} else if (!boo1 && boo2) {
cellData.setData(String.valueOf((Double.parseDouble(data.getKeyinData()))));
}
if (StringUtils.isEmpty(cellData.getFormulaExp()))
cellData.setFormulaExp(data.getAmount().toString());
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
}
......@@ -1422,7 +1404,7 @@ public class ReportServiceImpl extends BaseService {
PeriodDataSource dataSourceModel = null;
if (dataSourceExtendDtos.size() > 0) {
dataSourceModel = dataSourceExtendDtos.get(0).getDataSource();
if (StringUtils.isBlank(data.getKeyinData()))
if(StringUtils.isBlank(data.getKeyinData()))
updateCellValueForDataSourceChange(dataSourceModel, data.getAmount());
originalAmount = dataSourceModel.getAmount() != null ? dataSourceModel.getAmount() : new BigDecimal("0");
dataSourceModel.setName(data.getName());
......@@ -1504,7 +1486,7 @@ public class ReportServiceImpl extends BaseService {
dataSource.setUpdateTime(new Date());
periodDataSourceMapper.updateByPrimaryKeySelective(dataSource);
if (!cellData.getData().equals("#VALUE!")) {
if (StringUtils.isBlank(cellData.getData())) cellData.setData("0");
if(StringUtils.isBlank(cellData.getData())) cellData.setData("0");
cellData.setData(new BigDecimal(cellData.getData()).add(changeValue).toString());
} else {
cellData.setData(new BigDecimal("0.0").add(changeValue).toString());
......@@ -1512,7 +1494,7 @@ public class ReportServiceImpl extends BaseService {
//cellData.setFormulaExp(cellData.getData());
cellData.setUpdateTime(new Date());
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
} else if (dataSource.getDescription().equals(cellName) && StringUtils.isNotBlank(data.getKeyinData())) {
} else if(dataSource.getDescription().equals(cellName) && StringUtils.isNotBlank(data.getKeyinData())){
dataSource.setKeyinData(data.getKeyinData());
dataSource.setUpdateBy("admin");
dataSource.setUpdateTime(new Date());
......
atms-api/src/main/resources/conf/conf.properties
View file @ bd6d6fa1
......@@ -48,16 +48,23 @@ file_upload_post_url=${file_upload_post_url}
file_upload_query_url=${file_upload_query_url}
#didi-config
#是否调用滴滴ticket接口
check_ticket=${check_ticket}
#滴滴SSO地址
get_user_info_url=${get_user_info_url}
#滴滴备案TMS系统appId
app_id=${app_id}
#滴滴备案TMS系统appKey
app_key=${app_key}
#cookie最大时长
cookie.maxAgeSeconds=${cookie.maxAgeSeconds}
api_white_list=${api_white_list}
#机构信息同步地址
org_sync_url=${org_sync_url}
#机构信息同步token
org_sync_token=${org_sync_token}
#滴滴-与主数据接口调用的生成token所需的公钥
dd_pubkey=${dd_pubkey}
#滴滴-EBS抽取接口地址
ebs_call_url=${ebs_call_url}
#tableau config
......
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @ bd6d6fa1
......@@ -51,7 +51,6 @@ get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=86400
api_white_list=/ebs/api/v1/dd;
org_sync_url=http://10.96.238.10/erp-main-data-test-v2/api/companies
org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
......
atms-api/src/main/resources/conf/conf_profile_pub.properties
View file @ bd6d6fa1
......@@ -54,7 +54,6 @@ get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=18000
api_white_list=/ebs/api/v1/dd;
org_sync_url=http://10.96.238.10/erp-main-data-test-v2/api/companies
org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
......
atms-api/src/main/resources/conf/conf_profile_staging.properties
View file @ bd6d6fa1
......@@ -49,7 +49,6 @@ get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
app_id=2500
app_key=983258e7fd04d7fa0534735f7b1c33f3
cookie.maxAgeSeconds=86400
api_white_list=/ebs/api/v1/dd;
org_sync_url=http://10.96.238.10/erp-main-data-test-v2/api/companies
org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/OperationLogEntryLogMapper.java
View file @ bd6d6fa1
......@@ -26,14 +26,6 @@ public interface OperationLogEntryLogMapper extends MyMapper {
*/
int deleteByExample(OperationLogEntryLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
*
* @mbg.generated
*/
int deleteByPrimaryKey(String subjectCode);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
......@@ -66,14 +58,6 @@ public interface OperationLogEntryLogMapper extends MyMapper {
*/
List<OperationLogEntryLog> selectByExample(OperationLogEntryLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
*
* @mbg.generated
*/
OperationLogEntryLog selectByPrimaryKey(String subjectCode);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
......@@ -89,20 +73,4 @@ public interface OperationLogEntryLogMapper extends MyMapper {
* @mbg.generated
*/
int updateByExample(@Param("record") OperationLogEntryLog record, @Param("example") OperationLogEntryLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(OperationLogEntryLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
*
* @mbg.generated
*/
int updateByPrimaryKey(OperationLogEntryLog record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogEntryLog.java
View file @ bd6d6fa1
......@@ -11,15 +11,6 @@ import java.util.Date;
* @mbg.generated do_not_delete_during_merge
*/
public class OperationLogEntryLog extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column operation_log_entry_log.subject_code
*
* @mbg.generated
*/
private String subjectCode;
/**
*
* This field was generated by MyBatis Generator.
......@@ -119,6 +110,15 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*/
private String source;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column operation_log_entry_log.subject_code
*
* @mbg.generated
*/
private String subjectCode;
/**
*
* This field was generated by MyBatis Generator.
......@@ -154,23 +154,15 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
* @mbg.generated
*/
private String orgCode;
private String operate;
public String getOperate() {
return operate;
}
public void setOperate(String operate) {
this.operate = operate;
}
/**
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column operation_log_entry_log.create_time
*
* @mbg.generated
*/
private Date createTime;
/**
*
......@@ -191,36 +183,21 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
private String updateBy;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table operation_log_entry_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 operation_log_entry_log.subject_code
*
* @return the value of operation_log_entry_log.subject_code
* This field was generated by MyBatis Generator.
* This field corresponds to the database column operation_log_entry_log.operate
*
* @mbg.generated
*/
public String getSubjectCode() {
return subjectCode;
}
private String operate;
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column operation_log_entry_log.subject_code
*
* @param subjectCode the value for operation_log_entry_log.subject_code
* This field was generated by MyBatis Generator.
* This field corresponds to the database table operation_log_entry_log
*
* @mbg.generated
*/
public void setSubjectCode(String subjectCode) {
this.subjectCode = subjectCode == null ? null : subjectCode.trim();
}
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
......@@ -486,6 +463,30 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
this.source = source == null ? null : source.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column operation_log_entry_log.subject_code
*
* @return the value of operation_log_entry_log.subject_code
*
* @mbg.generated
*/
public String getSubjectCode() {
return subjectCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column operation_log_entry_log.subject_code
*
* @param subjectCode the value for operation_log_entry_log.subject_code
*
* @mbg.generated
*/
public void setSubjectCode(String subjectCode) {
this.subjectCode = subjectCode == null ? null : subjectCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column operation_log_entry_log.subject_name
......@@ -590,6 +591,9 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
......@@ -599,6 +603,9 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
......@@ -648,6 +655,30 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
this.updateBy = updateBy == null ? null : updateBy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column operation_log_entry_log.operate
*
* @return the value of operation_log_entry_log.operate
*
* @mbg.generated
*/
public String getOperate() {
return operate;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column operation_log_entry_log.operate
*
* @param operate the value for operation_log_entry_log.operate
*
* @mbg.generated
*/
public void setOperate(String operate) {
this.operate = operate == null ? null : operate.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table operation_log_entry_log
......@@ -660,7 +691,6 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", subjectCode=").append(subjectCode);
sb.append(", myId=").append(myId);
sb.append(", organizationId=").append(organizationId);
sb.append(", accountPeriod=").append(accountPeriod);
......@@ -672,12 +702,15 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
sb.append(", id=").append(id);
sb.append(", period=").append(period);
sb.append(", source=").append(source);
sb.append(", subjectCode=").append(subjectCode);
sb.append(", subjectName=").append(subjectName);
sb.append(", updateTime=").append(updateTime);
sb.append(", voucherNum=").append(voucherNum);
sb.append(", orgCode=").append(orgCode);
sb.append(", createTime=").append(createTime);
sb.append(", createBy=").append(createBy);
sb.append(", updateBy=").append(updateBy);
sb.append(", operate=").append(operate);
sb.append("]");
return sb.toString();
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/CashFlowManualMapper.xml
View file @ bd6d6fa1
......@@ -27,6 +27,7 @@
<result column="ytd_amt" jdbcType="DECIMAL" property="ytdAmt" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="task_id" jdbcType="VARCHAR" property="taskId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -101,7 +102,8 @@
-->
id, organization_id, project_id, `date`, `source`, tms_period, period, `status`,
ledger_id, ledger_name, ledger_currency_code, entity_code, entity_name, category,
frequency, item_name, item_name2, period_amt, ytd_amt, create_time, update_time
frequency, item_name, item_name2, period_amt, ytd_amt, create_time, update_time,
task_id
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
<!--
......@@ -160,16 +162,16 @@
ledger_name, ledger_currency_code, entity_code,
entity_name, category, frequency,
item_name, item_name2, period_amt,
ytd_amt, create_time, update_time
)
ytd_amt, create_time, update_time,
task_id)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER},
#{period,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR},
#{ledgerName,jdbcType=VARCHAR}, #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR},
#{entityName,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR},
#{itemName,jdbcType=VARCHAR}, #{itemName2,jdbcType=VARCHAR}, #{periodAmt,jdbcType=DECIMAL},
#{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
#{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{taskId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
<!--
......@@ -241,6 +243,9 @@
<if test="updateTime != null">
update_time,
</if>
<if test="taskId != null">
task_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -306,6 +311,9 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="taskId != null">
#{taskId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultType="java.lang.Long">
......@@ -388,6 +396,9 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.taskId != null">
task_id = #{record.taskId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -419,7 +430,8 @@
period_amt = #{record.periodAmt,jdbcType=DECIMAL},
ytd_amt = #{record.ytdAmt,jdbcType=DECIMAL},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
task_id = #{record.taskId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -491,6 +503,9 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="taskId != null">
task_id = #{taskId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -519,7 +534,8 @@
period_amt = #{periodAmt,jdbcType=DECIMAL},
ytd_amt = #{ytdAmt,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP},
task_id = #{taskId,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowExtendsMapper.xml
View file @ bd6d6fa1
......@@ -133,6 +133,10 @@
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.taskId != null">#{item.taskId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
</trim>
</foreach>;
SELECT 1 FROM DUAL;
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowFinalExtendsMapper.xml
View file @ bd6d6fa1
......@@ -133,6 +133,10 @@
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.taskId != null">#{item.taskId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
</trim>
</foreach>;
SELECT 1 FROM DUAL;
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowManualExtendsMapper.xml
View file @ bd6d6fa1
......@@ -133,6 +133,10 @@
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.taskId != null">#{item.taskId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
</trim>
</foreach>;
SELECT 1 FROM DUAL;
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ bd6d6fa1
......@@ -849,5 +849,6 @@
"InternationalDataImport":"International Data Import",
"TBEBITForm":"TB EBIT Form",
"ClickEnsureTip": "Click Ensure Button!",
"RevenueTypeConfiguration":"Revenue Type Config"
}
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ bd6d6fa1
......@@ -1866,6 +1866,8 @@
"ImportTime": "Import Time",
"DataImportLog": "Data Import Log",
"DataImportLogTitle": "Data Import Log",
"StartDateMao": "Start Date:",
"EndDateMao": "End Date:",
"SelectedOrganization": "Selected Organization",
"SelectedDataType": "Selected DataType",
"extractFinancialData": "Extract Financial Data",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ bd6d6fa1
......@@ -905,6 +905,8 @@
"MenuBrazilianTax": "巴西税务分析",
"MenuOtherCountries": "其他国家税务分析",
"true": "是",
"false": "否",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ bd6d6fa1
......@@ -2126,6 +2126,8 @@
"DataImportLog": "数据导入记录",
"DataImportLogTitle": "数据导入记录",
"StartDateMao": "开始日期:",
"EndDateMao": "结束日期:",
"SelectedOrganization": "选择机构",
"SelectedDataType": "选择数据类型",
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ bd6d6fa1
......@@ -171,7 +171,7 @@
fileName = m.name + $scope.UploadPeriodTime+"_" +localDate;
}
});
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.downloadDomesticFile(param,fileName).then(function (data) {
......@@ -200,7 +200,7 @@
Upload.upload({
url: url,
data: {
companyName:$scope.selectCompany,
// companyName:$scope.selectCompany,
period: period,
type: $scope.importType
},
......@@ -389,7 +389,7 @@
};
var getImportTax = function () {
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.displayAnalysisImportData(param).success(function (data) {
......@@ -484,7 +484,7 @@
};
var getImportReturnTax = function () {
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.displayAnalysisImportData(param).success(function (data) {
......@@ -584,7 +584,7 @@
};
var getImportGMVSubsidy = function () {
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.displayAnalysisImportData(param).success(function (data) {
......@@ -679,7 +679,7 @@
};
var getImportEmployeeNum = function () {
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.displayAnalysisImportData(param).success(function (data) {
......@@ -759,7 +759,7 @@
};
var getImportDriverNum = function () {
param.companyName = $scope.selectCompany;
// param.companyName = $scope.selectCompany;
param.type = $scope.importType;
param.period = $scope.UploadPeriodTime;
vatImportService.displayAnalysisImportData(param).success(function (data) {
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.html
View file @ bd6d6fa1
......@@ -33,7 +33,7 @@
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div>
<span class="text-bold" translate="Company"></span>:
<!--<span class="text-bold" translate="Company"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 320px;">
......@@ -47,7 +47,7 @@
</div>
</li>
</ul>
</div>
</div>-->
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:10px">
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js
View file @ bd6d6fa1
......@@ -299,20 +299,40 @@
showBorders: true,
columns: [
{
dataField: "category",
width: '40%',
dataField: "gmv",
width: '14%',
allowHeaderFiltering: false,
caption: 'Category'
caption: 'Gmv'
}, {
dataField: "name",
dataField: "trips",
allowHeaderFiltering: false,
caption: 'Name',
width: '30%'
caption: 'Trips',
width: '14%'
}, {
dataField: "amount",
dataField: "subsidyB",
allowHeaderFiltering: false,
width: '30%',
caption: 'Amount'
width: '14%',
caption: 'SubsidyB'
}, {
dataField: "subsidyC",
allowHeaderFiltering: false,
width: '14%',
caption: 'SubsidyC'
}, {
dataField: "revenue",
allowHeaderFiltering: false,
width: '14%',
caption: 'Revenue'
}, {
dataField: "profit",
allowHeaderFiltering: false,
width: '14%',
caption: 'Profit'
}, {
dataField: "exchangeRate",
allowHeaderFiltering: false,
width: '14%',
caption: 'ExchangeRate'
}],
onContentReady: function (e) {
$scope.accountingRateListInstance = e.component;
......
atms-web/src/main/webapp/app/cit/report/cit-report-sheet/cit-report-sheet.js
View file @ bd6d6fa1
......@@ -170,7 +170,7 @@
});
});
//给单元格增加单击事件
//给单元格增加单击事件ActiveSheetChanged
sheet.bind(GC.Spread.Sheets.Events.CellClick, function (sender, args) {
scope.$apply(function () {
if (window.event.ctrlKey) {
......@@ -330,7 +330,7 @@
};
manualFunc.prototype = new GC.Spread.CalcEngine.Functions.Function("_Manual", 1, 1);
manualFunc.prototype.evaluate = function (args) {
debugger;
if (!_.isString(args)) {
return "#VALUE!";
}
......@@ -448,7 +448,6 @@
// 根据已有信息通过spreadJS计算各单元格的值
var setData = function () {
debugger;
var sheet = scope.spread.sheets[0];
var isExportData = false;
if (angular.isArray(scope.reportSource)) {
......@@ -458,7 +457,7 @@
}
scope.reportSource.forEach(function (data) {
debugger;
//fix bug11737 导出需要显示千分位
// 避免直接使用data.value = parseFloat(data.value)导致非数字型value无法显示
data.value = PWC.tryParseStringToNum(data.value);
......@@ -493,7 +492,6 @@
) { // 存在用户手工输入值，需要改变底色
cell.backColor('#fbe8cc');
}
if (!_.isEmpty(data.dataSourceList)) {
var reports = _.chain(data.dataSourceList)
.where({type: enums.formulaDataSourceType.Report})
......@@ -558,7 +556,7 @@
}
if (!_.isEmpty(parsedFormula)) {
debugger;
// parsedFormula = 'IFERROR(' + parsedFormula + ', "")';
sheet.setFormula(data.rowIndex, data.columnIndex, '=' + parsedFormula);
// sheet.setValue(data.rowIndex, data.columnIndex, data.value);
......@@ -574,12 +572,10 @@
sheet.setValue(data.rowIndex, data.columnIndex, data.value); // 只有数值，设置为数值
}
}
sheet.setTag(data.rowIndex, data.columnIndex, JSON.stringify(data));
//设置 tooltip 和 图标信息
spreadJsTipService.setCellTipByCellData(sheet.getCell(data.rowIndex, data.columnIndex), data);
});
debugger;
// 设置破折号单元格的值和显示格式，将其替换为带破折号格式的0值，这样引用到的其他单元格才能正常计算
var rowCount = sheet.getRowCount();
var columnCount = sheet.getColumnCount();
......@@ -599,7 +595,7 @@ debugger;
// 更新数据源后，通过调用该方法计算所有当前sheet单元格，并通过比较原数据列表与spreadJS计算的新值列表，获取保存时需要修改库中Value的单元格信息列表
var updateCells = function () {
debugger;
setData();
var sheet = getSpreadControl().sheets[0];
var cells = [];
......@@ -607,7 +603,7 @@ debugger;
.pluck('dataSourceList')
.flatten(true).value();
angular.forEach(scope.reportSource, function (x) {
debugger;
// 比较刷新前后报表中的值的变化
// 优先将单元格转换成数值比较，如果不能则转换为字符串比较
var cell = sheet.getCell(x.rowIndex, x.columnIndex);
......@@ -643,7 +639,6 @@ debugger;
newVal = PWC.tryParseStringToNum(newVal);
ds.amount = newVal;
});
sheet.setTag(x.rowIndex, x.columnIndex, JSON.stringify(x));
}
});
......
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
View file @ bd6d6fa1
citModule.controller('citReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
'apiInterceptor', 'vatExportService', 'SweetAlert', 'BSPLService', 'vatReportService', 'vatReportCacheService', 'vatSessionService',
'loginContext', 'enums', 'vatCommonService', 'vatWorkflowService', 'projectService', '$uibModal', '$cookies', 'Upload', 'vatImportService', 'vatApproveService',
'loginContext', 'enums', 'vatCommonService', 'vatWorkflowService', 'projectService', '$uibModal', '$cookies', 'Upload', 'vatImportService', 'vatApproveService', 'citReportService',
function ($scope, $rootScope, $log, $translate, $timeout, $q, $compile, $state, $stateParams, apiInterceptor, vatExportService, SweetAlert, BSPLService,
vatReportService, vatReportCacheService, vatSessionService, loginContext, enums, vatCommonService, vatWorkflowService, projectService,
$uibModal, $cookies, Upload, vatImportService, vatApproveService) {
$uibModal, $cookies, Upload, vatImportService, vatApproveService, citReportService) {
'use strict';
$log.debug('citReportViewController.ctor()...');
......@@ -796,6 +796,7 @@
};
var cellDoubleClick = function ($event) {
var row = $event.args.row;
var column = $event.args.col;
if ($scope.isBSPL) {
......@@ -994,11 +995,11 @@
if (!node) {
return;
}
var reportPromiss = vatReportService.getReportData(node.reportId).success(function (reportData) {
debugger;
var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
if (reportData && reportData.data && reportData.data.cellData) {
_.each(reportData.data.cellData, function (x) {
debugger;
x.value = x.cellValue;
if (x.formula && reg.test(x.formula)) {
x.isFormula = true;
......@@ -1125,9 +1126,9 @@
};
var getReportData = function () {
debugger;
vatReportService.getReportData($scope.reportId).success(function (reportData) {
debugger;
if (reportData && reportData.data && reportData.data.cellData) {
_.each(reportData.data.cellData, function (x) {
x.value = x.cellValue;
......@@ -1597,7 +1598,7 @@
}
if ($scope.handInputModel.amount || $scope.handInputModel.name || $scope.handInputModel.keyinData || $scope.handInputModel.penValue ) {
// 前端保存数据
return vatReportService.addCellManualData($scope.handInputModel, logDto).then(function (manualData) {
return citReportService.addCellManualData($scope.handInputModel, logDto).then(function (manualData) {
var obj = manualData.data.data;
obj.dataSourceType = manualData.dataSourceType;
$scope.updateCellByManualChange(obj);
......
atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.ctrl.js
View file @ bd6d6fa1
citModule.controller('entryListModalController', ['$log', 'apiInterceptor', 'Upload', '$scope', '$q', '$translate', '$uibModal', '$document', '$rootScope', 'SweetAlert', 'enums',
'vatReportService', 'loginContext', 'vatSessionService', 'stdAccountService', 'vatCommonService', 'formulaService', 'KeyValueConfigService', 'modelConfigurationService', '$timeout', 'cellCommentService', 'modifiedReportCellService','commonWebService',
'vatReportService', 'loginContext', 'vatSessionService', 'stdAccountService', 'vatCommonService', 'formulaService', 'KeyValueConfigService', 'modelConfigurationService', '$timeout', 'cellCommentService', 'modifiedReportCellService', 'commonWebService',
function ($log, apiInterceptor, Upload, $scope, $q, $translate, $uibModal, $document, $rootScope, SweetAlert, enums, vatReportService, loginContext,
vatSessionService, stdAccountService, vatCommonService, formulaService, KeyValueConfigService, modelConfigurationService, $timeout, cellCommentService, modifiedReportCellService,commonWebService) {
vatSessionService, stdAccountService, vatCommonService, formulaService, KeyValueConfigService, modelConfigurationService, $timeout, cellCommentService, modifiedReportCellService, commonWebService) {
var _ra = null;
var entityInit = function () {
//初始化值
$scope.entry = {
......@@ -13,8 +13,8 @@
QMYETotalend: ""
}
}
var _logIndex =0;
if($scope.relObj.logs == undefined || $scope.relObj.logs.length == 0){
var _logIndex = 0;
if ($scope.relObj.logs == undefined || $scope.relObj.logs.length == 0) {
$scope.relObj.logs = [];
}
entityInit();
......@@ -51,27 +51,22 @@
});
$log.debug($scope.selectedItems);*/
name: "124600SYSADMIN20180900025 社保公积金 CNY"
orgCode: "124600"
orgName: "滴滴智慧交通科技有限公司"
organizationId: "5bbd739c-1a13-4b0f-aba6-32ba41e4de69"
period: 2018
$scope.doCalcute(selectedItems.selectedRowsData);
var _in = {};
if(selectedItems.currentDeselectedRowKeys.length == 0){
if (selectedItems.currentDeselectedRowKeys.length == 0) {
_in.operate = "增";
_in.accountingDate = selectedItems.currentSelectedRowKeys[0].accountingDate;
_in.voucherNum = selectedItems.currentSelectedRowKeys[0].voucherNum;
_in.orgCode = selectedItems.currentSelectedRowKeys[0].orgCode;
_in.organizationId = selectedItems.currentSelectedRowKeys[0].organizationId;
}else{
_in.id = selectedItems.currentSelectedRowKeys[0].id;
} else {
_in.operate = "减";
_in.accountingDate = selectedItems.currentDeselectedRowKeys[0].accountingDate;
_in.voucherNum = selectedItems.currentDeselectedRowKeys[0].voucherNum;
_in.orgCode = selectedItems.currentDeselectedRowKeys[0].orgCode;
_in.organizationId = selectedItems.currentDeselectedRowKeys[0].organizationId;
_in.id = selectedItems.currentDeselectedRowKeys[0].id;
}
_in.subjectCode = $scope.relObj.entryLogIdByCode;
$scope.relObj.logs.push(_in);
......@@ -85,8 +80,7 @@
//设置数据源表格的列
var getEntryListColumns = function () {
var dataGridColumns;
dataGridColumns = [
return [
{
dataField: 'index',
caption: $translate.instant('ImportErrorPopUpNoCol'),
......@@ -125,17 +119,21 @@
alignment: 'right'
},
];
return dataGridColumns;
};
$scope.entryListColumns = getEntryListColumns();
//确定
$scope.makeSure = function () {
$scope.relObj.checkRadio = $scope.check;
$scope.relObj.checkRadio = _ra;
$('#entryListModal').modal('hide');
}
$scope.selectRadio = function(event){
debugger;
_ra = event.target.value;
}
$scope.cancel = function () {
$('#entryListModal').modal('hide');
//entityInit();
......@@ -157,8 +155,8 @@
v1 = parseFloat(item.accountedDr);
v2 = parseFloat(item.accountedCr);
} else {
v1 += parseFloat(item.accountedDr);
v2 += parseFloat(item.accountedCr);
v1 += parseFloat(item.accountedDr);
v2 += parseFloat(item.accountedCr);
}
_index++;
});
......
atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.html
View file @ bd6d6fa1
......@@ -28,17 +28,17 @@
</div>
<div class="row backColor" style="margin-right: 0px;">
<div class="col-sm-3 ">
<input type="radio" name ="checkRadio" ng-model = "check.checkRadio1" ng-value="entry.JFFSETotal" > <h4 translate="JFFSETotal"></h4>:{{entry.JFFSETotal}}
<input type="radio" name ="checkRadio" ng-click ="selectRadio($event)" ng-value="entry.JFFSETotal" > <h4 translate="JFFSETotal"></h4>:{{entry.JFFSETotal}}
</div>
<div class="col-sm-3 ">
<span><input type="radio" name ="checkRadio" ng-model = "check.checkRadio2" ng-value="entry.DFFSETotal" > <h4 translate="DFFSETotal"></h4>:{{entry.DFFSETotal}}</span>
<span><input type="radio" name ="checkRadio" ng-click ="selectRadio($event)" ng-value="entry.DFFSETotal" > <h4 translate="DFFSETotal"></h4>:{{entry.DFFSETotal}}</span>
</div>
<div class="col-sm-3 ">
<input type="radio" name ="checkRadio" ng-model = "check.checkRadio3" ng-value="entry.QMYETotalFirst" > <h4 translate="QMYETotalFirst"></h4>:{{entry.QMYETotalFirst}}
<input type="radio" name ="checkRadio" ng-click ="selectRadio($event)" ng-value="entry.QMYETotalFirst" > <h4 translate="QMYETotalFirst"></h4>:{{entry.QMYETotalFirst}}
</div>
<div class="col-sm-3 ">
<input type="radio" name ="checkRadio" ng-model = "check.checkRadio4" ng-value="entry.QMYETotalend" > <h4 translate="QMYETotalend"></h4>:{{entry.QMYETotalend}}
<input type="radio" name ="checkRadio" ng-click ="selectRadio($event)" ng-value="entry.QMYETotalend" > <h4 translate="QMYETotalend"></h4>:{{entry.QMYETotalend}}
</div>
</div>
<div class="row">
......
atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @ bd6d6fa1
......@@ -232,10 +232,10 @@
if ($scope.detail.cellType == enums.formulaDataSourceType.CIT_TBAM) {
var updateAdjustDto = [];
$scope.detail.dataGridSourceBind.forEach(function (e, index) {
if (e.adjustBack != undefined && e.adjustBack != null) {
if (e.adjustAccount != undefined && e.adjustAccount != null) {
updateAdjustDto.push({
"id": e.id,
"adjustAccount": Number(e.adjustBack)
"adjustAccount": Number(e.adjustAccount)
});
}
});
......@@ -366,6 +366,7 @@
};
//---------------------------凭证范围-------------------------//start
$scope.formulaList = [];
$scope.keyValueList = [];
$scope.accountDataSource = [];
......@@ -1535,7 +1536,7 @@
return dataGridColumns;
};
//-----------------------------------------------------kevin insert ----------------------------------------------------------------
//监听穿透返回值（调整后金额）
//监听穿透返回值（调整后金额）
$scope.$watch('relObj.checkRadio', function (n, o) {
if ($scope.detail.entryIndex != undefined) {
$scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustAccount = n;
......@@ -1543,7 +1544,7 @@
}
});
var addWatch = function(target){
/* var addWatch = function(target){
$scope.$watch(target, function (n, o) {
if ($scope.detail.entryIndex != undefined) {
$scope.detail.dataGridSourceBind[$scope.detail.entryIndex].adjustAccount = n;
......@@ -1554,8 +1555,11 @@
addWatch('relObj.checkRadio.checkRadio1');
addWatch('relObj.checkRadio.checkRadio2');
addWatch('relObj.checkRadio.checkRadio3');
addWatch('relObj.checkRadio.checkRadio4');
addWatch('relObj.checkRadio.checkRadio4');*/
//
$scope.detail.relObj = $scope.relObj;
//重新计算合计值
var calculateSum = function (n) {
var evalVal = 0;
......@@ -1565,7 +1569,11 @@
if (i == $scope.detail.entryIndex) {
continue;
}
evalVal += Number($scope.detail.dataGridSourceBind[i].endingBalance);
if($scope.detail.dataGridSourceBind[i].adjustAccount == null){
evalVal += Number($scope.detail.dataGridSourceBind[i].endingBalance);
}else{
evalVal += Number($scope.detail.dataGridSourceBind[i].adjustAccount);
}
}
evalVal = evalVal + Number(n);
$scope.detail.penValue = evalVal;
......@@ -1588,11 +1596,12 @@
var va = evalVal.formatAmount(evalVal, true);
$("#dataGridFooterSummary").html($translate.instant('Conclusion')
+ '&nbsp;&nbsp;&nbsp;&nbsp;' + va);
$scope.detail.cellInfo.money = evalVal.formatAmount(evalVal, true);
}
$scope.showLog = function () {//显示日志
//在点击日志前 科目代码下是否有日志
cellCommentService.selectEntryLog($scope.detail.entryLogIdByCode).success(function (res) {
cellCommentService.selectEntryLog($scope.detail.entryLogIdByCode, $scope.detail.entryLogIdById).success(function (res) {
if (res.data) {
$scope.relObj.logs = commonWebService._index(res.data.concat($scope.relObj.logs));
$('#entryLogModal').modal('show');
......@@ -1606,6 +1615,7 @@
$scope.loadEntryListDataList = function (e) {
$scope.detail.entryIndex = e.dataIndex;
$scope.detail.entryLogIdByCode = e.data.accountCode;
$scope.detail.entryLogIdById = e.data.id;
$scope.relObj.entryLogIdByCode = e.data.accountCode;
cellCommentService.loadEntryListDataList(e.data.accountCode).success(function (res) {
$scope.relObj.account = e.data.accountCode;
......@@ -1896,6 +1906,7 @@
$scope.config = config;
$scope.choiceGroupButton = choiceGroupButton;
$scope.confirmAddDataSource = function (config) {
if (config.contentStatus === 'dataSourceTitle') {
saveDataSource(config);
......
atms-web/src/main/webapp/app/common/vatservices/vatImportService.js
View file @ bd6d6fa1
......@@ -403,6 +403,9 @@
displayImportLog: function (pageInfo, type) {
return $http.post('/DataImport/displayImportLog', {pageInfo: pageInfo, type: type}, apiConfig.create());
},
displayImportLogAll: function (param) {
return $http.post('/DataImport/displayImportLogAll', param, apiConfig.create());
},
displayProcessLog: function (queryParams) {
return $http.post('/DataImport/displayProcessLog', queryParams, apiConfig.create());
},
......
atms-web/src/main/webapp/app/common/webservices/cellComment.svc.js
View file @ bd6d6fa1
......@@ -20,8 +20,8 @@ webservices.factory('cellCommentService', ['$http', 'apiConfig', function ($http
updateAdjust : function (data) {
return $http.post('/CellComment/updateAdjust', JSON.stringify(data), apiConfig.createVat({contentType: 'application/json;charset=UTF-8'}));
},
selectEntryLog : function (code) {
return $http.get('/CellComment/selectEntryLog?code=' + code, apiConfig.createVat());
selectEntryLog : function (code, id ) {
return $http.get('/CellComment/selectEntryLog?code=' + code +'&id=' +id, apiConfig.createVat());
},
addLog :function(data){
return $http.post('/CellComment/addLog', data, apiConfig.createVat());
......
atms-web/src/main/webapp/app/common/webservices/citReport.svc.js
View file @ bd6d6fa1
......@@ -58,7 +58,7 @@
return $http.get('/Report/getJobStatus/' + projectId + '/' + period + '/' + jobId, apiConfig.createVat({ignoreLoadingBar: true}));
},
getReportData: function (reportId) {
return $http.get('/Report/reportData/' + reportId, apiConfig.createVat());
return $http.get('/citReport/reportData/' + reportId, apiConfig.createVat());
},
calculateKeyValue: function (projectId, period) {
return $http.post('/Report/calculateKeyValue/' + projectId + '/' + period, {}, apiConfig.createVat({ignoreLoadingBar: true}));
......@@ -86,7 +86,7 @@
return $http.get('/Report/cellInvoice/' + cellDataID + '/' + invoiceType, apiConfig.createVat());
},
addCellManualData: function (manualData, logInfo) {
return $http.post('/Report/addCellManualData', manualData, apiConfig.createVat()).then(function (data) {
return $http.post('/citReport/addCellManualData', manualData, apiConfig.createVat()).then(function (data) {
logInfo.UpdateState = $translate.instant('ManualInputSuccess');
vatOperationLogService.addOperationLog(logInfo);
data.dataSourceType = enums.cellDataSourceType.KeyIn;
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js
View file @ bd6d6fa1
......@@ -6,19 +6,21 @@
, vatSessionService, enums) {
'use strict';
$scope.pleaseSelect = $translate.instant('PleaseSelect');
$scope.startDate = new Date(new Date().getFullYear() - 20, 1, 1);
$scope.endDate = new Date(new Date().getFullYear() + 20, 1, 1);
$scope.viewMode = 'days';
$scope.period = $scope.periodId;
$scope.moduleid = enums.vatModuleEnum.Import_TrialBalance;
$scope.chunkSize = 100000;
$scope.projectID = vatSessionService.project.id;
$scope.startRowNum = 2;
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
$scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
$scope.startDate = new Date(year - 20, 1, 1);
$scope.endDate = new Date(year + 20, 1, 1);
$scope.viewMode = 1;
var month = date.getMonth()+1;
var day = date.getDate();
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
//初始化ack-pagination
......@@ -38,14 +40,20 @@
//初始化查询参数
$scope.queryParams = {
pageInfo: {
totalCount: 0,
pageIndex: 0,
pageSize: 0,
totalPage: 0
pageIndex: 1, //当前页码
totalItems: 0, //总数据
totalPages: 10, //总页数
maxSize: 5, //分页数字的限制。
pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
pageSizeString: constant.page.pageSizeArrary[3].toString(),
firstPage: $translate.instant('PagingFirstPage'),
previousPage: $translate.instant('PagingPreviousPage'),
nextPage: $translate.instant('PagingNextPage'),
lastPage: $translate.instant('PagingLastPage')
},
periodId: $scope.period,
serviceTypeId: $scope.serviceTypeId,
projectId: $scope.projectID
type : constant.importFileType.undefined,
startDate: year+'/'+month+'/'+day,
endDate : year+'/'+month+'/'+day
};
var loadImportLogInfoDatagrid = function () {
......@@ -143,7 +151,7 @@
};
var getImportLog = function () {
vatImportService.displayImportLog($scope.pagingOptions,constant.importFileType.undefined).success(function (data) {
vatImportService.displayImportLogAll($scope.queryParams).success(function (data) {
if (data && data.list) {
$scope.ImportLogGridSource = data.list;
$scope.pagingOptions.totalItems = data.pageInfo.totalCount;
......@@ -197,8 +205,8 @@
};
var initDatePicker = function () {
var ele1 = $("#periodDatepicker");
ele1.datepicker({
var ele = $(".startDatepicker");
ele.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
viewMode: $scope.viewMode,
......@@ -206,15 +214,33 @@
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: $scope.dateFormat //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
ele1.datepicker("setDate", $scope.selectedDate);
ele.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
var ele2 = $(".endDatepicker");
ele2.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
viewMode: $scope.viewMode,
minViewMode: $scope.viewMode,
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
};
var initParam = function () {
$scope.initPagingControl = initPagingControl;
$scope.setButtonWrapStyle = setButtonWrapStyle;
$scope.setGridStyle = setGridStyle;
$scope.$watch('queryParams.startDate', function (newValue, oldValue) {
getImportLog();
});
$scope.$watch('queryParams.endDate', function (newValue, oldValue) {
getImportLog();
});
};
//开始
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.html
View file @ bd6d6fa1
......@@ -4,6 +4,18 @@
<div class="nav-header" translate="DataImportLogTitle"></div>
</div>
<div id="tab_total">
<div class="select-period" style="height: 10px;">
<span class="text-bold"style="float: left; margin-top: 5px;">{{'StartDateMao'|translate}}</span>
<div class="input-daterange input-group startDatepicker" style="float: left;width: 10%;">
<input type="text" id="startDate" class="input-sm form-control" name="startDate"
ng-model="queryParams.startDate" style="width: 120px;margin-left: 50px;"/>
</div>
<span class="text-bold"style="float: left; margin-left: 50px; margin-top: 5px;">{{'EndDateMao'|translate}}</span>
<div class="input-daterange input-group endDatepicker"style="float: left;width: 10%;">
<input type="text" id="endDate" class="input-sm form-control" name="endDate"
ng-model="queryParams.endDate" style="width: 120px;margin-left: 50px;"/>
</div>
</div>
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="importLogGridContainer" dx-data-grid="importLogGridOptions"
......
atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.ctrl.js
View file @ bd6d6fa1
......@@ -6,18 +6,22 @@
, vatSessionService, enums) {
'use strict';
$scope.pleaseSelect = $translate.instant('PleaseSelect');
$scope.startDate = new Date(new Date().getFullYear() - 20, 1, 1);
$scope.endDate = new Date(new Date().getFullYear() + 20, 1, 1);
$scope.viewMode = 'days';
$scope.period = $scope.periodId;
$scope.moduleid = enums.vatModuleEnum.Import_TrialBalance;
$scope.chunkSize = 100000;
$scope.projectID = vatSessionService.project.id;
$scope.startRowNum = 2;
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
var month = date.getMonth()+1;
var day = date.getDate();
$scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
$scope.startDate = new Date(year - 20, 1, 1);
$scope.endDate = new Date(year + 20, 1, 1);
$scope.viewMode = 1;
$scope.dateFormat = $translate.instant('dateFormat4YearMonth');
......@@ -47,8 +51,10 @@
firstPage: $translate.instant('PagingFirstPage'),
previousPage: $translate.instant('PagingPreviousPage'),
nextPage: $translate.instant('PagingNextPage'),
lastPage: $translate.instant('PagingLastPage'),
}
lastPage: $translate.instant('PagingLastPage')
},
startDate: year+'/'+month+'/'+day,
endDate : year+'/'+month+'/'+day
};
var loadProcessLogInfoDatagrid = function () {
......@@ -204,10 +210,21 @@
return { 'margin-top': '55px' }
}
};
var initDatePicker = function () {
var ele1 = $("#periodDatepicker");
ele1.datepicker({
var ele = $(".startDatepicker");
ele.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
viewMode: $scope.viewMode,
minViewMode: $scope.viewMode,
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
ele.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
var ele2 = $(".endDatepicker");
ele2.datepicker({
startDate: $scope.startDate,
endDate: $scope.endDate,
viewMode: $scope.viewMode,
......@@ -215,15 +232,21 @@
autoclose: true, //选中之后自动隐藏日期选择框
clearBtn: true, //清除按钮
todayBtn: false, //今日按钮
format: $scope.dateFormat //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
});
ele1.datepicker("setDate", $scope.selectedDate);
ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
};
var initParam = function () {
$scope.initPagingControl = initPagingControl;
$scope.setButtonWrapStyle = setButtonWrapStyle;
$scope.setGridStyle = setGridStyle;
$scope.$watch('queryParams.startDate', function (newValue, oldValue) {
getProcessLog();
});
$scope.$watch('queryParams.endDate', function (newValue, oldValue) {
getProcessLog();
});
};
//开始
......@@ -234,7 +257,6 @@
getUserPermission();
loadProcessLogInfoDatagrid();
initDatePicker();
$timeout(function () {
$scope.isLoadComplete = true;
}, 500);
......
atms-web/src/main/webapp/app/dataImport/log/process-log/process-log.html
View file @ bd6d6fa1
......@@ -4,6 +4,18 @@
<div class="nav-header" translate="DataProcessLogTitle"></div>
</div>
<div id="tab_total">
<div class="select-period" style="height: 10px;">
<span class="text-bold"style="float: left; margin-top: 5px;">{{'StartDateMao'|translate}}</span>
<div class="input-daterange input-group startDatepicker" style="float: left;width: 10%;">
<input type="text" id="startDate" class="input-sm form-control" name="startDate"
ng-model="queryParams.startDate" style="width: 120px;margin-left: 50px;"/>
</div>
<span class="text-bold"style="float: left; margin-left: 50px; margin-top: 5px;">{{'EndDateMao'|translate}}</span>
<div class="input-daterange input-group endDatepicker"style="float: left;width: 10%;">
<input type="text" id="endDate" class="input-sm form-control" name="endDate"
ng-model="queryParams.endDate" style="width: 120px;margin-left: 50px;"/>
</div>
</div>
<div class="dt-init-wrapper">
<div class="dx-viewport grid-container">
<div id="processLogGridContainer" dx-data-grid="processLogGridOptions"
......
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