# Conflicts: # dq-financial-crms/pom.xml # dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java # dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.javamaster
commit
a6a938e6cd
188 changed files with 2094 additions and 493 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,30 @@ |
||||
package com.daqing.financial.guarantee.model.request; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.ToString; |
||||
|
||||
/** |
||||
* @Author chen |
||||
* @DATE 2020/12/31 15:35 |
||||
* @Version 1.0 |
||||
*/ |
||||
@Data |
||||
@ToString |
||||
public class PersonalEfficiencyListRequest { |
||||
|
||||
@ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") |
||||
private Integer createFixedTime; |
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
||||
@ApiModelProperty("起始时间") |
||||
private String startTime; |
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
||||
@ApiModelProperty("结束时间") |
||||
private String endTime; |
||||
|
||||
@ApiModelProperty("操作状态") |
||||
private Integer operatingStatus; |
||||
} |
@ -0,0 +1,76 @@ |
||||
package com.daqing.financial.guarantee.model.response; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.metadata.BaseRowModel; |
||||
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; |
||||
|
||||
/** |
||||
* 业务统计拒绝列表导出到excel实体类 |
||||
* |
||||
* @auther River |
||||
* @date 2021/1/4 15:11 |
||||
*/ |
||||
@Data |
||||
@ToString |
||||
public class DgStatisticsExcelRefuseResponse extends BaseRowModel implements Serializable { |
||||
|
||||
@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", timezone = "GMT+8") |
||||
private Date createTime; |
||||
|
||||
@ApiModelProperty("拒绝人") |
||||
@ExcelProperty(value = "当前审批人",index = 7) |
||||
private String refuseName; |
||||
|
||||
@ApiModelProperty("拒绝节点id") |
||||
@ExcelProperty(value = "任务节点",index = 8) |
||||
private Integer processId; |
||||
|
||||
@ApiModelProperty("拒绝时间") |
||||
@ExcelProperty(value = "拒绝时间",index = 9) |
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
||||
private Date refuseTime; |
||||
|
||||
@ApiModelProperty("拒绝原因") |
||||
@ExcelProperty(value = "拒绝原因",index = 10) |
||||
private String refuseOpinion; |
||||
|
||||
@ApiModelProperty("提单人姓名") |
||||
@ExcelProperty(value = "提单人",index = 11) |
||||
private String employeeName; |
||||
|
||||
@ApiModelProperty("部门") |
||||
@ExcelProperty(value = "所属部门",index = 12) |
||||
private String department; |
||||
} |
@ -0,0 +1,69 @@ |
||||
package com.daqing.financial.guarantee.model.response; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.metadata.BaseRowModel; |
||||
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; |
||||
|
||||
/** |
||||
* 业务统计列表导出到excel实体类 |
||||
* |
||||
* @auther River |
||||
* @date 2021/1/4 14:48 |
||||
*/ |
||||
@Data |
||||
@ToString |
||||
public class DgStatisticsExcelResponse extends BaseRowModel implements Serializable { |
||||
|
||||
@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", timezone = "GMT+8") |
||||
private Date createTime; |
||||
|
||||
@ApiModelProperty("完成任务节点id") |
||||
@ExcelProperty(value = "完成任务节点id",index = 7) |
||||
private Integer processId; |
||||
|
||||
@ApiModelProperty("最新操作时间") |
||||
@ExcelProperty(value = "任务分配时间",index = 8) |
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
||||
private Date operationTime; |
||||
|
||||
@ApiModelProperty("提单人姓名") |
||||
@ExcelProperty(value = "提单人",index = 9) |
||||
private String employeeName; |
||||
|
||||
@ApiModelProperty("部门") |
||||
@ExcelProperty(value = "所属部门",index = 10) |
||||
private String department; |
||||
|
||||
} |
@ -0,0 +1,22 @@ |
||||
package com.daqing.financial.guarantee.model.response; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* @Author chen |
||||
* @DATE 2021/1/5 11:32 |
||||
* @Version 1.0 |
||||
*/ |
||||
@Data |
||||
public class NumResponse { |
||||
|
||||
@ApiModelProperty("发起数") |
||||
private Integer initiateNum = 0; |
||||
|
||||
@ApiModelProperty("待处理数") |
||||
private Integer pendingNum = 0; |
||||
|
||||
@ApiModelProperty("已处理数 ") |
||||
private Integer processedNum = 0; |
||||
} |
@ -0,0 +1,71 @@ |
||||
package com.daqing.financial.guarantee.util; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* @Author chen |
||||
* @DATE 2021/1/5 11:43 |
||||
* @Version 1.0 |
||||
*/ |
||||
@Data |
||||
public class R { |
||||
|
||||
@ApiModelProperty(value = " 是否成功") |
||||
private Boolean success; |
||||
|
||||
@ApiModelProperty(value = "返回码") |
||||
private Integer code; |
||||
|
||||
@ApiModelProperty(value = "返回消息") |
||||
private String message; |
||||
|
||||
@ApiModelProperty(value = "返回数据") |
||||
private Map<String, Object> data = new HashMap<String, Object>(); |
||||
|
||||
private R(){} |
||||
|
||||
public static R ok(){ |
||||
R r = new R(); |
||||
r.setSuccess(true); |
||||
r.setCode(ResultCode.SUCCESS); |
||||
r.setMessage(ResultCode.SUCCESS_MESSAGE); |
||||
return r; |
||||
} |
||||
|
||||
public static R error(){ |
||||
R r = new R(); |
||||
r.setSuccess(false); |
||||
r.setCode(ResultCode.FAILURE); |
||||
r.setMessage(ResultCode.FAILURE_MESSAGE); |
||||
return r; |
||||
} |
||||
|
||||
public R success(Boolean success){ |
||||
this.setSuccess(success); |
||||
return this; |
||||
} |
||||
|
||||
public R message(String message){ |
||||
this.setMessage(message); |
||||
return this; |
||||
} |
||||
|
||||
public R code(Integer code){ |
||||
this.setCode(code); |
||||
return this; |
||||
} |
||||
|
||||
public R data(String key, Object value){ |
||||
this.data.put(key, value); |
||||
return this; |
||||
} |
||||
|
||||
public R data(Map<String, Object> map){ |
||||
this.setData(map); |
||||
return this; |
||||
} |
||||
} |
@ -0,0 +1,13 @@ |
||||
package com.daqing.financial.guarantee.util; |
||||
|
||||
/** |
||||
* @Author chen |
||||
* @DATE 2021/1/5 11:43 |
||||
* @Version 1.0 |
||||
*/ |
||||
public interface ResultCode { |
||||
Integer SUCCESS = 10000;// 成功
|
||||
Integer FAILURE = 20000;//失败
|
||||
String SUCCESS_MESSAGE = "成功"; |
||||
String FAILURE_MESSAGE = "失败"; |
||||
} |
@ -0,0 +1,36 @@ |
||||
package com.daqing.financial.guarantee.util; |
||||
|
||||
|
||||
/** |
||||
* @Author chen |
||||
* @DATE 2021/1/4 9:38 |
||||
* @Version 1.0 |
||||
*/ |
||||
public class TaskNodeUtil { |
||||
public static String converter(String taskNode){ |
||||
switch (taskNode){ |
||||
case "1": |
||||
return "业务申请"; |
||||
case "2": |
||||
return "担保部调查"; |
||||
case "3": |
||||
return "资产部调查"; |
||||
case "4": |
||||
return "信息部调查"; |
||||
case "5": |
||||
return "合规调查"; |
||||
case "6": |
||||
return "工作会"; |
||||
case "7": |
||||
return "贷审会"; |
||||
case "8": |
||||
return "担保函"; |
||||
case "9": |
||||
return "回款确认"; |
||||
case "10": |
||||
return "放款通知"; |
||||
default: |
||||
return ""; |
||||
} |
||||
} |
||||
} |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,41 +0,0 @@ |
||||
<?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.hrauth.dao.UserLoginDao"> |
||||
<!-- 可根据自己的需求,是否要使用 --> |
||||
<resultMap type="com.daqing.framework.domain.hrms.UserEntity" id="userMap"> |
||||
<result property="id" column="id"/> |
||||
<result property="account" column="account"/> |
||||
<result property="phoneAccount" column="phone_account"/> |
||||
<result property="password" column="password"/> |
||||
<result property="loginNum" column="login_num"/> |
||||
<result property="createTime" column="create_time"/> |
||||
<result property="motifyTime" column="motify_time"/> |
||||
</resultMap> |
||||
<update id="updatePasswordByPhoneAccount"> |
||||
update hrms_user set password = #{password} where phone_account = #{phoneAccount} |
||||
</update> |
||||
|
||||
<select id="getUser" parameterType="string" resultType="com.daqing.framework.domain.hrms.UserEntity"> |
||||
SELECT account,password FROM hrms_user WHERE account = #{account} |
||||
</select> |
||||
<select id="selectCount" resultType="java.lang.Integer"> |
||||
select count(1) from hrms_user where phone_account = #{phoneAccount} |
||||
</select> |
||||
|
||||
<select id="login" parameterType="com.daqing.framework.domain.hrms.request.LoginRequest" resultType="com.daqing.framework.domain.hrms.UserEntity"> |
||||
select id,account,phone_account,password,login_num from hrms_user |
||||
where del_or_not = 0 and status = 0 |
||||
<if test="phone != null and phone != '' "> |
||||
and phone_account = #{phone} |
||||
</if> |
||||
<if test="wechatId != null and wechatId != '' "> |
||||
and wechat_id = #{wechatId} |
||||
</if> |
||||
|
||||
</select> |
||||
<select id="selectByPhoneAccount" resultType="com.daqing.framework.domain.hrms.UserEntity"> |
||||
SELECT id,account FROM hrms_user WHERE phone_account = #{phoneAccount} |
||||
</select> |
||||
|
||||
</mapper> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue