huoran
/
dqFinancial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
shijie 4 years ago
parent 0d5d2ddc40 c8083dc0f8
commit 8e87e52320
21 changed files with 278 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
  2. 39
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java
  3. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
  4. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java
  5. 26
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/ApprovalNum.java
  6. 40
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/TodayApprovalRecordResponse.java
  7. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java
  8. 12
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
  9. 11
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
  10. 25
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java
  11. 24
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
  12. 12
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
  13. 36
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
  14. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
  15. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
  16. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
  17. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
  18. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
  19. 5
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
  20. 33
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
  21. 22
      dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java

10
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
Unescape View File

@ -1,8 +1,5 @@
package com.daqing.financial.guarantee.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.daqing.financial.guarantee.DgApplyAmountInfoControllerApi;
import com.daqing.financial.guarantee.feign.CrmsFeignService;
@ -10,18 +7,13 @@ import com.daqing.financial.guarantee.feign.HrmsFeignService;
import com.daqing.financial.guarantee.model.request.ApplyAmountListRequest;
import com.daqing.financial.guarantee.model.request.ApprovalBusinessRequest;
import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterListRequest;
import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse;
import com.daqing.financial.guarantee.model.response.BusinessApplicationExportResponse;
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
import com.daqing.financial.guarantee.service.IDgApplyAmountListService;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.guarantee.DgApplyField;
import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
import com.daqing.framework.domain.hrms.UserEntity;
import com.daqing.framework.domain.hrms.ext.EmployeeTO;
import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.JwtUtils;
@ -32,9 +24,7 @@ import io.jsonwebtoken.Claims;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;

39
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java
Unescape View File

@ -1,13 +1,15 @@
package com.daqing.financial.guarantee.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.daqing.financial.guarantee.feign.HrmsFeignService;
import com.daqing.financial.guarantee.model.response.ApprovalNum;
import com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse;
import com.daqing.financial.guarantee.service.IDgAuditProcessService;
import com.daqing.financial.guarantee.util.R;
import com.daqing.financial.guarantee.util.TaskNodeUtil;
import com.daqing.framework.domain.guarantee.DgAuditProcess;
import com.daqing.framework.domain.guarantee.po.ProcessPO;
import com.daqing.framework.domain.hrms.RoleEntity;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -15,7 +17,6 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@ -82,4 +83,36 @@ public class DgAuditProcessController {
return ResponseResult.SUCCESS(processPO);
}
@ApiOperation(value = "今日审批记录",response = TodayApprovalRecordResponse.class)
@GetMapping("todayApprovalRecord")
public R nowadaysAuditProcess(){
List<TodayApprovalRecordResponse> approvalRecords = auditProcessService.todayApprovalRecord();
ApprovalNum approvalNum = new ApprovalNum();
//统计状态个数
approvalRecords.forEach(todayApprovalRecordResponse -> {
if (todayApprovalRecordResponse.getStatus()!=null){
String taskNode = todayApprovalRecordResponse.getTaskNode();
if (taskNode!=null){
String converter = TaskNodeUtil.converter(taskNode);
todayApprovalRecordResponse.setTaskNode(converter);
}
switch (todayApprovalRecordResponse.getStatus()){
case "0":
approvalNum.setInitiateNum(approvalNum.getInitiateNum()+1);
break;
case "2":
approvalNum.setAgreed(approvalNum.getAgreed()+1);
break;
case "3":
approvalNum.setRejected(approvalNum.getRejected()+1);
break;
case "4":
approvalNum.setTurnDown(approvalNum.getTurnDown()+1);
break;
}
}
});
return R.ok().data("approvalRecords",approvalRecords).data("approvalNum",approvalNum);
}
}

7
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
Unescape View File

@ -18,11 +18,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.daqing.financial.guarantee.service.IDgEfficiencyService;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -31,7 +27,6 @@ import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 流程效率

4
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java
Unescape View File

@ -2,9 +2,11 @@ package com.daqing.financial.guarantee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.daqing.financial.guarantee.model.response.EfficiencyApprovalResponse;
import com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse;
import com.daqing.framework.domain.guarantee.DgAuditProcess;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@ -26,4 +28,6 @@ public interface DgAuditProcessMapper extends BaseMapper<DgAuditProcess> {
List<String> selectTenDays(Integer userId);
List<Integer> selectApprovalNum(int parseInt);
List<TodayApprovalRecordResponse> selectTodayApprovalRecord(@Param("userId")String userId,@Param("startTime")String startTime,@Param("endTime")String endTime);
}

26
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/ApprovalNum.java
Unescape View File

