Skip to content

T
traffic-front
Commit 29731f5b authored by neo's avatar neo
Browse files
Options

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

parents a96a7fcf 195bd2d0
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountServiceImpl.java
View file @ 29731f5b
......@@ -524,11 +524,11 @@ public class EnterpriseAccountServiceImpl extends AbstractService {
//create operationlog for creating enterprise account set
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
updateLogParams.setOperationContent("");
// updateLogParams.setUpdateState("");
// updateLogParams.setOriginalState("");
// updateLogParams.setOperationContent("");
updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
updateLogParams.setComment("");
// updateLogParams.setComment("");
updateLogParams.setOperateLogType(OperateLogType.OperationLogEnterPrise.value());
updateLogParams.setOperationAction(OperationAction.AddEnterpriseAccountSet.value());
updateLogParams.setOperationObject(enterpriseAccountSet.getName());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/EnterpriseAccountSetServiceImpl.java
View file @ 29731f5b
......@@ -424,13 +424,13 @@ public class EnterpriseAccountSetServiceImpl {
for (EnterpriseAccountSetOrgDto enterpriseAccountSetOrgDto : enterpriseAccountSetOrgDtoList) {
UpdateLogParams updateLogParams = new UpdateLogParams();
updateLogParams.setOperationUser(authUserHelper.getCurrentAuditor().get());
updateLogParams.setUpdateState("");
updateLogParams.setOriginalState("");
// updateLogParams.setUpdateState("");
// updateLogParams.setOriginalState("");
updateLogParams.setOperationContent(enterpriseAccountSetOrgDto.getOrganizationName());
updateLogParams.setOperationObject(enterpriseAccountSetDto.getName());
updateLogParams.setOperationModule(OperationModule.BasicDataEnterpriceAccount.value());
updateLogParams.setOperateLogType(OperateLogType.OperationLogEnterPrise.value());
updateLogParams.setComment("");
// updateLogParams.setComment("");
updateLogParams.setOperationAction(OperationAction.DeleteRelevantOrg.value());
updateLogParamsList.add(updateLogParams);
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OperationLogBasicDataExtendsMapper.xml
View file @ 29731f5b
......@@ -15,34 +15,34 @@
<insert id="insertSmart" parameterType="pwc.taxtech.atms.entity.OperationLogSmart">
insert into ${tableName}
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(id)">
ID,
</if>
<if test="operationContent != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationContent)">
OPERATION_CONTENT,
</if>
<if test="moduleName != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(moduleName)">
MODULE_NAME,
</if>
<if test="operationObject != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationObject)">
OPERATION_OBJECT,
</if>
<if test="operationAction != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationAction)">
OPERATION_ACTION,
</if>
<if test="originalState != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(originalState)">
ORIGINAL_STATE,
</if>
<if test="updateState != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(updateState)">
UPDATE_STATE,
</if>
<if test="operationUser != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationUser)">
OPERATION_USER,
</if>
<if test="ip != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(ip)">
IP,
</if>
<if test="comment != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(comment)">
"COMMENT",
</if>
<if test="createTime != null">
......@@ -50,34 +50,34 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(id)">
#{id,jdbcType=VARCHAR},
</if>
<if test="operationContent != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationContent)">
#{operationContent,jdbcType=VARCHAR},
</if>
<if test="moduleName != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(moduleName)">
#{moduleName,jdbcType=VARCHAR},
</if>
<if test="operationObject != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationObject)">
#{operationObject,jdbcType=VARCHAR},
</if>
<if test="operationAction != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationAction)">
#{operationAction,jdbcType=VARCHAR},
</if>
<if test="originalState != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(originalState)">
#{originalState,jdbcType=VARCHAR},
</if>
<if test="updateState != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(updateState)">
#{updateState,jdbcType=VARCHAR},
</if>
<if test="operationUser != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(operationUser)">
#{operationUser,jdbcType=VARCHAR},
</if>
<if test="ip != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(ip)">
#{ip,jdbcType=VARCHAR},
</if>
<if test="comment != null">
<if test="@org.apache.commons.lang3.StringUtils@isNotBlank(comment)">
#{comment,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
......
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