diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java index dc35e2dd..8b5e60dd 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java @@ -71,4 +71,7 @@ public interface EmployeeControllerApi { @ApiOperation(value = "给用户赋予一个角色",notes = "给用户赋予一个角色") ResponseResult saveUserRole(Long userId,Long roleId); + + @ApiOperation(value = "根据用户id获取对应的员工名称", notes = "根据用户id获取对应的员工名称") + ResponseResult listEmpNameByUserId(Integer[] userIds); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index a21280cd..6fed3bc3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -171,8 +171,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page,@RequestParam(value="size",required=false) Integer size, @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){ //获取当前登录用户id - //String userId = getUserId(); - String userId ="9"; + String userId = getUserId(); //根据角色查询资产部调查列表 String roleIds = RedisUtil.get("dq:userRole:" + userId); @@ -202,8 +201,8 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA for (BusinessApplicationListResponse response:list) { for(LinkedHashMap res : employeeMessage){ if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 - response.setAccount(JSONObject.toJSONString(res.get("account"))); - response.setDeptName(JSONObject.toJSONString(res.get("deptName"))); + response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"","")); + response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"","")); } } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index ca470ccb..bfbd043e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -1,6 +1,7 @@ package com.daqing.financial.guarantee.controller; +import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationCheckRequest; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; @@ -56,9 +57,10 @@ public class DgComplianceInvestigationController { */ @PostMapping("/survey") @ApiOperation(value = "调查", notes = "调查") - public ResponseResult survey(@RequestParam("iid") Integer iid, @RequestParam("status") Integer status, - @RequestParam("fileUrl") String fileUrl, @RequestParam("opinion") String opinion) { - Boolean result = iDgComplianceInvestigationService.survey(iid, fileUrl, opinion, status); + public ResponseResult survey(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) { + Boolean result = iDgComplianceInvestigationService.survey(dgComplianceInvestigationCheckRequest.getIid(), + iDgComplianceInvestigationService.getFileUrl(dgComplianceInvestigationCheckRequest.getFileUrls()), + dgComplianceInvestigationCheckRequest.getOpinion(), dgComplianceInvestigationCheckRequest.getStatus()); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } @@ -67,9 +69,9 @@ public class DgComplianceInvestigationController { */ @ApiOperation(value = "审核", notes = "审核") @PostMapping("/check") - public ResponseResult check(@RequestParam("iid") Integer iid, @RequestParam("opinion") String opinion, - @RequestParam("status") Integer status) { - Boolean result = iDgComplianceInvestigationService.check(iid, opinion, status); + public ResponseResult check(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) { + Boolean result = iDgComplianceInvestigationService.check(dgComplianceInvestigationCheckRequest.getIid(), + dgComplianceInvestigationCheckRequest.getOpinion(), dgComplianceInvestigationCheckRequest.getStatus()); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java index e3f5e81e..07e778f6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java @@ -58,6 +58,9 @@ public interface HrmsFeignService { @PostMapping("hrms/employee/insertUsrRole") ResponseResult insertUsrRole(@RequestBody List list); + /** + * 根据用户id获取对应的员工名称 + */ @GetMapping("/hrms/employee/listEmpNameByUserId") ResponseResult> listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index 4320ee32..2b332c87 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderConsent; import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; import com.daqing.financial.guarantee.model.response.AuditOpinionResponse; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; @@ -30,7 +31,7 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper excelList(@Param("ids") List ids); - Boolean check(@Param("lr") DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest, @Param("userId") Integer userId, + Boolean check(@Param("lr") DgLoanCommitteeConsiderConsent dgLoanCommitteeConsiderConsent, @Param("userId") Integer userId, @Param("status") Integer status, @Param("operatingStatus") Integer operatingStatus, @Param("date") Date date); Boolean TheJudgesDrawn(@Param("businessId") Integer businessId, @Param("agreePerson") String agreePerson); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationCheckRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationCheckRequest.java new file mode 100644 index 00000000..d04f846a --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationCheckRequest.java @@ -0,0 +1,30 @@ +package com.daqing.financial.guarantee.model.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 合规调查调查和审核请求参数 + * + * @auther River + * @date 2020/12/2 14:21 + */ +@Data +@ToString +public class DgComplianceInvestigationCheckRequest implements Serializable { + + @ApiModelProperty("iid") + private Integer iid; + + @ApiModelProperty("调查/审核操作,1:同意,2:驳回,3:拒绝") + private Integer status; + + @ApiModelProperty("附件,审核没有") + private String[] fileUrls; + + @ApiModelProperty("调查/审核意见") + private String opinion; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderConsent.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderConsent.java new file mode 100644 index 00000000..0810ae4c --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderConsent.java @@ -0,0 +1,54 @@ +package com.daqing.financial.guarantee.model.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @auther River + * @date 2020/12/2 17:27 + */ +@Data +@ToString +public class DgLoanCommitteeConsiderConsent implements Serializable { + + @NotNull(message = "id不能为空") + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("议定事项") + private String agreedItems; + + @ApiModelProperty("附加事项") + private String additionalItems; + + @ApiModelProperty("贷款金额") + private Double loanMoney; + + @ApiModelProperty("贷款期限") + private String loanTern; + + @ApiModelProperty("同意") + private String agreePerson; + + @ApiModelProperty("不同意") + private String disagreePerson; + + @ApiModelProperty("附件") + private String fileUrl; + + @ApiModelProperty("操作,1:通过,2:拒绝,3:驳回") + private Integer status; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("贷审会通过时间") + private Date passingTime; + + @ApiModelProperty("拒绝/驳回意见") + private String refuseOpinion; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java index 88e57cf2..c61166a2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java @@ -42,7 +42,7 @@ public class DgLoanCommitteeConsiderRequest implements Serializable { private String disagreePerson; @ApiModelProperty("附件") - private String fileUrl; + private String[] fileUrls; @ApiModelProperty("操作,1:通过,2:拒绝,3:驳回") private Integer status; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java index ba7c1b19..338af416 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java @@ -23,7 +23,7 @@ public class DgComplianceInvestigationInfoResponse implements Serializable { private DgAssetsInvestigationResponse assetsResponse; @ApiModelProperty("合规调查的附件文件") - private String fileUrl; + private String[] fileUrls; @ApiModelProperty("合规调查的审核(调查)意见") private String opinion; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderInfoResponse.java new file mode 100644 index 00000000..f92b54b0 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderInfoResponse.java @@ -0,0 +1,65 @@ +package com.daqing.financial.guarantee.model.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 贷审会查看响应类 + * + * @auther River + * @date 2020/12/2 17:34 + */ +@Data +@ToString +public class DgLoanCommitteeConsiderInfoResponse implements Serializable { + /** + * 贷审会议定事项 + */ + @ApiModelProperty("贷审会议定事项") + private String agreedItems; + + /** + * 贷审会附加事项 + */ + @ApiModelProperty("贷审会附加事项") + private String additionalItems; + + /** + * 贷款金额（贷审会意见） + */ + @ApiModelProperty("贷款金额（贷审会意见）") + private Integer loanMoney; + + /** + * 贷款期限（贷审会意见） + */ + @ApiModelProperty("贷款期限（贷审会意见）") + private String loanTern; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @ApiModelProperty("贷审会时间") + private Date time; + + /** + * 同意（贷审委员） + */ + @ApiModelProperty("同意（贷审委员）") + private String agreePerson; + + /** + * 不同意（贷审委员） + */ + @ApiModelProperty("不同意（贷审委员）") + private String disagreePerson; + + /** + * 附件（会议记录） + */ + @ApiModelProperty("附件（会议记录）") + private String[] fileUrls; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java index 61537010..33b0647f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java @@ -30,4 +30,6 @@ public interface IDgComplianceInvestigationService extends IService ids); + + String getFileUrl(String[] fileUrls); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java index 6c7a0611..b4a2d12d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; +import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderInfoResponse; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.utils.PageUtils; @@ -24,7 +25,7 @@ public interface IDgLoanCommitteeConsiderService extends IService getJudges(Integer id); - DgLoanCommitteeConsider query(Integer id); + DgLoanCommitteeConsiderInfoResponse query(Integer id); Boolean excelExport(HttpServletResponse response, List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index 14cb63e5..bb71def0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -430,11 +430,16 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); System.out.println(responseResult.getData()); - // 将对应的userId转换为name - List workConferenceResponses = this.transitionUserName(dgWorkConferencePOS, responseResult.getData()); + List workConferenceResponses = new ArrayList<>(); + if (responseResult.getData() != null) { + // 将对应的userId转换为name + workConferenceResponses = this.transitionUserName(dgWorkConferencePOS, responseResult.getData()); + } else { + for (int i = 0; i < dgWorkConferencePOS.size(); i++) { + DgWorkConferenceResponse workConferenceResponse = new DgWorkConferenceResponse(); + BeanUtils.copyProperties(dgWorkConferencePOS.get(i),workConferenceResponse); + workConferenceResponses.add(workConferenceResponse); + } + } IPage iPage = new Page<>(); BeanUtils.copyProperties(list, iPage); iPage.setRecords(workConferenceResponses); @@ -261,21 +270,23 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); List employees = responseResult.getData(); - for (EmployeeVO employee : employees) { - if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())){ - auditOpinionResponse.setAName(employee.getName()); - } - if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())){ - auditOpinionResponse.setBName(employee.getName()); - } - if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())){ - auditOpinionResponse.setAssetName(employee.getName()); - } - if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())){ - auditOpinionResponse.setMessageName(employee.getName()); - } - if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())){ - auditOpinionResponse.setRegulationName(employee.getName()); + if (employees != null){ + for (EmployeeVO employee : employees) { + if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())) { + auditOpinionResponse.setAName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())) { + auditOpinionResponse.setBName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())) { + auditOpinionResponse.setAssetName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())) { + auditOpinionResponse.setMessageName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())) { + auditOpinionResponse.setRegulationName(employee.getName()); + } } } BeanUtils.copyProperties(auditOpinion, auditOpinionResponse); @@ -327,7 +338,16 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); System.out.println(responseResult.getData()); - List excelList = this.transitionUserName(list, responseResult.getData()); + List excelList = new ArrayList<>(); + if (responseResult.getData() != null) { + excelList = this.transitionUserName(list, responseResult.getData()); + }else { + for (DgWorkConferencePO dgWorkConferencePO : list) { + DgWorkConferenceResponse workConferenceResponse = new DgWorkConferenceResponse(); + BeanUtils.copyProperties(dgWorkConferencePO, workConferenceResponse); + excelList.add(workConferenceResponse); + } + } try { ExcelUtil.writeExcelWithSheets(response, excelList, "工作会数据一览表", "NO.1", new DgWorkConferenceResponse()) .finish(); diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml index e7f36a75..f0fba373 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -103,7 +103,7 @@ diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index 3e699eba..19215fbc 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -107,7 +107,7 @@ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java index d7e5d127..a467a4e0 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java @@ -102,8 +102,8 @@ public class DeptController implements DeptControllerApi { *所有部门及员工 */ @GetMapping("/trees") - public ResponseResult trees() { - return new ResponseResult>().SUCCESS(deptService.listDepartmentAndEmployeeTree()); + public ResponseResult trees(@RequestParam(value = "account", required = false) String account) { + return new ResponseResult>().SUCCESS(deptService.listDepartmentAndEmployeeTree(account)); } /** diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java index 7f6764fc..b194f832 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java @@ -32,7 +32,7 @@ public interface EmployeeDao extends BaseMapper { List listEmployeeByDeptId(Long id); - List employeeListByDeptId(Long id); + List employeeListByDeptId(@Param("id")Long id, @Param("account")String account); List listEmployeeByDeptIdAndEmpId(@Param("id") Long deptId, @Param("name") String name, @Param("empIds") List empIds); diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index 4008c287..86ef0979 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -26,9 +26,9 @@ public interface DeptService extends IService { boolean deleteByIds(Long[] ids); - List listDepartmentAndEmployeeTree(); + List listDepartmentAndEmployeeTree(String account); - List listDeptAndEmpTree(String name,List empIds); + //List listDeptAndEmpTree(String name,List empIds); DepartmentVO getDepartmentAndEmployee(Long id); diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index 8b053e4c..4b56c64b 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -165,21 +165,21 @@ public class DeptServiceImpl extends ServiceImpl implements * @return */ @Override - public List listDepartmentAndEmployeeTree() { - return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L); + public List listDepartmentAndEmployeeTree(String account) { + return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L, account); } - private List getListDepartmentAndEmployeeTree(List list, Long parentId) { + private List getListDepartmentAndEmployeeTree(List list, Long parentId, String account) { return list.stream() .filter(dept -> parentId.equals(dept.getParentId())) // 过滤出部门id为所选id的部门信息(也为递归的结果条件，找不到所对应的部门id) .peek(dept -> { - dept.setChildren(getListDepartmentAndEmployeeTree(list, dept.getId())); // 设置该部门的子部门:递归调用 + dept.setChildren(getListDepartmentAndEmployeeTree(list, dept.getId(), account)); // 设置该部门的子部门:递归调用 - List empList = employeeDao.employeeListByDeptId(dept.getId()); + List empList = employeeDao.employeeListByDeptId(dept.getId(),account); System.out.println("empList========================" + empList); - dept.setUserDept(employeeDao.employeeListByDeptId(dept.getId())); + dept.setUserDept(employeeDao.employeeListByDeptId(dept.getId(),account)); //dept.setEmployee(employeeDao.listEmployeeByDeptId(dept.getId())); // 设置该部门下面的所有员工 }) @@ -190,7 +190,7 @@ public class DeptServiceImpl extends ServiceImpl implements /** * 根据条件获取所有部门及部门下的员工信息 */ - @Override +/* @Override public List listDeptAndEmpTree(String name, List empIds) { return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L, name, empIds); @@ -205,7 +205,7 @@ public class DeptServiceImpl extends ServiceImpl implements }) .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 根据所选排序信息进行排序 .collect(Collectors.toList()); - } + }*/ /** * 获取该部门下子部门及部门下的员工 diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index 1d5eb909..3c71cd9f 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -223,6 +223,9 @@ WHERE u.del_or_not = 0 AND d.id = #{id} + + AND u.account LIKE CONCAT('%',#{account},'%') + GROUP BY u.id )alias where diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java index 8e151600..286ec025 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java @@ -1,6 +1,7 @@ package com.daqing.framework.domain.guarantee; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -73,6 +74,12 @@ public class DgLoanCommitteeConsider implements Serializable { */ private String loanTern; + /** + * 贷审会时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date time; + /** * 同意（贷审委员） */