diff --git a/src/main/java/com/sqx/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/com/sqx/modules/apply/service/impl/ApplyServiceImpl.java index 10b21fa..e2b519e 100644 --- a/src/main/java/com/sqx/modules/apply/service/impl/ApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/apply/service/impl/ApplyServiceImpl.java @@ -83,7 +83,7 @@ public class ApplyServiceImpl extends ServiceImpl implements Ap if(status==1){ user.setIsAgency(1); apply.setStatus(2); - apply.setApplyContent("通过"); + apply.setAuditContent("通过"); userService.updateById(user); }else{ apply.setStatus(3); diff --git a/src/main/java/com/sqx/modules/risk/controller/RiskController.java b/src/main/java/com/sqx/modules/risk/controller/RiskController.java index 5dc8c8c..336a8f5 100644 --- a/src/main/java/com/sqx/modules/risk/controller/RiskController.java +++ b/src/main/java/com/sqx/modules/risk/controller/RiskController.java @@ -31,6 +31,12 @@ public class RiskController { return riskService.selectRiskList(page, limit, userName, phone, riskType); } + @GetMapping("/selectRiskListByUserId") + @ApiOperation("查询单人风险列表") + public Result selectRiskListByUserId(Integer userId){ + return riskService.selectRiskListByUserId(userId); + } + @GetMapping("/selectRiskGroupList") @ApiOperation("查询风险列表分组") public Result selectRiskGroupList(Integer page,Integer limit, String userName, String phone, Integer riskSort){ diff --git a/src/main/java/com/sqx/modules/risk/dao/RiskDao.java b/src/main/java/com/sqx/modules/risk/dao/RiskDao.java index 560550e..c837f8e 100644 --- a/src/main/java/com/sqx/modules/risk/dao/RiskDao.java +++ b/src/main/java/com/sqx/modules/risk/dao/RiskDao.java @@ -14,6 +14,8 @@ public interface RiskDao extends BaseMapper { IPage selectRiskList(Page page,String userName,String phone,Integer riskType); + IPage selectRiskListByUserId(Page page,Integer userId); + IPage> selectRiskGroupList(Page> page, String userName, String phone,Integer riskSort); } diff --git a/src/main/java/com/sqx/modules/risk/service/RiskService.java b/src/main/java/com/sqx/modules/risk/service/RiskService.java index f65d2d7..5cdc8cc 100644 --- a/src/main/java/com/sqx/modules/risk/service/RiskService.java +++ b/src/main/java/com/sqx/modules/risk/service/RiskService.java @@ -10,6 +10,8 @@ public interface RiskService extends IService { Result selectRiskList(Integer page,Integer limit, String userName, String phone, Integer riskType); + Result selectRiskListByUserId(Integer userId); + Result selectRiskGroupList(Integer page,Integer limit, String userName, String phone, Integer riskSort); } diff --git a/src/main/java/com/sqx/modules/risk/service/impl/RiskServiceImpl.java b/src/main/java/com/sqx/modules/risk/service/impl/RiskServiceImpl.java index 071c59e..b30b143 100644 --- a/src/main/java/com/sqx/modules/risk/service/impl/RiskServiceImpl.java +++ b/src/main/java/com/sqx/modules/risk/service/impl/RiskServiceImpl.java @@ -33,6 +33,15 @@ public class RiskServiceImpl extends ServiceImpl implements RiskS return Result.success().put("data",new PageUtils(riskIPage)); } + @Override + public Result selectRiskListByUserId(Integer userId){ + IPage riskIPage = baseMapper.selectRiskListByUserId(new Page<>(1, -1),userId); + List records = riskIPage.getRecords(); + for(Risk risk:records){ + risk.setUser(userService.getById(risk.getUserId())); + } + return Result.success().put("data",new PageUtils(riskIPage)); + } @Override public Result selectRiskGroupList(Integer page,Integer limit, String userName, String phone, Integer riskSort){ @@ -49,4 +58,4 @@ public class RiskServiceImpl extends ServiceImpl implements RiskS -} \ No newline at end of file +} diff --git a/src/main/resources/mapper/risk/RiskDao.xml b/src/main/resources/mapper/risk/RiskDao.xml index dea8a94..13cb065 100644 --- a/src/main/resources/mapper/risk/RiskDao.xml +++ b/src/main/resources/mapper/risk/RiskDao.xml @@ -19,6 +19,16 @@ order by r.create_time desc + + - \ No newline at end of file +