Merge remote-tracking branch 'origin/master'

master
chen 4 years ago
commit 91bb30eacc
  1. 3
      dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java
  2. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
  3. 14
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java
  4. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java
  5. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java
  6. 30
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationCheckRequest.java
  7. 54
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderConsent.java
  8. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java
  9. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java
  10. 65
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderInfoResponse.java
  11. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java
  12. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java
  13. 28
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
  14. 27
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
  15. 34
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
  16. 2
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml
  17. 2
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
  18. 4
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java
  19. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java
  20. 4
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java
  21. 16
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java
  22. 3
      dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
  23. 7
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.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);
}

@ -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("\"",""));
}
}
}

@ -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();
}

@ -58,6 +58,9 @@ public interface HrmsFeignService {
@PostMapping("hrms/employee/insertUsrRole")
ResponseResult insertUsrRole(@RequestBody List<DgGuaranteePO> list);
/**
* 根据用户id获取对应的员工名称
*/
@GetMapping("/hrms/employee/listEmpNameByUserId")
ResponseResult<List<EmployeeVO>> listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds);
}

@ -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<DgLoanCommitte
List<DgLoanCommitteeConsiderResponse> excelList(@Param("ids") List<Integer> 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);

@ -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;
}

@ -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;
}

@ -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;

@ -23,7 +23,7 @@ public class DgComplianceInvestigationInfoResponse implements Serializable {
private DgAssetsInvestigationResponse assetsResponse;
@ApiModelProperty("合规调查的附件文件")
private String fileUrl;
private String[] fileUrls;
@ApiModelProperty("合规调查的审核(调查)意见")
private String opinion;

@ -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;
}

@ -30,4 +30,6 @@ public interface IDgComplianceInvestigationService extends IService<DgCompliance
DgComplianceInvestigationInfoResponse query(Integer iid);
Boolean excelExport(HttpServletResponse response, List<String> ids);
String getFileUrl(String[] fileUrls);
}

@ -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<DgLoanCommitte
List<String> getJudges(Integer id);
DgLoanCommitteeConsider query(Integer id);
DgLoanCommitteeConsiderInfoResponse query(Integer id);
Boolean excelExport(HttpServletResponse response, List<String> ids);
}

@ -430,11 +430,16 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
AssetsDetailResponse assetsDetailResponse = dgAssetsInvestigationService.assetsDetail(dgAssetsInvestigationId);
// 合规附件和意见
DgComplianceInvestigation dgComplianceInvestigation = this.getBaseMapper().queryDgComplianceInvestigation(iid);
if (dgComplianceInvestigation.getFile() != null) {
String[] fileUrls = dgComplianceInvestigation.getFile().split(",");
dgComplianceInvestigationInfoResponse.setFileUrls(fileUrls);
}
if (dgComplianceInvestigation.getOpinion() != null) {
dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
}
// 统一返回
dgComplianceInvestigationInfoResponse.setGuaranteeDetailResponse(guaranteeDetailResponse);
dgComplianceInvestigationInfoResponse.setAssetsResponse(assetsDetailResponse.getAssetsResponse());
dgComplianceInvestigationInfoResponse.setFileUrl(dgComplianceInvestigation.getFile());
dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
return dgComplianceInvestigationInfoResponse;
}
@ -461,6 +466,25 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
return false;
}
/**
* 将接收的数组图片拼装成字符串类型
*/
@Override
public String getFileUrl(String[] fileUrls) {
StringBuilder fileUrl = new StringBuilder();
if (null == fileUrls || fileUrls.length == 0) {
return fileUrl.toString();
}
for (int i = 0; i < fileUrls.length; i++) {
if (i == fileUrls.length - 1) {
fileUrl.append(fileUrls[i]);
} else {
fileUrl.append(fileUrls[i]).append(",");
}
}
return fileUrl.toString();
}
/**
* 获取当前登录用户信息

@ -1,10 +1,13 @@
package com.daqing.financial.guarantee.service.impl;
import ch.qos.logback.core.joran.util.beans.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderConsent;
import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest;
import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderInfoResponse;
import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService;
@ -20,6 +23,7 @@ import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.util.RedisUtil;
import com.daqing.framework.utils.PageUtils;
import com.daqing.framework.utils.excel.ExcelUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
@ -47,6 +51,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
@Autowired
private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
@Autowired
private DgComplianceInvestigationServiceImpl dgComplianceInvestigationService;
@Autowired
private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService;
@ -92,11 +99,15 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
if (dgLoanCommitteeConsiderRequest.getAdditionalItems() == null || dgLoanCommitteeConsiderRequest.getAdditionalItems().length() == 0
|| dgLoanCommitteeConsiderRequest.getAgreedItems() == null || dgLoanCommitteeConsiderRequest.getAgreedItems().length() == 0
|| dgLoanCommitteeConsiderRequest.getLoanMoney() == null || dgLoanCommitteeConsiderRequest.getLoanTern() == null
|| dgLoanCommitteeConsiderRequest.getLoanTern().length() == 0 || dgLoanCommitteeConsiderRequest.getFileUrl() == null
|| dgLoanCommitteeConsiderRequest.getFileUrl().length() == 0) {
|| dgLoanCommitteeConsiderRequest.getLoanTern().length() == 0 || dgLoanCommitteeConsiderRequest.getFileUrls() == null
|| dgLoanCommitteeConsiderRequest.getFileUrls().length == 0) {
ExceptionCast.cast(GuaranteeCode.LOAN_MESSAGE_NOT_NULL);
}
Boolean result = this.getBaseMapper().check(dgLoanCommitteeConsiderRequest, Integer.getInteger(userId), StatusCode.SP_REVIEWED, StatusCode.CZ_PROCESSED, new Date());
String fileUrl = dgComplianceInvestigationService.getFileUrl(dgLoanCommitteeConsiderRequest.getFileUrls());
DgLoanCommitteeConsiderConsent consent = new DgLoanCommitteeConsiderConsent();
BeanUtils.copyProperties(dgLoanCommitteeConsiderRequest, consent);
consent.setFileUrl(fileUrl);
Boolean result = this.getBaseMapper().check(consent, Integer.getInteger(userId), StatusCode.SP_REVIEWED, StatusCode.CZ_PROCESSED, new Date());
if (result) {
// 在担保函表中插入条数据
DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
@ -165,11 +176,17 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
* 查看
*/
@Override
public DgLoanCommitteeConsider query(Integer id) {
public DgLoanCommitteeConsiderInfoResponse query(Integer id) {
if (id == null) {
ExceptionCast.cast(CommonCode.INVALID_PARAM);
}
return this.getBaseMapper().query(id);
DgLoanCommitteeConsider dgLoanCommitteeConsider = this.getBaseMapper().query(id);
DgLoanCommitteeConsiderInfoResponse dgLoanCommitteeConsiderInfoResponse = new DgLoanCommitteeConsiderInfoResponse();
if (dgLoanCommitteeConsider.getFile() != null) {
dgLoanCommitteeConsiderInfoResponse.setFileUrls(dgLoanCommitteeConsider.getFile().split(","));
}
BeanUtils.copyProperties(dgLoanCommitteeConsider, dgLoanCommitteeConsiderInfoResponse);
return dgLoanCommitteeConsiderInfoResponse;
}
/**

@ -104,8 +104,17 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 根据userId获取对应的员工姓名
ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
System.out.println(responseResult.getData());
List<DgWorkConferenceResponse> workConferenceResponses = new ArrayList<>();
if (responseResult.getData() != null) {
// 将对应的userId转换为name
List<DgWorkConferenceResponse> workConferenceResponses = this.transitionUserName(dgWorkConferencePOS, responseResult.getData());
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<DgWorkConferenceResponse> iPage = new Page<>();
BeanUtils.copyProperties(list, iPage);
iPage.setRecords(workConferenceResponses);
@ -261,23 +270,25 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
userIds[4] = auditOpinion.getRegulationEmpId();
ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
List<EmployeeVO> employees = responseResult.getData();
if (employees != null){
for (EmployeeVO employee : employees) {
if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())){
if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())) {
auditOpinionResponse.setAName(employee.getName());
}
if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())){
if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())) {
auditOpinionResponse.setBName(employee.getName());
}
if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())){
if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())) {
auditOpinionResponse.setAssetName(employee.getName());
}
if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())){
if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())) {
auditOpinionResponse.setMessageName(employee.getName());
}
if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())){
if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())) {
auditOpinionResponse.setRegulationName(employee.getName());
}
}
}
BeanUtils.copyProperties(auditOpinion, auditOpinionResponse);
// 获取担保信息
Integer guaranteeId = dgComplianceInvestigationMapper.getGuaranteeId(businessId, PromptSuccess.DB_LD_ID);
@ -327,7 +338,16 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 根据userId获取对应的员工姓名
ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
System.out.println(responseResult.getData());
List<DgWorkConferenceResponse> excelList = this.transitionUserName(list, responseResult.getData());
List<DgWorkConferenceResponse> 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();

@ -103,7 +103,7 @@
<!-- 根据id查询合规调查表详情 -->
<select id="queryDgComplianceInvestigation" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.DgComplianceInvestigation">
SELECT file_url,opinion
SELECT file_url AS file,opinion AS opinion
FROM dg_compliance_investigation
WHERE id = #{iid}
</select>

@ -107,7 +107,7 @@
</select>
<select id="query" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider">
SELECT agreed_items,additional_items,loan_money,loan_tern,agree_person,disagree_person,file,passing_time,refuse_opinion
SELECT agreed_items,additional_items,loan_money,loan_tern,agree_person,disagree_person,file,passing_time AS time,refuse_opinion
FROM dg_loan_committee_consider
WHERE id = #{id}
</select>

@ -102,8 +102,8 @@ public class DeptController implements DeptControllerApi {
*所有部门及员工
*/
@GetMapping("/trees")
public ResponseResult trees() {
return new ResponseResult<List<DepartmentVO>>().SUCCESS(deptService.listDepartmentAndEmployeeTree());
public ResponseResult trees(@RequestParam(value = "account", required = false) String account) {
return new ResponseResult<List<DepartmentVO>>().SUCCESS(deptService.listDepartmentAndEmployeeTree(account));
}
/**

@ -32,7 +32,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
List<EmployeeVO> listEmployeeByDeptId(Long id);
List<UserDeptVO> employeeListByDeptId(Long id);
List<UserDeptVO> employeeListByDeptId(@Param("id")Long id, @Param("account")String account);
List<EmployeeVO> listEmployeeByDeptIdAndEmpId(@Param("id") Long deptId, @Param("name") String name, @Param("empIds") List<Long> empIds);

@ -26,9 +26,9 @@ public interface DeptService extends IService<DeptEntity> {
boolean deleteByIds(Long[] ids);
List<DepartmentVO> listDepartmentAndEmployeeTree();
List<DepartmentVO> listDepartmentAndEmployeeTree(String account);
List<DepartmentVO> listDeptAndEmpTree(String name,List<Long> empIds);
//List<DepartmentVO> listDeptAndEmpTree(String name,List<Long> empIds);
DepartmentVO getDepartmentAndEmployee(Long id);

@ -165,21 +165,21 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
* @return
*/
@Override
public List<DepartmentVO> listDepartmentAndEmployeeTree() {
return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L);
public List<DepartmentVO> listDepartmentAndEmployeeTree(String account) {
return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L, account);
}
private List<DepartmentVO> getListDepartmentAndEmployeeTree(List<DepartmentVO> list, Long parentId) {
private List<DepartmentVO> getListDepartmentAndEmployeeTree(List<DepartmentVO> 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<UserDeptVO> empList = employeeDao.employeeListByDeptId(dept.getId());
List<UserDeptVO> 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<DeptDao, DeptEntity> implements
/**
* 根据条件获取所有部门及部门下的员工信息
*/
@Override
/* @Override
public List<DepartmentVO> listDeptAndEmpTree(String name, List<Long> empIds) {
return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L, name, empIds);
@ -205,7 +205,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
})
.sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 根据所选排序信息进行排序
.collect(Collectors.toList());
}
}*/
/**
* 获取该部门下子部门及部门下的员工

@ -223,6 +223,9 @@
WHERE
u.del_or_not = 0
AND d.id = #{id}
<if test="account != null">
AND u.account LIKE CONCAT('%',#{account},'%')
</if>
GROUP BY u.id
)alias
where

@ -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;
/**
* 同意贷审委员
*/

Loading…
Cancel
Save