Commit feedbc03 authored by neo.wang's avatar neo.wang

Merge branch 'dev_neo' into 'dev'

Dev neo

See merge request root/atms!16
parents 58c0a20d a6606e1a
......@@ -398,6 +398,15 @@
<table tableName="Project" domainObjectName="Project">
<property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="IsActive" javaType="Boolean"/>
</table>
<table tableName="ProjectServiceType" domainObjectName="ProjectServiceType">
<property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<table tableName="ProjectStatusManage" domainObjectName="ProjectStatusManage">
<property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
</context>
</generatorConfiguration>
\ No newline at end of file
package pwc.taxtech.atms;
import pwc.taxtech.atms.dto.user.UserDto;
import pwc.taxtech.atms.service.OperationLogService;
import java.util.HashMap;
import java.util.Map;
public class AppCachePool {
private static Map<String, UserDto> CACHED_USERS = null;
private static Object _locker = new Object();
static {
CACHED_USERS = new HashMap<>();
}
public static UserDto getCachedUser(String name) {
String userName = name.toLowerCase();
synchronized (_locker) {
if (!CACHED_USERS.containsKey(userName)) {
UserDto dto = new UserDto();//TODO:should fixed to load from db (neo)
dto.setUserName("cach_test");
dto.setID("1");
CACHED_USERS.put(userName,dto);
}
return CACHED_USERS.get(userName);
}
}
}
......@@ -34,7 +34,9 @@ public enum OperationAction {
/**新增权限*/
AddNewPermission(17),
/**去除权限*/
DeletePermission(18);
DeletePermission(18),
/**进入项目**/
EnterProject(19);
private int value;
......
......@@ -12,11 +12,16 @@ import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import pwc.taxtech.atms.common.OperateLogType;
import pwc.taxtech.atms.common.OperationAction;
import pwc.taxtech.atms.common.OperationModule;
import pwc.taxtech.atms.dto.OperationLogDto;
import pwc.taxtech.atms.dto.PagingResultDto;
import pwc.taxtech.atms.dto.QueryOperateParamDto;
import pwc.taxtech.atms.service.OperationLogService;
import java.util.Date;
/** @see PwC.Tax.Tech.Atms.WebApi.Controllers.OperationLogController.cs */
@RestController
@RequestMapping("/api/v1/operationlog/")
......@@ -34,4 +39,20 @@ public class OperationLogController {
logger.debug("OperationLogController /getorgloglist");
return operationLogService.getOperationLogList(queryOperateParamDto);
}
@ApiOperation(value = "添加进入项目日志")
@RequestMapping(value = "addEnterProjectLog/{userName}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void addEnterProjectLog(String userName, String logContent)
{
OperationLogDto dto=new OperationLogDto();
dto.setAction(OperationAction.EnterProject.value());
dto.setComment("");
dto.setCreateTime(new Date());
dto.setLogType(OperateLogType.OperationLogUser.value());
dto.setModule(OperationModule.User.value());
dto.setOperationContent(logContent);
dto.setOperationObject(userName);
dto.setOperationUser(userName);
// operationLogService.addLog(dto);
}
}
package pwc.taxtech.atms.controller;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.ApiImplicitParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import pwc.taxtech.atms.dto.ProjectClientDto;
import pwc.taxtech.atms.dto.ServiceTypeDto;
import pwc.taxtech.atms.dto.taxadmin.AddProjectResult;
import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
import pwc.taxtech.atms.service.ProjectService;
......@@ -56,8 +61,25 @@ public class ProjectController {
@ApiOperation(value = "getAllProjectList", notes = "Get All List")
@RequestMapping(value = "getAllProjectList", method = RequestMethod.GET)
public @ResponseBody
List<ProjectDisplayDto> getAllProjectList( String orgID, String serviceID, Integer projectYear) {
List<ProjectDisplayDto> getAllProjectList(String orgID, String serviceID, Integer projectYear) {
logger.info("/api/v1/project/getAllProjectList with orgID {} serviceID {}", orgID, serviceID);
return projectService.getAllProjectList(orgID, serviceID == null ? "" : serviceID, projectYear);
}
@ApiOperation(value = "add", notes = "add a project")
@RequestMapping(value = "add", method = RequestMethod.POST)
@ApiImplicitParam(name = "projectDto", value = "projectDto", required = true, dataType = "ProjectDisplayDto")
public @ResponseBody
AddProjectResult AddProject(@RequestBody ProjectDisplayDto projectDto, String userName) {
if (userName == null || userName.isEmpty()) userName = "test";//TODO: should use session username future(neo)
return projectService.addProject(projectDto, userName);
}
@ApiOperation(value = "getProjectAllStatus", notes = "get project all status")
@RequestMapping(value = "getProjectAllStatus/{dbName}", method = RequestMethod.GET)
public @ResponseBody
Map<Integer, Integer> getProjectAllStatus(@PathVariable String dbName) {
return projectService.getProjectAllStatus(dbName);
}
}
package pwc.taxtech.atms.controller;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
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.dto.OperationResultDto;
import pwc.taxtech.atms.dto.taxadmin.ProjectStatusManageDto;
import pwc.taxtech.atms.service.IdentityService;
import pwc.taxtech.atms.service.ProjectStatusManageService;
@RestController
@RequestMapping("/api/v1/ProjectStatusManage")
public class ProjectStatusManageController {
@Autowired
private ProjectStatusManageService projectStatusManageService;
@Autowired
private IdentityService identityService;
@ApiOperation(value = "setProjectStatus", notes = "")
@RequestMapping(value = {"/setProjectStatus/{dbName}/{periodId}/{status}"}, method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
public OperationResultDto<ProjectStatusManageDto> setProjectStatus(@PathVariable("dbName") String dbName,
@PathVariable("periodId") Integer periodId,
@PathVariable("status") Integer status) {
return projectStatusManageService.setProjectStatus(dbName, periodId, status, identityService.getIdentityUser().getID());
}
}
......@@ -10,6 +10,7 @@ import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
import pwc.taxtech.atms.entitiy.Project;
import pwc.taxtech.atms.entitiy.ProjectExample;
import pwc.taxtech.atms.entitiy.ProjectStatusManage;
@Mapper
public interface ProjectMapper extends MyMapper {
......@@ -221,4 +222,13 @@ public interface ProjectMapper extends MyMapper {
"ORDER BY ea.EffectiveDate,org.Code" +
"</script>")
List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(@Param("orgID") String orgID, @Param("serviceID") String serviceID);
@Select("SELECT " +
" PeriodId,Status " +
"FROM " +
" ProjectStatusManage p " +
"WHERE " +
" p.DbName = #{dbName} " +
"ORDER BY PeriodId , Status")
List<ProjectStatusManage> selectProjectAllStatus(String dbName);
}
\ No newline at end of file
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entitiy.ProjectServiceType;
import pwc.taxtech.atms.entitiy.ProjectServiceTypeExample;
@Mapper
public interface ProjectServiceTypeMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
long countByExample(ProjectServiceTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
int deleteByExample(ProjectServiceTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
int insert(ProjectServiceType record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
int insertSelective(ProjectServiceType record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
List<ProjectServiceType> selectByExampleWithRowbounds(ProjectServiceTypeExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
List<ProjectServiceType> selectByExample(ProjectServiceTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") ProjectServiceType record, @Param("example") ProjectServiceTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
int updateByExample(@Param("record") ProjectServiceType record, @Param("example") ProjectServiceTypeExample example);
}
\ No newline at end of file
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entitiy.ProjectStatusManage;
import pwc.taxtech.atms.entitiy.ProjectStatusManageExample;
@Mapper
public interface ProjectStatusManageMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
long countByExample(ProjectStatusManageExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int deleteByExample(ProjectStatusManageExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int deleteByPrimaryKey(String ID);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int insert(ProjectStatusManage record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int insertSelective(ProjectStatusManage record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
List<ProjectStatusManage> selectByExampleWithRowbounds(ProjectStatusManageExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
List<ProjectStatusManage> selectByExample(ProjectStatusManageExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
ProjectStatusManage selectByPrimaryKey(String ID);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") ProjectStatusManage record, @Param("example") ProjectStatusManageExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int updateByExample(@Param("record") ProjectStatusManage record, @Param("example") ProjectStatusManageExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(ProjectStatusManage record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
int updateByPrimaryKey(ProjectStatusManage record);
}
\ No newline at end of file
package pwc.taxtech.atms.dto.taxadmin;
public class AddProjectResult {
private String dBname;
private String projectID;
private Boolean result;
private String resultMsg;
public String getdBname() {
return dBname;
}
public void setdBname(String dBname) {
this.dBname = dBname;
}
public String getProjectID() {
return projectID;
}
public void setProjectID(String projectID) {
this.projectID = projectID;
}
public Boolean getResult() {
return result;
}
public void setResult(Boolean result) {
this.result = result;
}
public String getResultMsg() {
return resultMsg;
}
public void setResultMsg(String resultMsg) {
this.resultMsg = resultMsg;
}
}
package pwc.taxtech.atms.dto.taxadmin;
public class ProjectImportSubStatusDto {
private Boolean isAdjustImport ;
private Boolean isCustomInvoiceImport ;
private Boolean isEntryImport ;
private Boolean isErpImport ;
private Boolean isInputInvoiceImport ;
private Boolean isInvoiceMapImport ;
private Boolean isOutputInvoiceImport ;
private Boolean isTbImport ;
private Boolean isVoucherMapImport ;
public Boolean getAdjustImport() {
return isAdjustImport;
}
public void setAdjustImport(Boolean adjustImport) {
isAdjustImport = adjustImport;
}
public Boolean getCustomInvoiceImport() {
return isCustomInvoiceImport;
}
public void setCustomInvoiceImport(Boolean customInvoiceImport) {
isCustomInvoiceImport = customInvoiceImport;
}
public Boolean getEntryImport() {
return isEntryImport;
}
public void setEntryImport(Boolean entryImport) {
isEntryImport = entryImport;
}
public Boolean getErpImport() {
return isErpImport;
}
public void setErpImport(Boolean erpImport) {
isErpImport = erpImport;
}
public Boolean getInputInvoiceImport() {
return isInputInvoiceImport;
}
public void setInputInvoiceImport(Boolean inputInvoiceImport) {
isInputInvoiceImport = inputInvoiceImport;
}
public Boolean getInvoiceMapImport() {
return isInvoiceMapImport;
}
public void setInvoiceMapImport(Boolean invoiceMapImport) {
isInvoiceMapImport = invoiceMapImport;
}
public Boolean getOutputInvoiceImport() {
return isOutputInvoiceImport;
}
public void setOutputInvoiceImport(Boolean outputInvoiceImport) {
isOutputInvoiceImport = outputInvoiceImport;
}
public Boolean getTbImport() {
return isTbImport;
}
public void setTbImport(Boolean tbImport) {
isTbImport = tbImport;
}
public Boolean getVoucherMapImport() {
return isVoucherMapImport;
}
public void setVoucherMapImport(Boolean voucherMapImport) {
isVoucherMapImport = voucherMapImport;
}
}
package pwc.taxtech.atms.dto.taxadmin;
import java.util.Date;
public class ProjectStatusManageDto {
private Date createTime ;
private String creatorID ;
private String dbName ;
private String ID ;
private ProjectImportSubStatusDto importSubStatus ;
private Integer periodId ;
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreatorID() {
return creatorID;
}
public void setCreatorID(String creatorID) {
this.creatorID = creatorID;
}
public String getDbName() {
return dbName;
}
public void setDbName(String dbName) {
this.dbName = dbName;
}
public String getID() {
return ID;
}
public void setID(String ID) {
this.ID = ID;
}
public ProjectImportSubStatusDto getImportSubStatus() {
return importSubStatus;
}
public void setImportSubStatus(ProjectImportSubStatusDto importSubStatus) {
this.importSubStatus = importSubStatus;
}
public Integer getPeriodId() {
return periodId;
}
public void setPeriodId(Integer periodId) {
this.periodId = periodId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
private Integer status ;
private Date updateTime ;
}
......@@ -63,7 +63,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
private Short isActive;
private Boolean isActive;
/**
*
......@@ -291,7 +291,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
public Short getIsActive() {
public Boolean getIsActive() {
return isActive;
}
......@@ -303,7 +303,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
public void setIsActive(Short isActive) {
public void setIsActive(Boolean isActive) {
this.isActive = isActive;
}
......
......@@ -545,52 +545,52 @@ public class ProjectExample {
return (Criteria) this;
}
public Criteria andIsActiveEqualTo(Short value) {
public Criteria andIsActiveEqualTo(Boolean value) {
addCriterion("IsActive =", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveNotEqualTo(Short value) {
public Criteria andIsActiveNotEqualTo(Boolean value) {
addCriterion("IsActive <>", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveGreaterThan(Short value) {
public Criteria andIsActiveGreaterThan(Boolean value) {
addCriterion("IsActive >", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveGreaterThanOrEqualTo(Short value) {
public Criteria andIsActiveGreaterThanOrEqualTo(Boolean value) {
addCriterion("IsActive >=", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveLessThan(Short value) {
public Criteria andIsActiveLessThan(Boolean value) {
addCriterion("IsActive <", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveLessThanOrEqualTo(Short value) {
public Criteria andIsActiveLessThanOrEqualTo(Boolean value) {
addCriterion("IsActive <=", value, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveIn(List<Short> values) {
public Criteria andIsActiveIn(List<Boolean> values) {
addCriterion("IsActive in", values, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveNotIn(List<Short> values) {
public Criteria andIsActiveNotIn(List<Boolean> values) {
addCriterion("IsActive not in", values, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveBetween(Short value1, Short value2) {
public Criteria andIsActiveBetween(Boolean value1, Boolean value2) {
addCriterion("IsActive between", value1, value2, "isActive");
return (Criteria) this;
}
public Criteria andIsActiveNotBetween(Short value1, Short value2) {
public Criteria andIsActiveNotBetween(Boolean value1, Boolean value2) {
addCriterion("IsActive not between", value1, value2, "isActive");
return (Criteria) this;
}
......
package pwc.taxtech.atms.entitiy;
import java.io.Serializable;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectServiceType
*
* @mbg.generated do_not_delete_during_merge
*/
public class ProjectServiceType implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectServiceType.ID
*
* @mbg.generated
*/
private String ID;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectServiceType.ProjectID
*
* @mbg.generated
*/
private String projectID;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectServiceType.ServiceTypeID
*
* @mbg.generated
*/
private String serviceTypeID;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectServiceType.TemplateGroupID
*
* @mbg.generated
*/
private String templateGroupID;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectServiceType.ID
*
* @return the value of ProjectServiceType.ID
*
* @mbg.generated
*/
public String getID() {
return ID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectServiceType.ID
*
* @param ID the value for ProjectServiceType.ID
*
* @mbg.generated
*/
public void setID(String ID) {
this.ID = ID == null ? null : ID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectServiceType.ProjectID
*
* @return the value of ProjectServiceType.ProjectID
*
* @mbg.generated
*/
public String getProjectID() {
return projectID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectServiceType.ProjectID
*
* @param projectID the value for ProjectServiceType.ProjectID
*
* @mbg.generated
*/
public void setProjectID(String projectID) {
this.projectID = projectID == null ? null : projectID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectServiceType.ServiceTypeID
*
* @return the value of ProjectServiceType.ServiceTypeID
*
* @mbg.generated
*/
public String getServiceTypeID() {
return serviceTypeID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectServiceType.ServiceTypeID
*
* @param serviceTypeID the value for ProjectServiceType.ServiceTypeID
*
* @mbg.generated
*/
public void setServiceTypeID(String serviceTypeID) {
this.serviceTypeID = serviceTypeID == null ? null : serviceTypeID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectServiceType.TemplateGroupID
*
* @return the value of ProjectServiceType.TemplateGroupID
*
* @mbg.generated
*/
public String getTemplateGroupID() {
return templateGroupID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectServiceType.TemplateGroupID
*
* @param templateGroupID the value for ProjectServiceType.TemplateGroupID
*
* @mbg.generated
*/
public void setTemplateGroupID(String templateGroupID) {
this.templateGroupID = templateGroupID == null ? null : templateGroupID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", ID=").append(ID);
sb.append(", projectID=").append(projectID);
sb.append(", serviceTypeID=").append(serviceTypeID);
sb.append(", templateGroupID=").append(templateGroupID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
package pwc.taxtech.atms.entitiy;
import java.util.ArrayList;
import java.util.List;
public class ProjectServiceTypeExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public ProjectServiceTypeExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIDIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIDIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIDEqualTo(String value) {
addCriterion("ID =", value, "ID");
return (Criteria) this;
}
public Criteria andIDNotEqualTo(String value) {
addCriterion("ID <>", value, "ID");
return (Criteria) this;
}
public Criteria andIDGreaterThan(String value) {
addCriterion("ID >", value, "ID");
return (Criteria) this;
}
public Criteria andIDGreaterThanOrEqualTo(String value) {
addCriterion("ID >=", value, "ID");
return (Criteria) this;
}
public Criteria andIDLessThan(String value) {
addCriterion("ID <", value, "ID");
return (Criteria) this;
}
public Criteria andIDLessThanOrEqualTo(String value) {
addCriterion("ID <=", value, "ID");
return (Criteria) this;
}
public Criteria andIDLike(String value) {
addCriterion("ID like", value, "ID");
return (Criteria) this;
}
public Criteria andIDNotLike(String value) {
addCriterion("ID not like", value, "ID");
return (Criteria) this;
}
public Criteria andIDIn(List<String> values) {
addCriterion("ID in", values, "ID");
return (Criteria) this;
}
public Criteria andIDNotIn(List<String> values) {
addCriterion("ID not in", values, "ID");
return (Criteria) this;
}
public Criteria andIDBetween(String value1, String value2) {
addCriterion("ID between", value1, value2, "ID");
return (Criteria) this;
}
public Criteria andIDNotBetween(String value1, String value2) {
addCriterion("ID not between", value1, value2, "ID");
return (Criteria) this;
}
public Criteria andProjectIDIsNull() {
addCriterion("ProjectID is null");
return (Criteria) this;
}
public Criteria andProjectIDIsNotNull() {
addCriterion("ProjectID is not null");
return (Criteria) this;
}
public Criteria andProjectIDEqualTo(String value) {
addCriterion("ProjectID =", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDNotEqualTo(String value) {
addCriterion("ProjectID <>", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDGreaterThan(String value) {
addCriterion("ProjectID >", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDGreaterThanOrEqualTo(String value) {
addCriterion("ProjectID >=", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDLessThan(String value) {
addCriterion("ProjectID <", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDLessThanOrEqualTo(String value) {
addCriterion("ProjectID <=", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDLike(String value) {
addCriterion("ProjectID like", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDNotLike(String value) {
addCriterion("ProjectID not like", value, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDIn(List<String> values) {
addCriterion("ProjectID in", values, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDNotIn(List<String> values) {
addCriterion("ProjectID not in", values, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDBetween(String value1, String value2) {
addCriterion("ProjectID between", value1, value2, "projectID");
return (Criteria) this;
}
public Criteria andProjectIDNotBetween(String value1, String value2) {
addCriterion("ProjectID not between", value1, value2, "projectID");
return (Criteria) this;
}
public Criteria andServiceTypeIDIsNull() {
addCriterion("ServiceTypeID is null");
return (Criteria) this;
}
public Criteria andServiceTypeIDIsNotNull() {
addCriterion("ServiceTypeID is not null");
return (Criteria) this;
}
public Criteria andServiceTypeIDEqualTo(String value) {
addCriterion("ServiceTypeID =", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDNotEqualTo(String value) {
addCriterion("ServiceTypeID <>", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDGreaterThan(String value) {
addCriterion("ServiceTypeID >", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDGreaterThanOrEqualTo(String value) {
addCriterion("ServiceTypeID >=", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDLessThan(String value) {
addCriterion("ServiceTypeID <", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDLessThanOrEqualTo(String value) {
addCriterion("ServiceTypeID <=", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDLike(String value) {
addCriterion("ServiceTypeID like", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDNotLike(String value) {
addCriterion("ServiceTypeID not like", value, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDIn(List<String> values) {
addCriterion("ServiceTypeID in", values, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDNotIn(List<String> values) {
addCriterion("ServiceTypeID not in", values, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDBetween(String value1, String value2) {
addCriterion("ServiceTypeID between", value1, value2, "serviceTypeID");
return (Criteria) this;
}
public Criteria andServiceTypeIDNotBetween(String value1, String value2) {
addCriterion("ServiceTypeID not between", value1, value2, "serviceTypeID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDIsNull() {
addCriterion("TemplateGroupID is null");
return (Criteria) this;
}
public Criteria andTemplateGroupIDIsNotNull() {
addCriterion("TemplateGroupID is not null");
return (Criteria) this;
}
public Criteria andTemplateGroupIDEqualTo(String value) {
addCriterion("TemplateGroupID =", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDNotEqualTo(String value) {
addCriterion("TemplateGroupID <>", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDGreaterThan(String value) {
addCriterion("TemplateGroupID >", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDGreaterThanOrEqualTo(String value) {
addCriterion("TemplateGroupID >=", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDLessThan(String value) {
addCriterion("TemplateGroupID <", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDLessThanOrEqualTo(String value) {
addCriterion("TemplateGroupID <=", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDLike(String value) {
addCriterion("TemplateGroupID like", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDNotLike(String value) {
addCriterion("TemplateGroupID not like", value, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDIn(List<String> values) {
addCriterion("TemplateGroupID in", values, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDNotIn(List<String> values) {
addCriterion("TemplateGroupID not in", values, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDBetween(String value1, String value2) {
addCriterion("TemplateGroupID between", value1, value2, "templateGroupID");
return (Criteria) this;
}
public Criteria andTemplateGroupIDNotBetween(String value1, String value2) {
addCriterion("TemplateGroupID not between", value1, value2, "templateGroupID");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectServiceType
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectServiceType
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
package pwc.taxtech.atms.entitiy;
import java.io.Serializable;
import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectStatusManage
*
* @mbg.generated do_not_delete_during_merge
*/
public class ProjectStatusManage implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.ID
*
* @mbg.generated
*/
private String ID;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.DbName
*
* @mbg.generated
*/
private String dbName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.PeriodId
*
* @mbg.generated
*/
private Integer periodId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.Status
*
* @mbg.generated
*/
private Integer status;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.CreatorID
*
* @mbg.generated
*/
private String creatorID;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.CreateTime
*
* @mbg.generated
*/
private Date createTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column ProjectStatusManage.UpdateTime
*
* @mbg.generated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.ID
*
* @return the value of ProjectStatusManage.ID
*
* @mbg.generated
*/
public String getID() {
return ID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.ID
*
* @param ID the value for ProjectStatusManage.ID
*
* @mbg.generated
*/
public void setID(String ID) {
this.ID = ID == null ? null : ID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.DbName
*
* @return the value of ProjectStatusManage.DbName
*
* @mbg.generated
*/
public String getDbName() {
return dbName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.DbName
*
* @param dbName the value for ProjectStatusManage.DbName
*
* @mbg.generated
*/
public void setDbName(String dbName) {
this.dbName = dbName == null ? null : dbName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.PeriodId
*
* @return the value of ProjectStatusManage.PeriodId
*
* @mbg.generated
*/
public Integer getPeriodId() {
return periodId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.PeriodId
*
* @param periodId the value for ProjectStatusManage.PeriodId
*
* @mbg.generated
*/
public void setPeriodId(Integer periodId) {
this.periodId = periodId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.Status
*
* @return the value of ProjectStatusManage.Status
*
* @mbg.generated
*/
public Integer getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.Status
*
* @param status the value for ProjectStatusManage.Status
*
* @mbg.generated
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.CreatorID
*
* @return the value of ProjectStatusManage.CreatorID
*
* @mbg.generated
*/
public String getCreatorID() {
return creatorID;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.CreatorID
*
* @param creatorID the value for ProjectStatusManage.CreatorID
*
* @mbg.generated
*/
public void setCreatorID(String creatorID) {
this.creatorID = creatorID == null ? null : creatorID.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.CreateTime
*
* @return the value of ProjectStatusManage.CreateTime
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.CreateTime
*
* @param createTime the value for ProjectStatusManage.CreateTime
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column ProjectStatusManage.UpdateTime
*
* @return the value of ProjectStatusManage.UpdateTime
*
* @mbg.generated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column ProjectStatusManage.UpdateTime
*
* @param updateTime the value for ProjectStatusManage.UpdateTime
*
* @mbg.generated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", ID=").append(ID);
sb.append(", dbName=").append(dbName);
sb.append(", periodId=").append(periodId);
sb.append(", status=").append(status);
sb.append(", creatorID=").append(creatorID);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
package pwc.taxtech.atms.entitiy;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ProjectStatusManageExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public ProjectStatusManageExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIDIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIDIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIDEqualTo(String value) {
addCriterion("ID =", value, "ID");
return (Criteria) this;
}
public Criteria andIDNotEqualTo(String value) {
addCriterion("ID <>", value, "ID");
return (Criteria) this;
}
public Criteria andIDGreaterThan(String value) {
addCriterion("ID >", value, "ID");
return (Criteria) this;
}
public Criteria andIDGreaterThanOrEqualTo(String value) {
addCriterion("ID >=", value, "ID");
return (Criteria) this;
}
public Criteria andIDLessThan(String value) {
addCriterion("ID <", value, "ID");
return (Criteria) this;
}
public Criteria andIDLessThanOrEqualTo(String value) {
addCriterion("ID <=", value, "ID");
return (Criteria) this;
}
public Criteria andIDLike(String value) {
addCriterion("ID like", value, "ID");
return (Criteria) this;
}
public Criteria andIDNotLike(String value) {
addCriterion("ID not like", value, "ID");
return (Criteria) this;
}
public Criteria andIDIn(List<String> values) {
addCriterion("ID in", values, "ID");
return (Criteria) this;
}
public Criteria andIDNotIn(List<String> values) {
addCriterion("ID not in", values, "ID");
return (Criteria) this;
}
public Criteria andIDBetween(String value1, String value2) {
addCriterion("ID between", value1, value2, "ID");
return (Criteria) this;
}
public Criteria andIDNotBetween(String value1, String value2) {
addCriterion("ID not between", value1, value2, "ID");
return (Criteria) this;
}
public Criteria andDbNameIsNull() {
addCriterion("DbName is null");
return (Criteria) this;
}
public Criteria andDbNameIsNotNull() {
addCriterion("DbName is not null");
return (Criteria) this;
}
public Criteria andDbNameEqualTo(String value) {
addCriterion("DbName =", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameNotEqualTo(String value) {
addCriterion("DbName <>", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameGreaterThan(String value) {
addCriterion("DbName >", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameGreaterThanOrEqualTo(String value) {
addCriterion("DbName >=", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameLessThan(String value) {
addCriterion("DbName <", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameLessThanOrEqualTo(String value) {
addCriterion("DbName <=", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameLike(String value) {
addCriterion("DbName like", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameNotLike(String value) {
addCriterion("DbName not like", value, "dbName");
return (Criteria) this;
}
public Criteria andDbNameIn(List<String> values) {
addCriterion("DbName in", values, "dbName");
return (Criteria) this;
}
public Criteria andDbNameNotIn(List<String> values) {
addCriterion("DbName not in", values, "dbName");
return (Criteria) this;
}
public Criteria andDbNameBetween(String value1, String value2) {
addCriterion("DbName between", value1, value2, "dbName");
return (Criteria) this;
}
public Criteria andDbNameNotBetween(String value1, String value2) {
addCriterion("DbName not between", value1, value2, "dbName");
return (Criteria) this;
}
public Criteria andPeriodIdIsNull() {
addCriterion("PeriodId is null");
return (Criteria) this;
}
public Criteria andPeriodIdIsNotNull() {
addCriterion("PeriodId is not null");
return (Criteria) this;
}
public Criteria andPeriodIdEqualTo(Integer value) {
addCriterion("PeriodId =", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdNotEqualTo(Integer value) {
addCriterion("PeriodId <>", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdGreaterThan(Integer value) {
addCriterion("PeriodId >", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdGreaterThanOrEqualTo(Integer value) {
addCriterion("PeriodId >=", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdLessThan(Integer value) {
addCriterion("PeriodId <", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdLessThanOrEqualTo(Integer value) {
addCriterion("PeriodId <=", value, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdIn(List<Integer> values) {
addCriterion("PeriodId in", values, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdNotIn(List<Integer> values) {
addCriterion("PeriodId not in", values, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdBetween(Integer value1, Integer value2) {
addCriterion("PeriodId between", value1, value2, "periodId");
return (Criteria) this;
}
public Criteria andPeriodIdNotBetween(Integer value1, Integer value2) {
addCriterion("PeriodId not between", value1, value2, "periodId");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("Status is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("Status is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Integer value) {
addCriterion("Status =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Integer value) {
addCriterion("Status <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Integer value) {
addCriterion("Status >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("Status >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Integer value) {
addCriterion("Status <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Integer value) {
addCriterion("Status <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Integer> values) {
addCriterion("Status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> values) {
addCriterion("Status not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Integer value1, Integer value2) {
addCriterion("Status between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Integer value1, Integer value2) {
addCriterion("Status not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andCreatorIDIsNull() {
addCriterion("CreatorID is null");
return (Criteria) this;
}
public Criteria andCreatorIDIsNotNull() {
addCriterion("CreatorID is not null");
return (Criteria) this;
}
public Criteria andCreatorIDEqualTo(String value) {
addCriterion("CreatorID =", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotEqualTo(String value) {
addCriterion("CreatorID <>", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDGreaterThan(String value) {
addCriterion("CreatorID >", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDGreaterThanOrEqualTo(String value) {
addCriterion("CreatorID >=", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLessThan(String value) {
addCriterion("CreatorID <", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLessThanOrEqualTo(String value) {
addCriterion("CreatorID <=", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLike(String value) {
addCriterion("CreatorID like", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotLike(String value) {
addCriterion("CreatorID not like", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDIn(List<String> values) {
addCriterion("CreatorID in", values, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotIn(List<String> values) {
addCriterion("CreatorID not in", values, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDBetween(String value1, String value2) {
addCriterion("CreatorID between", value1, value2, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotBetween(String value1, String value2) {
addCriterion("CreatorID not between", value1, value2, "creatorID");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CreateTime is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CreateTime is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CreateTime =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CreateTime <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CreateTime >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CreateTime >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CreateTime <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CreateTime <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CreateTime in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CreateTime not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CreateTime between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CreateTime not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("UpdateTime is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("UpdateTime is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("UpdateTime =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("UpdateTime <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("UpdateTime >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("UpdateTime >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("UpdateTime <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("UpdateTime <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("UpdateTime in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("UpdateTime not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("UpdateTime between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("UpdateTime not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectStatusManage
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table ProjectStatusManage
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
package pwc.taxtech.atms.service;
import pwc.taxtech.atms.dto.user.UserDto;
public interface IdentityService {
UserDto getIdentityUser();
}
package pwc.taxtech.atms.service;
import java.util.List;
import java.util.Map;
import pwc.taxtech.atms.dto.ProjectClientDto;
import pwc.taxtech.atms.dto.ServiceTypeDto;
import pwc.taxtech.atms.dto.taxadmin.AddProjectResult;
import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
public interface ProjectService {
......@@ -38,6 +40,10 @@ public interface ProjectService {
List<ProjectDisplayDto> getAllProjectList(String orgID, String s, Integer projectYear);
AddProjectResult addProject(ProjectDisplayDto projectDto, String userName);
Map<Integer,Integer> getProjectAllStatus(String dbName);
// Map<Integer, Integer> getProjectAllStatus(String dbName);
}
package pwc.taxtech.atms.service;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.taxadmin.ProjectStatusManageDto;
public interface ProjectStatusManageService {
OperationResultDto<ProjectStatusManageDto> setProjectStatus(String dbName, Integer periodId, Integer status, String id);
}
package pwc.taxtech.atms.service.impl;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.AppCachePool;
import pwc.taxtech.atms.dto.user.UserDto;
import pwc.taxtech.atms.service.IdentityService;
@Service
public class IdentityServiceImpl implements IdentityService {
@Override
public UserDto getIdentityUser() {
return AppCachePool.getCachedUser("cach_test");//TODO:should fixed use session username
}
}
......@@ -7,23 +7,24 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.OperateLogType;
import pwc.taxtech.atms.common.OperationModule;
import pwc.taxtech.atms.dao.OrganizationServiceTemplateGroupMapper;
import pwc.taxtech.atms.dao.ProjectClientMapper;
import pwc.taxtech.atms.dao.ProjectMapper;
import pwc.taxtech.atms.dao.ProjectServiceTypeMapper;
import pwc.taxtech.atms.dao.ServiceTypeMapper;
import pwc.taxtech.atms.dao.TemplateGroupMapper;
import pwc.taxtech.atms.dto.FieldsMapper;
import pwc.taxtech.atms.dto.ProjectClientDto;
import pwc.taxtech.atms.dto.ServiceTypeDto;
import pwc.taxtech.atms.dto.TemplateGroupDto;
import pwc.taxtech.atms.dto.taxadmin.AddProjectResult;
import pwc.taxtech.atms.dto.taxadmin.ProjectDisplayDto;
import pwc.taxtech.atms.dto.taxadmin.ProjectYearParam;
import pwc.taxtech.atms.entitiy.Project;
import pwc.taxtech.atms.entitiy.ProjectClient;
import pwc.taxtech.atms.entitiy.ProjectClientExample;
import pwc.taxtech.atms.entitiy.*;
import pwc.taxtech.atms.entitiy.ProjectClientExample.Criteria;
import pwc.taxtech.atms.entitiy.ServiceType;
import pwc.taxtech.atms.entitiy.ServiceTypeExample;
import pwc.taxtech.atms.entitiy.TemplateGroup;
import pwc.taxtech.atms.entitiy.TemplateGroupExample;
import pwc.taxtech.atms.service.OperationLogService;
import pwc.taxtech.atms.service.ProjectService;
import java.util.ArrayList;
......@@ -32,6 +33,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
@Service
......@@ -40,6 +42,7 @@ public class ProjectServiceImpl implements ProjectService {
* @see PwC.Tax.Tech.Atms..Admin.Application\Services\Impl\ProjectService.cs
*/
private static final int FIRST_OR_DEFAULT = 0;
private static Logger LOGGER = LoggerFactory.getLogger(ProjectServiceImpl.class);
@Autowired
private ServiceTypeMapper serviceTypeMapper;
......@@ -53,8 +56,21 @@ public class ProjectServiceImpl implements ProjectService {
@Autowired
private ProjectMapper projectMapper;
@Autowired
private OrganizationServiceTemplateGroupMapper organizationServiceTemplateGroupMapper;
@Autowired
private ProjectServiceTypeMapper projectServiceTypeMapper;
@Autowired
private OperationLogService operationLogService;
private final OperateLogType LOG_TYPE = OperateLogType.OperationLogProject;
private static final Logger logger = LoggerFactory.getLogger(ProjectServiceImpl.class);
public ProjectServiceImpl() {
}
@Override
public List<ServiceTypeDto> getServiceList() {
......@@ -125,8 +141,8 @@ public class ProjectServiceImpl implements ProjectService {
&& (x.getStartPeriod() != p.getStartPeriod() || x.getEndPeriod() != p.getEndPeriod()))
.collect(Collectors.toList());
if (fixList != null && !fixList.isEmpty()) {
ProjectDisplayDto pddFirst=fixList.get(FIRST_OR_DEFAULT);
if (fixList != null && !fixList.isEmpty()) {
ProjectDisplayDto pddFirst = fixList.get(FIRST_OR_DEFAULT);
//修改数据库对应项目起始月
Project project = new Project();
......@@ -144,13 +160,104 @@ public class ProjectServiceImpl implements ProjectService {
}
});
removeList.forEach(r->{orgList.remove(r);});
removeList.forEach(r -> {
orgList.remove(r);
});
pList.addAll(data);
pList.addAll(orgList);
return pList;
}
@Override
public AddProjectResult addProject(ProjectDisplayDto projectDto, String userName) {
projectDto.setActive(true);
projectDto.setRuleType(1);
Project project = new Project();
try {
FieldsMapper.map(projectDto, project);
} catch (Exception e) {
LOGGER.warn("map project dto to project may be some error");
e.printStackTrace();
}
try {
project.setID(UUID.randomUUID().toString());
OrganizationServiceTemplateGroupExample example = new OrganizationServiceTemplateGroupExample();
example.createCriteria().andOrganizationIDEqualTo(projectDto.getOrganizationID());
organizationServiceTemplateGroupMapper.selectByExample(example).forEach(ostg -> {
ProjectServiceType pst = new ProjectServiceType();
pst.setID(UUID.randomUUID().toString());
pst.setServiceTypeID(ostg.getServiceTypeID());
pst.setTemplateGroupID(ostg.getTemplateGroupID());
projectServiceTypeMapper.insert(pst);
operationLogService.addDataAddLog(pst, OperationModule.ProjectServiceType, userName,
Message.Project.AddProjectServiceType, pst.getID(), projectDto.getName(), LOG_TYPE);
});
project.setDbName(generateDatabase(project, projectDto.getEnterpriseAccountSetID()));
project.setUpdateTime(new Date());
projectMapper.insert(project);
operationLogService.addDataAddLog(project, OperationModule.Project, userName, Message.Project.AddProject,
project.getID(), projectDto.getName(), LOG_TYPE);
AddProjectResult addProjectResult = new AddProjectResult();
addProjectResult.setResult(true);
addProjectResult.setdBname(project.getDbName());
addProjectResult.setProjectID(project.getID());
return addProjectResult;
}catch (Exception e){
operationLogService.addDataAddLog(null, OperationModule.Project, userName,
Message.Project.AddProjectFail, e.getMessage(), projectDto.getName(), LOG_TYPE);
AddProjectResult addProjectResult = new AddProjectResult();
addProjectResult.setResult(false);
addProjectResult.setResultMsg(e.getMessage());
return addProjectResult;
}
}
@Override
public Map<Integer, Integer> getProjectAllStatus(String dbName) {
List<ProjectStatusManage> psmList= projectMapper.selectProjectAllStatus(dbName);
Map<Integer,Integer> result =new HashMap<>(psmList.size());
psmList.forEach(m->{
result.put(m.getPeriodId(),m.getStatus());
});
return result;
}
private String generateDatabase(Project project, String accsetid) {//TODO: should be impl future(neo)
return "db_test";
}
private String GenerateProjectDbName(String maxName, String year) {
year = year.substring(2);
String pre2 = maxName.charAt(0) + "", post2 = "";
int post = Integer.parseInt(maxName.substring(3)) + 1;
if (post >= 100000) {
Integer pre = Integer.parseInt(String.valueOf(maxName.charAt(0)));
pre2 = ((char)(pre+1))+"";
post2 = "00000";
} else if (post >= 10000) {
post2 = post + "";
} else if (post >= 1000) {
post2 = "0" + post;
} else if (post >= 100) {
post2 = "00" + post;
} else if (post >= 10) {
post2 = "000" + post;
} else {
post2 = "0000" + post;
}
return pre2 + year + post2;
}
private List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(List<ProjectDisplayDto> pList, String orgID,
String serviceID, Integer projectYear) {
List<ProjectDisplayDto> list = new ArrayList<>();
......
package pwc.taxtech.atms.service.impl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.dao.ProjectStatusManageMapper;
import pwc.taxtech.atms.dto.FieldsMapper;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.taxadmin.ProjectStatusManageDto;
import pwc.taxtech.atms.entitiy.ProjectStatusManage;
import pwc.taxtech.atms.entitiy.ProjectStatusManageExample;
import pwc.taxtech.atms.service.ProjectStatusManageService;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@Service
public class ProjectStatusManageServiceImpl implements ProjectStatusManageService {
private static final int FIRST_OR_DFAULT = 0;
private static Logger LOGGER = LoggerFactory.getLogger(ProjectStatusManageServiceImpl.class);
@Autowired
ProjectStatusManageMapper projectStatusManageMapper;
@Override
public OperationResultDto<ProjectStatusManageDto> setProjectStatus(String dbName, Integer periodId, Integer status, String creatorId) {
try {
ProjectStatusManageExample example = new ProjectStatusManageExample();
example.createCriteria().andDbNameEqualTo(dbName).andPeriodIdEqualTo(periodId);
List<ProjectStatusManage> psmList = projectStatusManageMapper.selectByExample(example);
ProjectStatusManage psm = null;
if (psmList != null && !psmList.isEmpty()) {
psm = psmList.get(FIRST_OR_DFAULT);
psm.setStatus(status);
psm.setUpdateTime(new Date());
projectStatusManageMapper.updateByPrimaryKey(psm);
} else {
psm = new ProjectStatusManage();
psm.setID(UUID.randomUUID().toString());
psm.setDbName(dbName);
psm.setPeriodId(periodId);
psm.setStatus(status);
psm.setCreatorID(creatorId);
psm.setCreateTime(new Date());
psm.setUpdateTime(new Date());
projectStatusManageMapper.insert(psm);
}
OperationResultDto<ProjectStatusManageDto> ord = new OperationResultDto<>();
ord.setResult(true);
ord.setResultMsg("");
ProjectStatusManageDto dto = new ProjectStatusManageDto();
try {
FieldsMapper.map(psm, dto);
} catch (Exception e) {
e.printStackTrace();
LOGGER.warn("cast filed some error", e);
}
ord.setData(dto);
return ord;
}catch (Exception e){
LOGGER.error("ProjectStatusManageService,SetProjectStatus(string dbName, int periodId)发生错误: {}",e.getMessage());
OperationResultDto<ProjectStatusManageDto> ord = new OperationResultDto<>();
ord.setResult(false);
ord.setResultMsg(e.getMessage());
ord.setData(null);
return ord;
}
}
}
......@@ -409,7 +409,7 @@ public class UserServiceImpl extends AbstractService implements UserService {
token.setExpires_in(86400000L);
// api_host可以由atms-web端来赋值
token.setApi_host("NA");
token.setVat_api_host("https://cnshaappuwv023:30005");
token.setVat_api_host("http://localhost:8180");
token.setTp_url("https://cnshaappuwv023:35001");
token.setVersion("1.0" + ".0.0");
token.setUser_name(inputLoginName);
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.ProjectServiceTypeMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.entitiy.ProjectServiceType">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<result column="ID" jdbcType="VARCHAR" property="ID" />
<result column="ProjectID" jdbcType="VARCHAR" property="projectID" />
<result column="ServiceTypeID" jdbcType="VARCHAR" property="serviceTypeID" />
<result column="TemplateGroupID" jdbcType="VARCHAR" property="templateGroupID" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
ID, ProjectID, ServiceTypeID, TemplateGroupID
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceTypeExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from ProjectServiceType
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceTypeExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from ProjectServiceType
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceType">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into ProjectServiceType (ID, ProjectID, ServiceTypeID,
TemplateGroupID)
values (#{ID,jdbcType=VARCHAR}, #{projectID,jdbcType=VARCHAR}, #{serviceTypeID,jdbcType=VARCHAR},
#{templateGroupID,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceType">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into ProjectServiceType
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ID != null">
ID,
</if>
<if test="projectID != null">
ProjectID,
</if>
<if test="serviceTypeID != null">
ServiceTypeID,
</if>
<if test="templateGroupID != null">
TemplateGroupID,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ID != null">
#{ID,jdbcType=VARCHAR},
</if>
<if test="projectID != null">
#{projectID,jdbcType=VARCHAR},
</if>
<if test="serviceTypeID != null">
#{serviceTypeID,jdbcType=VARCHAR},
</if>
<if test="templateGroupID != null">
#{templateGroupID,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceTypeExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from ProjectServiceType
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectServiceType
<set>
<if test="record.ID != null">
ID = #{record.ID,jdbcType=VARCHAR},
</if>
<if test="record.projectID != null">
ProjectID = #{record.projectID,jdbcType=VARCHAR},
</if>
<if test="record.serviceTypeID != null">
ServiceTypeID = #{record.serviceTypeID,jdbcType=VARCHAR},
</if>
<if test="record.templateGroupID != null">
TemplateGroupID = #{record.templateGroupID,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectServiceType
set ID = #{record.ID,jdbcType=VARCHAR},
ProjectID = #{record.projectID,jdbcType=VARCHAR},
ServiceTypeID = #{record.serviceTypeID,jdbcType=VARCHAR},
TemplateGroupID = #{record.templateGroupID,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entitiy.ProjectServiceTypeExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from ProjectServiceType
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.ProjectStatusManageMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.entitiy.ProjectStatusManage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="ID" jdbcType="VARCHAR" property="ID" />
<result column="DbName" jdbcType="VARCHAR" property="dbName" />
<result column="PeriodId" jdbcType="INTEGER" property="periodId" />
<result column="Status" jdbcType="INTEGER" property="status" />
<result column="CreatorID" jdbcType="VARCHAR" property="creatorID" />
<result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="UpdateTime" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
ID, DbName, PeriodId, Status, CreatorID, CreateTime, UpdateTime
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManageExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from ProjectStatusManage
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from ProjectStatusManage
where ID = #{ID,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from ProjectStatusManage
where ID = #{ID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManageExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from ProjectStatusManage
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into ProjectStatusManage (ID, DbName, PeriodId,
Status, CreatorID, CreateTime,
UpdateTime)
values (#{ID,jdbcType=VARCHAR}, #{dbName,jdbcType=VARCHAR}, #{periodId,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{creatorID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into ProjectStatusManage
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ID != null">
ID,
</if>
<if test="dbName != null">
DbName,
</if>
<if test="periodId != null">
PeriodId,
</if>
<if test="status != null">
Status,
</if>
<if test="creatorID != null">
CreatorID,
</if>
<if test="createTime != null">
CreateTime,
</if>
<if test="updateTime != null">
UpdateTime,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ID != null">
#{ID,jdbcType=VARCHAR},
</if>
<if test="dbName != null">
#{dbName,jdbcType=VARCHAR},
</if>
<if test="periodId != null">
#{periodId,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="creatorID != null">
#{creatorID,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManageExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from ProjectStatusManage
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectStatusManage
<set>
<if test="record.ID != null">
ID = #{record.ID,jdbcType=VARCHAR},
</if>
<if test="record.dbName != null">
DbName = #{record.dbName,jdbcType=VARCHAR},
</if>
<if test="record.periodId != null">
PeriodId = #{record.periodId,jdbcType=INTEGER},
</if>
<if test="record.status != null">
Status = #{record.status,jdbcType=INTEGER},
</if>
<if test="record.creatorID != null">
CreatorID = #{record.creatorID,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
CreateTime = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
UpdateTime = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectStatusManage
set ID = #{record.ID,jdbcType=VARCHAR},
DbName = #{record.dbName,jdbcType=VARCHAR},
PeriodId = #{record.periodId,jdbcType=INTEGER},
Status = #{record.status,jdbcType=INTEGER},
CreatorID = #{record.creatorID,jdbcType=VARCHAR},
CreateTime = #{record.createTime,jdbcType=TIMESTAMP},
UpdateTime = #{record.updateTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectStatusManage
<set>
<if test="dbName != null">
DbName = #{dbName,jdbcType=VARCHAR},
</if>
<if test="periodId != null">
PeriodId = #{periodId,jdbcType=INTEGER},
</if>
<if test="status != null">
Status = #{status,jdbcType=INTEGER},
</if>
<if test="creatorID != null">
CreatorID = #{creatorID,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
CreateTime = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
UpdateTime = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where ID = #{ID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update ProjectStatusManage
set DbName = #{dbName,jdbcType=VARCHAR},
PeriodId = #{periodId,jdbcType=INTEGER},
Status = #{status,jdbcType=INTEGER},
CreatorID = #{creatorID,jdbcType=VARCHAR},
CreateTime = #{createTime,jdbcType=TIMESTAMP},
UpdateTime = #{updateTime,jdbcType=TIMESTAMP}
where ID = #{ID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entitiy.ProjectStatusManageExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from ProjectStatusManage
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval',
'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService','serviceLogService',
'ackUibModal', 'Upload', 'apiInterceptor',
function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService,
orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService,
localStorageService, assetsManageSessionService, ackUibModal, Upload, apiInterceptor) {
localStorageService, assetsManageSessionService, serviceLogService, ackUibModal, Upload, apiInterceptor) {
'use strict';
$log.debug('appOverviewController.ctor()...');
var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile';
......
......@@ -168,12 +168,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
cfg.isWebApiRequest = true;
if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
if (config && config.dbName) {//TODO:from is not allowed ,future should open (neo)
// cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
}
return cfg;
......@@ -189,10 +189,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.isWebApiRequest = true;
if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
......@@ -926,11 +926,11 @@ frameworkModule.directive('appNav', ['$log',
]);
frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval',
'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService','serviceLogService',
'ackUibModal', 'Upload', 'apiInterceptor',
function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService,
orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService,
localStorageService, assetsManageSessionService, ackUibModal, Upload, apiInterceptor) {
localStorageService, assetsManageSessionService,serviceLogService, ackUibModal, Upload, apiInterceptor) {
'use strict';
$log.debug('appOverviewController.ctor()...');
var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile';
......@@ -1697,7 +1697,7 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
projectService.addProject(project).success(function (rsp) {
if (rsp && rsp.result) {
project.haveCreateProject = true;
project.dbName = rsp.dbname;
project.dbName = rsp.dBname;
project.id = rsp.projectID;
if (_.isNull(project.projectStatusList)) { //如果当前期间还没有导入任何数据的话,就添加一条未开始状态的记录
......@@ -4600,12 +4600,12 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
}
cfg.isWebApiRequest = true;
if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
if (config && config.dbName) {//TODO:from is not allowed ,future should open (neo)
// cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
if (vatSessionService.project && vatSessionService.project.dbName) {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
}
return cfg;
......@@ -4621,10 +4621,10 @@ webservices.factory('apiConfig', ['$log', 'vatSessionService',
cfg.isWebApiRequest = true;
if (config && config.dbName) {
cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': config.dbName + '@cn.pwc.com' };
}
else {
cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
// cfg.headers = { 'from': vatSessionService.project.dbName + '@cn.pwc.com' };
}
//$httpProvider.defaults.headers.common['from'] = vatSessionService.project.dbName + '@cn.pwc.com';
//cfg.headers.from = vatSessionService.project.dbName+'@cn.pwc.com';
......
......@@ -4,7 +4,7 @@
"token_type": "bearer",
"expires_in": "1200000",
"api_host": "http://localhost:8180/atms-api",
"vat_api_host":"https://cnshaappuwv023:30005",
"vat_api_host":"http://localhost:8180",
"tp_url":"https://cnshaappuwv023:35001",
"version":"1.0.0.0",
"user_name":"admin",
......
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