@ -0,0 +1,26 @@
package com.daqing.financial.guarantee.model.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author chen
* @DATE 2021/1/12 17:10
* @Version 1.0
*/
@Data
public class ApprovalNum {
@ApiModelProperty("已发起数")
private Integer initiateNum = 0;
@ApiModelProperty("已同意数")
private Integer agreed = 0;
@ApiModelProperty("已拒绝数")
private Integer rejected = 0;
@ApiModelProperty("已驳回数")
private Integer turnDown = 0;
}

40
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/TodayApprovalRecordResponse.java
Unescape View File

@ -0,0 +1,40 @@
package com.daqing.financial.guarantee.model.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author chen
* @DATE 2021/1/12 14:19
* @Version 1.0
*/
@Data
public class TodayApprovalRecordResponse {
@ApiModelProperty("业务编号")
private String businessNumber;
@ApiModelProperty("客户名称")
private String clientName;
@ApiModelProperty("申请金额")
private BigDecimal applicationAmount;
@ApiModelProperty("申请期限")
private String applicationDeadline;
@ApiModelProperty("任务节点")
private String taskNode;
@ApiModelProperty("处理时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date processingTime;
@ApiModelProperty("状态")
private String status;
}

3
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java
Unescape View File

@ -1,6 +1,7 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse;
import com.daqing.framework.domain.guarantee.DgAuditProcess;
import java.util.List;
@ -18,4 +19,6 @@ public interface IDgAuditProcessService extends IService<DgAuditProcess> {
List<DgAuditProcess> queryProcessList(String businessId,String processId);
List<Integer> getProcessId(String businessId);
List<TodayApprovalRecordResponse> todayApprovalRecord();
}

12
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
Unescape View File

@ -250,7 +250,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
if(businessApplication.getIsSaveOrCommit()==1){
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(userId));
AuditProcessUtil.save(Integer.parseInt(userId),dgApplyAmountInfo.getId(),account,departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(userId),dgApplyAmountInfo.getId(),account,
departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","",StatusCode.CZ_LAUNCH);
}
return 1;
}
@ -455,7 +456,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),businessApplication.getBusinessId(),account,departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),businessApplication.getBusinessId(),account,
departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","",StatusCode.CZ_LAUNCH);
//附件新增
return dgEnclosureInfoMapper.insert(dgEnclosureInfo);
@ -484,7 +486,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgApplyAmountList1.getBusinessId(),account,departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgApplyAmountList1.getBusinessId(),
account,departmentId,"",1,PromptSuccess.DB_YWY_ID,"","","",StatusCode.CZ_LAUNCH);
//将业务流程状态设置为已撤销
@ -648,7 +651,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgApplyAmountList1.getBusinessId(),account,departmentId,remark,1,roleId,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgApplyAmountList1.getBusinessId(),
account,departmentId,remark,1,roleId,"","","",StatusCode.CZ_LAUNCH);
return 1;
}

11
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
Unescape View File

@ -152,7 +152,8 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),assetsRequest.getBusinessId(), account, departmentId, "", 3,PromptSuccess.ZC_JL_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),assetsRequest.getBusinessId(),
account, departmentId, "", 3,PromptSuccess.ZC_JL_ID,"","","",StatusCode.SP_REVIEWED);
return true;
}
@ -327,7 +328,9 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgAssetsInvestigation.getBusinessId(),account,departmentId,investigateAssetsRequest.getApplyContent(),3,PromptSuccess.ZC_ZY_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),dgAssetsInvestigation.getBusinessId(),
account,departmentId,investigateAssetsRequest.getApplyContent(),
3,PromptSuccess.ZC_ZY_ID,"","","",investigateAssetsRequest.getStatus());
return 1;
}
@ -490,7 +493,9 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),assetsInvestigation.getBusinessId(),account,departmentId,approvalAssetsRequest.getApplyContent(),3,roleId,reason,loanMoney,loanTerm);
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),assetsInvestigation.getBusinessId(),
account,departmentId,approvalAssetsRequest.getApplyContent(),
3,roleId,reason,loanMoney,loanTerm,approvalAssetsRequest.getStatus());
return 1;
}

25
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java
Unescape View File

@ -1,11 +1,18 @@
package com.daqing.financial.guarantee.service.impl;
import com.daqing.financial.guarantee.mapper.DgAuditProcessMapper;
import com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse;
import com.daqing.financial.guarantee.service.IDgAuditProcessService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.financial.guarantee.util.DateUtils;
import com.daqing.framework.domain.guarantee.DgAuditProcess;
import com.daqing.framework.util.RedisUtil;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.List;
/**
@ -29,4 +36,22 @@ public class DgAuditProcessServiceImpl extends ServiceImpl<DgAuditProcessMapper,
public List<Integer> getProcessId(String businessId) {
return baseMapper.selectProcessId(businessId);
}
@Override
public List<TodayApprovalRecordResponse> todayApprovalRecord() {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startTime = dateFormat.format(DateUtils.getDayBegin());
String endTime = dateFormat.format(DateUtils.getDayEnd());
String userId = this.getUserId();
return baseMapper.selectTodayApprovalRecord(userId,startTime,endTime);
}
/**
* 获取当前登录用户信息
*/
private String getUserId() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token");
return RedisUtil.get("dq:token:" + token);
}
}

24
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
Unescape View File

@ -140,7 +140,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在审核进程表中插入一条指派成功的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, null, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, null, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -180,7 +180,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -208,7 +208,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","", StatusCode.SP_REJECT);
}
}
}
@ -248,7 +248,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规经理同意的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -271,7 +271,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规经理驳回的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REJECT);
}
}
}
@ -295,7 +295,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REFUSE);
}
}
}
@ -337,7 +337,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规经理审核成功的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -360,7 +360,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规经理驳回的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REJECT);
}
}
}
@ -384,7 +384,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","", StatusCode.SP_REFUSE);
}
}
}
@ -426,7 +426,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规领导审核成功的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -453,7 +453,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条法规领导驳回的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","", StatusCode.SP_REJECT);
}
}
}
@ -481,7 +481,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
departmentId, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","", StatusCode.SP_REFUSE);
}
}
}

12
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
Unescape View File

@ -541,7 +541,9 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeAssignUser.getBusinessId(), account, departmentId, investigateGuaranteeRequest.getApplyContent(), 2,roleId,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeAssignUser.getBusinessId(),
account, departmentId, investigateGuaranteeRequest.getApplyContent(), 2,roleId,
"","","",investigateGuaranteeRequest.getStatus());
}
return 1;
}
@ -636,7 +638,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
this.baseMapper.insert(assignUser);
}
} else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_REVIEWED && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
} else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REVIEWED) && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
//如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
//如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
DgGuaranteeAssignUser user = new DgGuaranteeAssignUser();
@ -689,7 +691,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeUser.getBusinessId(), account, departmentId, approvalGuaranteeRequest.getApplyContent(), 2,roleId,reason,loanMoney,loanTerm);
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeUser.getBusinessId(),
account, departmentId, approvalGuaranteeRequest.getApplyContent(), 2,roleId,reason,loanMoney,loanTerm,approvalGuaranteeRequest.getStatus());
return 1;
}
@ -799,7 +802,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeRequest.getBusinessId(), account, departmentId, "", 2,PromptSuccess.DB_JL_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeRequest.getBusinessId(),
account, departmentId, "", 2,PromptSuccess.DB_JL_ID,"","","",StatusCode.SP_REVIEWED);
return ResponseResult.SUCCESS();
}

36
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
Unescape View File

@ -167,7 +167,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，添加ab角数据
if (i > 0){
//获取之前指定的a角用户
@ -241,7 +242,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，更新ab角数据及资产部经理数据
if (i > 0){
//更新a角
@ -301,7 +303,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，更新贷审会数据
if (i > 0){
//根据业务id查询贷审会数据
@ -342,7 +345,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","",status);
//获取公司id
Integer companyId = guaranteeLetterAssignUser.getCompanyId();
//更新成功，添加回款确认数据及更新整个业务的审核状态
@ -409,7 +413,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","",status);
//更新成功，更新回款确认数据及更新整个业务的审核状态
if (i > 0){
//更新法规部经理数据
@ -468,7 +473,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","",status);
//更新成功，更新AB角数据
if (i > 0){
//更新法规部经理数据
@ -531,7 +537,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_A_ID,"","","",status);
//更新成功后，判断b角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -581,7 +588,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_A_ID,"","","",status);
//更新成功后，判断b角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -623,7 +631,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_A_ID,"","","",status);
//更新成功后，更新b角数据及更新法规部经理数据
if (i > 0){
//更新b用户的审核状态为驳回，操作状态为已处理
@ -673,7 +682,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_B_ID,"","","",status);
//更新成功后，判断a角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -724,7 +734,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_B_ID,"","","",status);
//更新成功后，判断a角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -766,7 +777,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,8,PromptSuccess.DB_B_ID,"","","",status);
//更新成功后，更新a角数据及更新法规部经理数据
if (i > 0){
//更新a用户的审核状态为驳回，操作状态为已处理

6
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
Unescape View File

@ -148,7 +148,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, null, PromptSuccess.DSH_PROCESS_ID,PromptSuccess.DSH_ID,"","","");
departmentId, null, PromptSuccess.DSH_PROCESS_ID,PromptSuccess.DSH_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}
@ -182,7 +182,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,
PromptSuccess.DSH_ID,"","","");
PromptSuccess.DSH_ID,"","","", StatusCode.SP_REFUSE);
}
}
}
@ -222,7 +222,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,
PromptSuccess.DSH_ID,"","","");
PromptSuccess.DSH_ID,"","","", StatusCode.SP_REJECT);
}
}
}

6
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
Unescape View File

@ -114,7 +114,8 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,10,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,10,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功更新业务流程已完成
if (update > 0){
QueryWrapper<DgBusinessProcessStatus> businessProcessStatusQueryWrapper = new QueryWrapper<>();
@ -141,7 +142,8 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,10,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,10,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，更新回款确认的法规部经理和财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();

18
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
Unescape View File

@ -153,7 +153,9 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageRequest.getBusinessId(), account, departmentId, "", 4,PromptSuccess.XX_JL_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageRequest.getBusinessId(),
account, departmentId, "", 4,
PromptSuccess.XX_JL_ID,"","","",StatusCode.SP_REVIEWED);
return true;
}
@ -297,7 +299,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
this.baseMapper.update(dgInvestigation,new QueryWrapper<DgMessageInvestigation>()
.eq("business_id",messageInvestigation.getBusinessId()).eq("type",2));
}else if(investigateMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW ){
}else if(investigateMessageRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)){
//判断信息部专员是否调查通过，如果通过，修改信息部经理操作状态为待处理
DgMessageInvestigation messageInvestigation2 = new DgMessageInvestigation();
messageInvestigation2.setOperatingStatus(StatusCode.CZ_ON_HAND);
@ -309,7 +311,9 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageInvestigation.getBusinessId(),account,departmentId,investigateMessageRequest.getRemark(),4,PromptSuccess.XX_ZY_ID,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageInvestigation.getBusinessId(),
account,departmentId,investigateMessageRequest.getRemark(),4,
PromptSuccess.XX_ZY_ID,"","","",investigateMessageRequest.getStatus());
return 1;
}
@ -384,7 +388,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//信息部经理审批状态设置为驳回，操作状态为待处理
this.baseMapper.update(dgMessage,new QueryWrapper<DgMessageInvestigation>()
.eq("business_id",messageInvestigation.getBusinessId()).eq("type",2));
}else if(approvalMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
}else if(approvalMessageRequest.getStatus().equals(StatusCode.SP_IN_REVIEW) && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
//根据主键id查询业务id
DgMessageInvestigation messageInvestigation2 = this.getBaseMapper().selectById(approvalMessageRequest.getId());
@ -409,7 +413,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
message.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
this.baseMapper.insert(message);
}
}else if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
}else if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REVIEWED) && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
//如果信息部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
//如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
DgMessageInvestigation investigation = new DgMessageInvestigation();
@ -449,7 +453,9 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageInvestigation.getBusinessId(),account,departmentId,approvalMessageRequest.getRemark(),4,roleId,"","","");
AuditProcessUtil.save(Integer.parseInt(this.getUserId()),messageInvestigation.getBusinessId(),
account,departmentId,approvalMessageRequest.getRemark(),4,roleId,
"","","",approvalMessageRequest.getStatus());
return 1;
}

18
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
Unescape View File

