Merge remote-tracking branch 'origin/master'

master
shijie 4 years ago
commit 0c8daba13d
  1. 11
      dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgStatisticsControllerApi.java
  2. 37
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java
  3. 15
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
  4. 45
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
  5. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
  6. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
  7. 5
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java
  8. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java
  9. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java
  10. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java
  11. 24
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java
  12. 42
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyPersonRequest.java
  13. 43
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgEfficiencyTeamRequest.java
  14. 25
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterRequest.java
  15. 54
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java
  16. 56
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterResponse.java
  17. 9
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java
  18. 12
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
  19. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java
  20. 73
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
  21. 14
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
  22. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
  23. 38
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml
  24. 65
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml
  25. 1
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml
  26. 12
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml
  27. 2
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml
  28. 3
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java
  29. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java
  30. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java
  31. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java
  32. 7
      dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml
  33. 4
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeLetterAssignUser.java
  34. 50
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java
  35. 57
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyPersonPO.java
  36. 7
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgEfficiencyTeamPO.java
  37. 3
      dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeVO.java
  38. 2
      dq-framework-utils/pom.xml
  39. 21
      dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/EasyExcelUtil.java
  40. 72
      dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/StatusConverter.java

@ -1,11 +0,0 @@
package com.daqing.financial.guarantee;
import io.swagger.annotations.Api;
/**
* @auther River
* @date 2020/11/5 14:29
*/
@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法")
public interface DgStatisticsControllerApi {
}

@ -1,9 +1,14 @@
package com.daqing.financial.guarantee.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest;
import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse;
import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* <p>
@ -14,7 +19,31 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2020-11-05
*/
@RestController
@RequestMapping("/dg-compliance-investigation")
@RequestMapping("/compliance/investigation")
@Api(value = "合规调查",tags = "合规调查")
public class DgComplianceInvestigationController {
@Autowired
private IDgComplianceInvestigationService iDgComplianceInvestigationService;
/**
* 列表
*/
@GetMapping("/list")
@ApiOperation(value = "合规调查列表",notes = "合规调查列表",response = DgComplianceInvestigationResponse.class)
public ResponseResult list(@RequestParam("page") Integer page,
@RequestParam("size") Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest) {
return ResponseResult.SUCCESS(iDgComplianceInvestigationService.list(page,size,dgComplianceInvestigationRequest));
}
/**
* 调查同意
*/
@PostMapping("/surveyConsent")
@ApiOperation(value = "调查同意",notes = "调查同意")
public ResponseResult surveyConsent(@RequestParam("iid") Integer iid,
@RequestParam("fileUrl") String fileUrl,@RequestParam("auditOpinion") String auditOpinion) {
Boolean result = iDgComplianceInvestigationService.surveyConsent(iid, fileUrl, auditOpinion);
return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
}
}

@ -0,0 +1,15 @@
package com.daqing.financial.guarantee.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 流程效率
*
* @auther River
* @date 2020/11/5 14:20
*/
@RestController
@RequestMapping("/guarantee/efficiency")
public class DgEfficiencyController {
}

@ -1,10 +1,18 @@
package com.daqing.financial.guarantee.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterRequest;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
;
/**
* <p>
@ -14,8 +22,39 @@ import org.springframework.web.bind.annotation.RestController;
* @author Qyq
* @since 2020-11-12
*/
@Api(tags = {"担保函记录"})
@RestController
@RequestMapping("/dg-guarantee-letter-assign-user")
public class DgGuaranteeLetterAssignUserController {
@Autowired
private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService;
@ApiOperation(value = "担保函记录列表")
@GetMapping("/guaranteeLetterList")
public ResponseResult guaranteeLetterList(
@ApiParam(name = "page", value = "当前页码,默认为第一页", required = false)
@RequestParam(value="page",required=false) Integer page,
@ApiParam(name = "size", value = "每页记录数,默认显示10条", required = false)
@RequestParam(value="size",required=false) Integer size,
@ApiParam(name = "customerNumberOrName", value = "业务编号/客户名称", required = false)
@RequestParam(value = "customerNumberOrName", required = false) String customerNumberOrName,
@ApiParam(name = "status", value = "流程状态:1->审核中、2->拒绝、3->已审核", required = false)
@RequestParam(value = "status", required = false) Integer status){
PageUtils data = guaranteeLetterAssignUserService.queryPage(page,size,customerNumberOrName,status);
return new ResponseResult<PageUtils>().SUCCESS(data);
}
@ApiOperation(value = "导出全部数据")
@GetMapping("/excelExport")
public void excelExport(
@ApiParam(name = "", value = "", required = true)
HttpServletResponse response){
// try {
// guaranteeLetterAssignUserService.export(response,contestId);
// } catch (IOException e) {
// e.printStackTrace();
// }
}
}

