parent
4e634f07d2
commit
3ae40fc948
27 changed files with 587 additions and 27 deletions
@ -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 { |
||||
} |
@ -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 { |
||||
} |
@ -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); |
||||
} |
@ -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,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,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> { |
||||
|
||||
} |
@ -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 { |
||||
|
||||
} |
@ -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 >= #{pr.startTime} |
||||
</if> |
||||
<if test="pr.endTime != null and pr.endTime != ''"> |
||||
AND a.create_time <= #{pr.endTime} |
||||
</if> |
||||
ORDER BY a.create_time DESC |
||||
</select> |
||||
</mapper> |
@ -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; |
||||
} |
Loading…
Reference in new issue