@ -144,7 +144,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,9,PromptSuccess.CWB_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,9,PromptSuccess.CWB_ID,"","","",status);
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功，添加法规部经理数据
if (update > 0){
@ -185,7 +186,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion, 9,PromptSuccess.CWB_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion, 9,PromptSuccess.CWB_ID,"","","",status);
//更新成功，更新法规部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> wrapperTemp = new QueryWrapper<>();
@ -215,7 +217,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,9,PromptSuccess.CWB_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,9,PromptSuccess.CWB_ID,"","","",status);
//更新成功，更新资产部经理数据及其他人的数据
if (update > 0){
//更新法规部经理数据
@ -279,7 +282,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,9,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,9,PromptSuccess.FG_JL_ID,"","","",status);
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功，添加法规部经理数据和更新财务部数据
if (update > 0){
@ -324,7 +328,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion, 9,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion, 9,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，更新法规部经理数据和财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
@ -360,7 +365,8 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
String departmentId = OrdinaryUtil.getDepartmentId(currentUser);
AuditProcessUtil.save(currentUser,businessId,account,departmentId,auditOpinion,9,PromptSuccess.FG_JL_ID,"","","");
AuditProcessUtil.save(currentUser,businessId,account,departmentId,
auditOpinion,9,PromptSuccess.FG_JL_ID,"","","",status);
//更新成功，更新财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperT = new QueryWrapper<>();

8
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
Unescape View File

@ -157,7 +157,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 在业务流程表中插入一条审议通过的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(userId));
return AuditProcessUtil.save(Integer.parseInt(userId),this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","", StatusCode.SP_REVIEWED);
}
}
// 拒绝
@ -182,7 +182,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(userId));
return AuditProcessUtil.save(Integer.parseInt(userId),this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","", StatusCode.SP_REFUSE);
}
}
}
@ -214,7 +214,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 在业务流程表中插入一条工作会驳回的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(userId));
return AuditProcessUtil.save(Integer.parseInt(userId),this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
departmentId, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","", StatusCode.SP_REJECT);
}
}
}
@ -267,7 +267,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
// 在业务流程表中插入一条评委抽取成功的数据
String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
return AuditProcessUtil.save(Integer.parseInt(this.getUserId()),this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
departmentId, null, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
departmentId, null, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","", StatusCode.SP_REVIEWED);
}
}
}

5
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
Unescape View File

@ -40,11 +40,14 @@ public class AuditProcessUtil{
* @param loanTern 审批期限
* @return 添加状态
*/
public static boolean save(Integer userId,Integer businessId, String approver, String departmentIds, String auditOpinion,Integer processId,Integer roleId,String reason,String loanMoney,String loanTern) {
public static boolean save(Integer userId,Integer businessId, String approver,
String departmentIds, String auditOpinion,Integer processId,
Integer roleId,String reason,String loanMoney,String loanTern,Integer status) {
DgAuditProcess auditProcess = new DgAuditProcess();
auditProcess.setApprover(approver);
auditProcess.setAuditOpinion(auditOpinion);
auditProcess.setUserId(userId);
auditProcess.setStatus(String.valueOf(status));
auditProcess.setBusinessId(businessId);
auditProcess.setDepartmentId(departmentIds);
auditProcess.setRoleId(roleId);

33
dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
Unescape View File

@ -16,6 +16,8 @@
<result column="role_id" property="roleId" />
</resultMap>
<select id="selectAuditProcessList" resultMap="BaseResultMap">
select dap.id,dap.business_id,dap.approver,dap.create_time,dap.audit_opinion,dap.role_id,
dbps.business_status as status,dap.reason,dap.loan_money,dap.loan_tern
@ -52,4 +54,35 @@
GROUP BY create_time2
</select>
<resultMap id="TodayApprovalRecord" type="com.daqing.financial.guarantee.model.response.TodayApprovalRecordResponse">
<result column="business_code" property="businessNumber" />
<result column="name" property="clientName" />
<result column="apply_amount" property="applicationAmount" />
<result column="apply_time" property="applicationDeadline" />
<result column="process_id" property="taskNode" />
<result column="create_time" property="processingTime" />
<result column="status" property="status" />
</resultMap>
<select id="selectTodayApprovalRecord" resultMap="TodayApprovalRecord">
SELECT
daai.business_code,
cc.name,
daai.apply_amount,
daai.apply_time,
dap.process_id,
dap.create_time,
dap.status
FROM
dg_audit_process dap
LEFT JOIN dg_apply_amount_info daai ON dap.business_id = daai.id
LEFT JOIN crms_company_customer ccc ON daai.company_id = ccc.id
LEFT JOIN crms_customer cc ON ccc.customer_id = cc.id
WHERE
dap.user_id = #{userId}
AND dap.create_time BETWEEN #{startTime} AND #{endTime}
ORDER BY
dap.create_time desc
</select>
</mapper>

22
dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java
Unescape View File

@ -35,16 +35,16 @@ public class Md5Util {
//System.out.println(md5("1234564"));
System.out.println(md5("Aa123420"));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
try {
date = simpleDateFormat.parse("2021-01-06");
} catch (ParseException e) {
e.printStackTrace();
}
/* Timestamp time = DateUtils.getDayEndTime(date);
System.out.println(time);
System.out.println(simpleDateFormat.format(time));*/
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Date date = new Date();
// try {
// date = simpleDateFormat.parse("2021-01-06");
// } catch (ParseException e) {
// e.printStackTrace();
// }
// Timestamp time = DateUtils.getDayEndTime(date);
// System.out.println(time);
// System.out.println(simpleDateFormat.format(time));
}
}

Write Preview
Loading…
Cancel
Save