Commit 66820605 authored by wujipeng's avatar wujipeng
Browse files

新增用户优化

parent 5bf43d5e
...@@ -196,25 +196,35 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -196,25 +196,35 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
public Boolean add(UserDTO userDTO) { public Boolean add(UserDTO userDTO) {
//解析身份证号 //解析身份证号
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(userDTO.getIdCard()); Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(userDTO.getIdCard());
ExcelDataEntity excelDataEntity = new ExcelDataEntity();
if (MapUtil.isNotEmpty(idCardInfo)) { if (MapUtil.isNotEmpty(idCardInfo)) {
userDTO.setAge(Integer.parseInt(idCardInfo.get("age"))); userDTO.setAge(Integer.parseInt(idCardInfo.get("age")));
userDTO.setSex(idCardInfo.get("sex")); userDTO.setSex(idCardInfo.get("sex"));
userDTO.setIdCard(idCardInfo.get("idCard"));
userDTO.setUserName(userDTO.getUserName() + idCardInfo.get("idCard"));
userDTO.setIdType("身份证"); userDTO.setIdType("身份证");
excelDataEntity.setPayUserName(userDTO.getUserName() + idCardInfo.get("idCard"));
}else {
excelDataEntity.setPayUserName(userDTO.getUserName());
} }
excelDataEntity.setCaseId(userDTO.getCaseId());
//添加节点数据
excelDataService.save(excelDataEntity);
userDTO.setType("1"); userDTO.setType("1");
return save(userDTO); return save(userDTO);
} }
@Override @Override
public List<ExcelDataEntity> cashFlow(UserDTO userDTO) { public List<ExcelDataEntity> cashFlow(UserDTO userDTO) {
List<ExcelDataEntity> excelDataList = null; // List<ExcelDataEntity> excelDataList = null;
if ("1".equals(userDTO.getIdentifier())) { // if ("1".equals(userDTO.getIdentifier())) {
excelDataList = excelDataService.cashFlow(userDTO); // excelDataList = excelDataService.cashFlow(userDTO);
} else if ("2".equals(userDTO.getIdentifier())) { // } else if ("2".equals(userDTO.getIdentifier())) {
excelDataList = excelDataService.accountCashFlow(userDTO); // excelDataList = excelDataService.accountCashFlow(userDTO);
} else { // } else {
return null; // return null;
} // }
List<ExcelDataEntity> excelDataList = excelDataService.cashFlow(userDTO);
for (ExcelDataEntity excelDataEntity : excelDataList) { for (ExcelDataEntity excelDataEntity : excelDataList) {
if ("出账".equals(excelDataEntity.getDirection())) { if ("出账".equals(excelDataEntity.getDirection())) {
excelDataEntity.setSelfAccount(excelDataEntity.getPayAccount()); excelDataEntity.setSelfAccount(excelDataEntity.getPayAccount());
......
...@@ -119,33 +119,29 @@ ...@@ -119,33 +119,29 @@
directory_id, directory_id,
type, type,
direction, direction,
time, time,
amount, amount,
serial, serial,
payee_bank_card, payee_bank_card,
payee_account, payee_account,
payee_merchant, payee_merchant,
payee_name, payee_name,
payment_bank_name, payment_bank_name,
payment_bank_card, payment_bank_card,
payment_account, payment_account,
ip, ip,
mac, mac,
external_channel, external_channel,
pay_account, pay_account,
remark, remark,
case_id, case_id,
pay_user_name, pay_user_name,
use_flag, use_flag,
file_id file_id
from excel_data from excel_data
where case_id = #{caseId} where case_id = #{caseId}
and pay_user_name = #{userName} and (pay_user_name = #{userName} or payee_name = #{userName})
and ( and (payee_account = #{otherUserName} or payment_account = #{otherUserName})
payee_account = #{otherUserName}
or
payment_account = #{otherUserName}
)
</select> </select>
<select id="relationPage" resultType="com.platform.model.entity.ExcelDataEntity"> <select id="relationPage" resultType="com.platform.model.entity.ExcelDataEntity">
SELECT amount, time, payee_account, payment_account SELECT amount, time, payee_account, payment_account
......
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