|
@@ -5,7 +5,9 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
|
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
|
import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
|
|
import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
|
|
import cn.com.ctop.alarm.modules.service.impl.RuleAccountTemplateServiceImpl;
|
|
import cn.com.ctop.alarm.modules.service.impl.RuleAccountTemplateServiceImpl;
|
|
|
|
+import cn.com.ctop.common.module.entity.SysLog;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
|
+import cn.com.ctop.common.module.mapper.SysLogMapper;
|
|
import cn.com.ctop.common.module.service.impl.UserAllocationServiceImpl;
|
|
import cn.com.ctop.common.module.service.impl.UserAllocationServiceImpl;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -14,7 +16,9 @@ import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementInfo;
|
|
import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementInfo;
|
|
import org.jeecg.ctop.finance.settlement.entity.vo.AccountImportVo;
|
|
import org.jeecg.ctop.finance.settlement.entity.vo.AccountImportVo;
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
|
|
@@ -32,10 +36,7 @@ import org.springframework.web.client.RestTemplate;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
-import java.util.Set;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -46,6 +47,10 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
|
|
private SettlementInfoMapper settlementInfoMapper;
|
|
private SettlementInfoMapper settlementInfoMapper;
|
|
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ SysLogMapper sysLogMapper;
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
*
|
|
*
|
|
* @description: 查询 财务结算-账户列表
|
|
* @description: 查询 财务结算-账户列表
|
|
@@ -86,9 +91,19 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
|
|
if (!Check.isNull(userAllocation)){
|
|
if (!Check.isNull(userAllocation)){
|
|
userAllocation.setAccountStatus(status);
|
|
userAllocation.setAccountStatus(status);
|
|
userAllocationService.editUserAlloCation(userAllocation);
|
|
userAllocationService.editUserAlloCation(userAllocation);
|
|
|
|
+ }else{
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ SysLog sysLog = new SysLog();
|
|
|
|
+ sysLog.setLogType(2);
|
|
|
|
+ sysLog.setLogContent("修改账户状态为==="+status);
|
|
|
|
+ sysLog.setRequestParam(String.valueOf(status));
|
|
|
|
+ sysLog.setOperateType(10001);
|
|
|
|
+ sysLog.setUserid(user.getId());
|
|
|
|
+ sysLog.setCreateBy(user.getRealname());
|
|
|
|
+ sysLog.setCreateTime(new Date());
|
|
|
|
+ sysLogMapper.insert(sysLog);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
return Result.successMsg("财务结算-修改账户状态成功", null);
|
|
return Result.successMsg("财务结算-修改账户状态成功", null);
|
|
}
|
|
}
|
|
|
|
|