@ -1,6 +1,10 @@
package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
import com.daqing.financial.guarantee.service.impl.DgLoanNoticeServiceImpl;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -13,8 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
* @author Qyq
* @since 2020-11-05
*/
@Api(tags = {"放款通知"})
@RestController
@RequestMapping("/dg-loan-notice")
public class DgLoanNoticeController {
@Autowired
private IDgLoanNoticeService iDgLoanNoticeService;
}

@ -1,6 +1,9 @@
package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -13,8 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
* @author Qyq
* @since 2020-11-05
*/
@Api(tags = {"回款确认"})
@RestController
@RequestMapping("/dg-payment-confirmation-consider")
public class DgPaymentConfirmationConsiderController {
@Autowired
private IDgPaymentConfirmationConsiderService iDgPaymentConfirmationConsiderService;
}

@ -1,11 +1,11 @@
package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.DgStatisticsControllerApi;
import com.daqing.financial.guarantee.model.request.DgStatisticsRequest;
import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse;
import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse;
import com.daqing.financial.guarantee.service.IDgStatisticsService;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -23,7 +23,8 @@ import javax.servlet.http.HttpServletResponse;
*/
@RestController
@RequestMapping("/guarantee/statistics")
public class DgStatisticsController implements DgStatisticsControllerApi {
@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法")
public class DgStatisticsController {
@Autowired
private IDgStatisticsService iDgStatisticsService;

@ -1,8 +1,15 @@
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.DgComplianceInvestigationRequest;
import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse;
import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
/**
* <p>
@ -15,4 +22,15 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DgComplianceInvestigationMapper extends BaseMapper<DgComplianceInvestigation> {
IPage<DgComplianceInvestigationResponse> list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest);
Boolean surveyConsent(@Param("iid") Integer iid, @Param("fileUrl") String fileUrl,
@Param("auditOpinion") String auditOpinion, @Param("date")Date date,
@Param("empId") Integer empId);
Boolean surveyReturn(@Param("iid") Integer iid,@Param("auditOpinion") String auditOpinion,
@Param("empId") Integer empId,@Param("date") Date date);
Boolean surveyRefuse(@Param("iid") Integer iid,@Param("auditOpinion") String auditOpinion,
@Param("empId")Integer empId,@Param("date") Date date);
}

@ -0,0 +1,18 @@
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.DgEfficiencyPersonRequest;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
import com.daqing.framework.domain.guarantee.po.DgEfficiencyPersonPO;
import org.apache.ibatis.annotations.Param;
/**
* @auther River
* @date 2020/11/10 11:30
*/
public interface DgEfficiencyMapper extends BaseMapper<DgApplyAmountInfo> {
IPage<DgEfficiencyPersonPO> personList(Page page, @Param("pr")DgEfficiencyPersonRequest dgEfficiencyPersonRequest);
}

@ -1,8 +1,13 @@
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.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.model.response.GuaranteeLetterResponse;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@ -15,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper<DgGuaranteeLetterAssignUser> {
IPage<GuaranteeLetterResponse> pageByCondition(Page page, @Param("customerNumberOrName")String customerNumberOrName,@Param("status")Integer status);
}

@ -0,0 +1,24 @@
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/11/11 16:16
*/
@Data
@ToString
public class DgComplianceInvestigationRequest implements Serializable {
@ApiModelProperty("流程状态,0:驳回,1:审批中")
private Integer status;
@ApiModelProperty("业务编号或者客户名称")
private String codeOrName;
}

@ -0,0 +1,42 @@
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 java.io.Serializable;
import java.util.Date;
/**
* 业务效率个人请求参数
*
* @auther River
* @date 2020/11/11 10:39
*/
@Data
@ToString
public class DgEfficiencyPersonRequest implements Serializable {
@ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年")
private Integer createFixedTime;
@ApiModelProperty("申请时间,自定义时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createCustomTime;
@ApiModelProperty("流程状态,0->我发起,1->待审批,2->已审批,3->抄送我")
private Integer flowStatus;
@ApiModelProperty("提单人或者客户名称")
private String empOrName;
@ApiModelProperty("操作人id")
private Integer personId;
@ApiModelProperty("辅助字段,不用管,起始时间")
private String startTime;
@ApiModelProperty("辅助字段,不用管,结束时间")
private String endTime;
}

@ -0,0 +1,43 @@
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 java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 业务效率团队请求参数
*
* @auther River
* @date 2020/11/10 16:00
*/
@Data
@ToString
public class DgEfficiencyTeamRequest implements Serializable {
@ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年")
private Integer createFixedTime;
@ApiModelProperty("申请时间,自定义时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createCustomTime;
@ApiModelProperty("流程状态,1->审核中,2->已审核,3->拒绝,4->驳回,5->撤销")
private Integer flowStatus;
@ApiModelProperty("提单人或者客户名称")
private String empOrName;
@ApiModelProperty("该团队(部门)下所有提单人(员工)")
private List<Integer> empIds;
@ApiModelProperty("辅助字段,不用管,起始时间")
private String startTime;
@ApiModelProperty("辅助字段,不用管,结束时间")
private String endTime;
}

@ -0,0 +1,25 @@
package com.daqing.financial.guarantee.model.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author chen
* @DATE 2020/11/12 17:14
* @Version 1.0
*/
@Data
public class GuaranteeLetterRequest {
@ApiModelProperty(value = "当前页码,默认为第一页")
private Integer page = 1;
@ApiModelProperty(value = "每页记录数,默认显示10条")
private Integer size = 10;
@ApiModelProperty(value = "流程状态:1->审核中、2->拒绝、3->已审核")
private Integer status;
@ApiModelProperty(value = "业务编号/客户名称")
private String CustomerNumberOrName;
}

@ -0,0 +1,54 @@
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/11/11 16:22
*/
@Data
@ToString
public class DgComplianceInvestigationResponse implements Serializable {
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("业务编号")
private String businessCode;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("业务类别")
private String businessType;
@ApiModelProperty("金额")
private Double applyAmount;
@ApiModelProperty("期限")
private String applyTime;
@ApiModelProperty("申请日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("当前审批人")
private String empName;
@ApiModelProperty("状态,0:,1:,2:,3:,4:")
private Integer status;
@ApiModelProperty("合规调查表id")
private Integer iId;
}

@ -0,0 +1,56 @@
package com.daqing.financial.guarantee.model.response;
import com.alibaba.excel.annotation.ExcelProperty;
import com.daqing.framework.utils.excel.StatusConverter;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author chen
* @DATE 2020/11/12 17:36
* @Version 1.0
*/
@Data
public class GuaranteeLetterResponse {
@ApiModelProperty("业务编号")
@ExcelProperty(value = "业务编号",index = 0)
private String businessCode;
@ApiModelProperty("客户名称")
@ExcelProperty(value = "客户名称",index = 1)
private String name;
@ApiModelProperty("联系电话")
@ExcelProperty(value = "联系电话",index = 2)
private String phone;
@ApiModelProperty("业务类别")
@ExcelProperty(value = "业务类别",index = 3)
private String businessType;
@ApiModelProperty("金额")
@ExcelProperty(value = "金额",index = 4)
private Double applyAmount;
@ApiModelProperty("期限")
@ExcelProperty(value = "期数",index = 5)
private String applyTime;
@ApiModelProperty("申请日期")
@ExcelProperty(value = "申请日期",index = 6)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("当前审批人")
@ExcelProperty(value = "当前审批人",index = 7)
private String empName;
@ApiModelProperty("状态")
@ExcelProperty(value = "状态",index = 8,converter = StatusConverter.class)
private Integer status;
}

@ -1,7 +1,9 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest;
import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
import com.daqing.framework.utils.PageUtils;
/**
* <p>
@ -13,4 +15,11 @@ import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
*/
public interface IDgComplianceInvestigationService extends IService<DgComplianceInvestigation> {
PageUtils list(Integer page, Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest);
Boolean surveyConsent(Integer iid, String fileUrl, String auditOpinion);
Boolean surveyReturn(Integer iid,String auditOpinion);
Boolean surveyRefuse(Integer iid,String auditOpinion);
}

@ -0,0 +1,12 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
/**
* @auther River
* @date 2020/11/10 11:33
*/
public interface IDgEfficiencyService extends IService<DgApplyAmountInfo> {
}

@ -1,7 +1,9 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterRequest;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.utils.PageUtils;
/**
* <p>
@ -13,4 +15,5 @@ import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
*/
public interface IDgGuaranteeLetterAssignUserService extends IService<DgGuaranteeLetterAssignUser> {
PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status);
}

@ -1,11 +1,21 @@
package com.daqing.financial.guarantee.service.impl;
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.model.request.DgComplianceInvestigationRequest;
import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse;
import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
import com.daqing.framework.domain.guarantee.GuaranteeCode;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.response.CommonCode;
import com.daqing.framework.utils.PageUtils;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
* <p>
* 合规调查 服务实现类
@ -15,6 +25,67 @@ import org.springframework.stereotype.Service;
* @since 2020-11-05
*/
@Service
public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplianceInvestigationMapper, DgComplianceInvestigation> implements IDgComplianceInvestigationService {
public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplianceInvestigationMapper, DgComplianceInvestigation>
implements IDgComplianceInvestigationService {
/**
* 列表
*/
@Override
public PageUtils list(Integer page, Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest) {
if (page == null || size == null){
page = 1;
size = 10;
}
IPage<DgComplianceInvestigationResponse> list = this.getBaseMapper().list(new Page(page, size), dgComplianceInvestigationRequest);
return new PageUtils(list);
}
/**
* 调查同意
*/
@Override
public Boolean surveyConsent(Integer iid, String fileUrl, String auditOpinion) {
if (iid == null || fileUrl == null || fileUrl.length() == 0){
ExceptionCast.cast(CommonCode.INVALID_PARAM);
}
// 获取登录用户id
Integer userId = 1;
return this.getBaseMapper().surveyConsent(iid, fileUrl, auditOpinion, new Date(), userId);
}
/**
* 调查驳回
*/
@Override
public Boolean surveyReturn(Integer iid, String auditOpinion) {
if (iid == null){
ExceptionCast.cast(CommonCode.INVALID_PARAM);
}
if (auditOpinion == null || auditOpinion.length() == 0){
ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
}
// 获取登录用户id
Integer userId = 1;
// TODO 驳回至资产调查指派A/B角
return this.getBaseMapper().surveyReturn(iid,auditOpinion,userId,new Date());
}
/**
* 调查拒绝
*/
@Override
public Boolean surveyRefuse(Integer iid, String auditOpinion) {
if (iid == null){
ExceptionCast.cast(CommonCode.INVALID_PARAM);
}
if (auditOpinion == null || auditOpinion.length() == 0){
ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
}
// 获取登录用户id
Integer userId = 1;
// TODO 直接拒接至初始状态
return this.getBaseMapper().surveyRefuse(iid,auditOpinion,userId,new Date());
}
}

@ -0,0 +1,14 @@
package com.daqing.financial.guarantee.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.financial.guarantee.mapper.DgEfficiencyMapper;
import com.daqing.financial.guarantee.service.IDgEfficiencyService;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
/**
* @auther River
* @date 2020/11/10 11:34
*/
public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgApplyAmountInfo> implements IDgEfficiencyService {
}

@ -1,9 +1,15 @@
package com.daqing.financial.guarantee.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.daqing.financial.guarantee.mapper.DgGuaranteeLetterAssignUserMapper;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterRequest;
import com.daqing.financial.guarantee.model.response.GuaranteeLetterResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.utils.PageUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
/**
@ -16,5 +22,15 @@ import org.springframework.stereotype.Service;
*/
@Service
public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaranteeLetterAssignUserMapper, DgGuaranteeLetterAssignUser> implements IDgGuaranteeLetterAssignUserService {
@Override
public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, Integer status) {
if (page==null){
page=1;
}
if (size==null){
size=10;
}
IPage<GuaranteeLetterResponse> guaranteeLetterVO = baseMapper.pageByCondition(new Page(page, size), customerNumberOrName, status);
return new PageUtils(guaranteeLetterVO);
}
}

@ -14,4 +14,42 @@
<result column="update_time" property="updateTime" />
</resultMap>
<select id="list" parameterType="com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest" resultType="com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse">
SELECT a.id AS id,a.business_code AS business_code,a.business_type AS business_type,a.apply_amount AS apply_amount,
a.apply_time AS apply_time,a.create_time AS create_time,c.name AS name,c.phone AS phone,p.emp_name AS emp_name,
i.status AS status,i.id AS iid
FROM dg_apply_amount_info AS a
LEFT JOIN dg_audit_process AS p
ON a.id = p.apply_amount_info_id
LEFT JOIN crms_customer AS c
ON a.company_id = c.id
LEFT JOIN dg_compliance_investigation AS i
ON a.id = i.business_id
WHERE c.del_or_not = 0
<if test="cr.status != null and cr.status != ''">
AND i.status = #{cr.status}
</if>
<if test="cr.codeOrName != null and cr.codeOrName != ''">
AND (a.business_code LIKE CONCAT('%',#{cr.codeOrName},'%') OR c.name LIKE CONCAT('%',#{cr.codeOrName},'%'))
</if>
ORDER BY a.create_time DESC
</select>
<!-- 调查同意 -->
<update id="surveyConsent">
UPDATE dg_compliance_investigation SET emp_id = #{empId},file = #{fileUrl},remark = #{auditOpinion},status = 2,update_time = #{date}
WHERE id = #{iid}
</update>
<!-- 调查驳回 -->
<update id="surveyReturn">
UPDATE dg_compliance_investigation SET emp_id = #{empId},remark = #{auditOpinion},status = 3,update_time = #{date}
WHERE id = #{iid}
</update>
<!-- 调查拒绝 -->
<update id="surveyRefuse">
UPDATE dg_compliance_investigation SET emp_id = #{empId},remark = #{auditOpinion},status = 4,update_time = #{date}
WHERE id = #{iid}
</update>
</mapper>

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.daqing.financial.guarantee.mapper.DgEfficiencyMapper">
<resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgApplyAmountInfo">
<id column="id" property="id" />
<result column="company_id" property="companyId" />
<result column="presenter_id" property="presenterId" />
<result column="apply_amount" property="applyAmount" />
<result column="apply_time" property="applyTime" />
<result column="bank" property="bank" />
<result column="amount_wide" property="amountWide" />
<result column="en_guarantee_measures" property="enGuaranteeMeasures" />
<result column="business_type" property="businessType" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
<select id="teamList" parameterType="com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest" resultType="com.daqing.framework.domain.guarantee.po.DgEfficiencyTeamPO">
SELECT c.id AS id,c.name AS name,a.presenter_id AS presenter_id,a.create_time AS create_time,a.,p.emp_name AS emp_name,
p.status AS status,p.date_time AS date_time
FROM dg_apply_amount_info AS a
LEFT JOIN (SELECT apply_amount_info_id,emp_name,status,date_time FROM dg_audit_process WHERE (apply_amount_info_id,date_time) IN
(SELECT apply_amount_info_id,MAX(date_time) FROM dg_audit_process GROUP BY apply_amount_info_id)) AS p
ON a.id = p.apply_amount_info_id
LEFT JOIN crms_customer AS c
ON a.company_id = c.id
WHERE c.del_or_not = 0
</select>
<select id="personList" parameterType="com.daqing.financial.guarantee.model.request.DgEfficiencyPersonRequest" resultType="com.daqing.framework.domain.guarantee.po.DgEfficiencyPersonPO">
SELECT c.id AS id,c.name AS name,a.presenter_id AS presenter_id,a.create_time AS create_time,a.status AS flow_status,
p.emp_name AS emp_name,p.status AS status,p.date_time AS date_time
FROM dg_apply_amount_info AS a
LEFT JOIN (SELECT apply_amount_info_id,emp_name,status,date_time,emp_id FROM dg_audit_process WHERE (apply_amount_info_id,date_time) IN
(SELECT apply_amount_info_id,MAX(date_time) FROM dg_audit_process GROUP BY apply_amount_info_id)) AS p
ON a.id = p.apply_amount_info_id
LEFT JOIN crms_customer AS c
ON a.company_id = c.id
WHERE c.del_or_not = 0
<if test="pr.flowStatus == null">
AND (
a.presenter_id = #{pr.personId}
OR
p.emp_id = #{pr.personId}
)
</if>
<if test="pr.flowStatus == 0">
AND a.presenter_id = #{pr.personId}
</if>
<if test="pr.flowStatus == 1">
AND p.emp_id = #{pr.personId}
</if>
<if test="pr.empOrName != null and pr.empOrName != ''">
AND c.name LIKE CONCAT('%',#{sr.empOrName},'%')
</if>
<if test="pr.startTime != null and pr.startTime != ''">
AND a.create_time &gt;= #{pr.startTime}
</if>
<if test="pr.endTime != null and pr.endTime != ''">
AND a.create_time &lt;= #{pr.endTime}
</if>
ORDER BY a.create_time DESC
</select>
</mapper>

@ -18,5 +18,4 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
</mapper>

@ -12,5 +12,17 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
<select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.GuaranteeLetterResponse">
select ai.id,ai.company_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,ai.create_time,
ai.status,cc.name,cc.phone
from dg_apply_amount_info ai
left join crms_company_customer ccl on ai.company_id = ccl.id
left join crms_customer cc on cc.id = ccl.customer_id
<where>
<if test="CustomerNumberOrName != null and CustomerNumberOrName != ''">
AND ai.business_code LIKE CONCAT('%',#{CustomerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{CustomerNumberOrName},'%')
</if>
</where>
</select>
</mapper>

@ -16,6 +16,7 @@
<result column="update_time" property="updateTime" />
</resultMap>
<!-- 业务统计列表 -->
<select id="list" parameterType="com.daqing.financial.guarantee.model.request.DgStatisticsRequest" resultType="com.daqing.framework.domain.guarantee.po.DgStatisticsPO">
SELECT c.name AS name,c.phone AS phone,a.presenter_id AS presenter_id,a.apply_amount AS apply_amount,a.apply_time AS apply_time,
a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,p.emp_name AS emp_name,
@ -42,6 +43,7 @@
ORDER BY a.create_time DESC
</select>
<!-- 业务统计拒绝列表 -->
<select id="listRefuse" parameterType="com.daqing.financial.guarantee.model.request.DgStatisticsRequest" resultType="com.daqing.framework.domain.guarantee.po.DgStatisticsRefusePO">
SELECT c.name AS name,c.phone AS phone,a.presenter_id AS presenter_id,a.apply_amount AS apply_amount,a.apply_time AS apply_time,
a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,p.emp_name AS emp_name,

@ -132,8 +132,7 @@ public class DeptController implements DeptControllerApi {
@GetMapping("/listEmployeeById")
public ResponseResult listEmployeeById(@RequestParam("id") Long id){
return new ResponseResult<List<EmployeeEntity>>().SUCCESS(deptService.listEmployeeById(id));
return ResponseResult.SUCCESS(deptService.listEmployeeById(id));
}
}

@ -31,7 +31,7 @@ public interface DeptDao extends BaseMapper<DeptEntity> {
List<DepartmentVO> listDepartmentIdAndName();
List<EmployeeEntity> listEmployeeById(Long id);
List<EmployeeVO> listEmployeeById(Long id);
List<EmployeeVO> listEmployeeByDeptId(Long deptId);
}

@ -30,7 +30,7 @@ public interface DeptService extends IService<DeptEntity> {
DepartmentVO getDepartmentAndEmployee(Long id);
List<EmployeeEntity> listEmployeeById(Long id);
List<EmployeeVO> listEmployeeById(Long id);
List<EmployeeVO> listEmployeeByDeptId(Long deptId);
}

@ -202,7 +202,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
* @return
*/
@Override
public List<EmployeeEntity> listEmployeeById(Long id) {
public List<EmployeeVO> listEmployeeById(Long id) {
return this.getBaseMapper().listEmployeeById(id);
}

@ -45,14 +45,17 @@
SELECT id,name FROM hrms_dept
</select>
<select id="listEmployeeById" parameterType="long" resultType="com.daqing.framework.domain.hrms.EmployeeEntity">
<select id="listEmployeeById" parameterType="long" resultType="com.daqing.framework.domain.hrms.ext.EmployeeVO">
SELECT DISTINCT e.id id,e.name name
FROM hrms_employee e
LEFT JOIN hrms_user u
ON e.user_id = u.id
LEFT JOIN hrms_employee_dept ed
ON e.id = ed.employee_id
LEFT JOIN hrms_dept d
ON d.id = ed.dept_id
WHERE d.id IN
WHERE u.del_or_not = 0
AND d.id IN
( SELECT d.id
FROM hrms_dept d
LEFT JOIN hrms_employee_dept ed

@ -37,6 +37,10 @@ public class DgGuaranteeLetterAssignUser implements Serializable {
*/
private Integer companyId;
@ApiModelProperty(value = "类型(1:A角确认 2:B角确认 3:经理确认)")
private Integer type;
/**
* 审批人id
*/

@ -0,0 +1,50 @@
package com.daqing.framework.domain.guarantee;
import com.daqing.framework.model.response.ResultCode;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.ToString;
/**
* 担保模块状态集合
*
* @auther River
* @date 2020/11/12 16:13
*/
@ToString
@AllArgsConstructor
public enum GuaranteeCode implements ResultCode {
COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL(false,80001,"驳回或拒绝时,意见不能为空!");
/**
* 操作是否成功
*/
@Getter
private boolean success;
/**
* 状态码
*/
@Getter
private int code;
/**
* 提示信息
*/
@Getter
private String message;
public boolean success() {
return this.success;
}
public int code() {
return this.code;
}
public String message() {
return this.message;
}
}

@ -0,0 +1,57 @@
package com.daqing.framework.domain.guarantee.po;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
import java.util.Date;
/**
* 业务效率个人
*
* @auther River
* @date 2020/11/11 10:41
*/
@Data
@ToString
public class DgEfficiencyPersonPO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 提单人id
*/
private Integer presenterId;
/**
* 客户名称
*/
private String name;
/**
* 申请日期
*/
private Date createTime;
/**
* 当前审批人
*/
private String empName;
/**
* 任务节点
*/
private String status;
/**
* 完成时间
*/
private Date finishTime;
/**
* 流程状态
*/
private Integer flowStatus;
}

@ -15,7 +15,6 @@ import java.util.Date;
@Data
@ToString
public class DgEfficiencyTeamPO implements Serializable {
/**
* id
*/
@ -49,4 +48,10 @@ public class DgEfficiencyTeamPO implements Serializable {
/**
* 完成时间
*/
private Date finishTime;
/**
* 流程状态
*/
private Integer flowStatus;
}

@ -14,6 +14,9 @@ import java.io.Serializable;
@ToString
public class EmployeeVO implements Serializable{
/**
* 员工id
*/
@ApiModelProperty("id")
private Long id;

@ -45,7 +45,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>1.1.2-beta4</version>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>

@ -0,0 +1,21 @@
package com.daqing.framework.utils.excel;
import com.alibaba.excel.EasyExcel;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
/**
* @Author chen
* @DATE 2020/10/19 14:45
* @Version 1.0
*/
public class EasyExcelUtil {
public static void download(HttpServletResponse response, Class head, List list, String fileName, String sheetName) throws IOException {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename="+fileName+"");
EasyExcel.write(response.getOutputStream(), head).sheet(sheetName).doWrite(list);
}
}

@ -0,0 +1,72 @@
package com.daqing.framework.utils.excel;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* @Author chen
* @DATE 2020/10/19 15:44
* @Version 1.0
* 状态转换器
*/
public class StatusConverter implements Converter<Integer> {
@Override
public Class supportJavaTypeKey() {
return Integer.class;
}
@Override
public CellDataTypeEnum supportExcelTypeKey() {
return CellDataTypeEnum.STRING;
}
/**
* 这里读的时候会调用
*
* @param cellData
* NotNull
* @param contentProperty
* Nullable
* @param globalConfiguration
* NotNull
* @return
*/
@Override
public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
return 0;
}
/**
* 这里是写的时候会调用
*
* @param value
* NotNull
* @param contentProperty
* Nullable
* @param globalConfiguration
* NotNull
* @return
*/
@Override
public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
switch (value){
case 1:
return new CellData("审核中");
case 2:
return new CellData("拒绝");
case 3:
return new CellData("已审核");
default:
return new CellData(String.valueOf(value));
}
}
}
Loading…
Cancel
Save