Commit c8783675 by qwmqiuwenmin

fix

parent 09bd4e2c
...@@ -550,7 +550,23 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ ...@@ -550,7 +550,23 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
} }
} }
} }
}else{ }else if(syncTask.getTaskType().equals(2)){
List<PreDealLogInfoDTO> result = page.getResult();
for (PreDealLogInfoDTO dto : result) {
dto.setDataCode(dto.getDataId());
if(dto.getDataType() == PreDealTypeEnum.friend.getVal()){
dto.setDataName("第三方应用处理");
}else if(dto.getDataType() == PreDealTypeEnum.friend_clerk.getVal()){
dto.setDataName("导购处理");
}else if(dto.getDataType() == PreDealTypeEnum.friend_merge.getVal()){
dto.setDataName("合并处理");
}else if(dto.getDataType() == PreDealTypeEnum.self_friend.getVal()){
dto.setDataName("自建应用处理");
}
//dto.setReason(reason);
}
}
else{
List<PreDealLogInfoDTO> result = page.getResult(); List<PreDealLogInfoDTO> result = page.getResult();
for (PreDealLogInfoDTO dto : result) { for (PreDealLogInfoDTO dto : result) {
dto.setDataCode(dto.getDataId()); dto.setDataCode(dto.getDataId());
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
update_time update_time
</sql> </sql>
<sql id="Base_Column_List_data"> <sql id="Base_Column_List_data">
id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time, id, wx_enterprise_id,enterprise_id, data_id,data_content, p_data_id, task_id, data_type, status_flag, create_time,reason,
update_time update_time
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......
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