From 5a74572bc6c4354dc8bb06dc6479e4edac234257 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Mon, 30 Nov 2020 16:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=92=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DgAuditProcessController.java  | 11 ++++++---
 ...DgGuaranteeLetterAssignUserController.java |  5 ++--
 .../mapper/DgAuditProcessMapper.java          |  3 ++-
 .../response/GuaranteeLetterListResponse.java |  2 +-
 .../response/LoanNoticeListResponse.java      |  2 +-
 .../PaymentConfirmationListResponse.java      |  2 +-
 .../service/IDgAuditProcessService.java       |  3 +--
 .../impl/DgApplyAmountInfoServiceImpl.java    |  6 ++---
 .../DgAssetsInvestigationServiceImpl.java     |  6 ++---
 .../impl/DgAuditProcessServiceImpl.java       |  5 ++--
 .../DgGuaranteeAssignUserServiceImpl.java     |  6 ++---
 ...gGuaranteeLetterAssignUserServiceImpl.java | 24 +++++++++----------
 .../service/impl/DgLoanNoticeServiceImpl.java |  4 ++--
 .../DgMessageInvestigationServiceImpl.java    |  6 ++---
 ...aymentConfirmationConsiderServiceImpl.java |  6 ++---
 .../guarantee/util/AuditProcessUtil.java      |  3 ++-
 .../mapper/guarantee/DgAuditProcessMapper.xml |  3 +++
 .../domain/guarantee/DgAuditProcess.java      |  5 ++++
 18 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java
index 676fe6fd..37d27179 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAuditProcessController.java
@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.controller;
 
 
 import com.daqing.financial.guarantee.service.IDgAuditProcessService;
+import com.daqing.framework.domain.guarantee.DgAuditProcess;
 import com.daqing.framework.model.response.ResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 
 /**
  * <p>
@@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Qyq
  * @since 2020-11-05
  */
-@Api(tags = {"审核流程进程"})
+@Api(tags = {"业务流程进程"})
 @RestController
 @RequestMapping("/dg-audit-process")
 public class DgAuditProcessController {
@@ -34,8 +36,11 @@ public class DgAuditProcessController {
     @GetMapping("/auditProcessList")
     public ResponseResult processList(
             @ApiParam(name = "businessId", value = "业务id", required = true)
-            @RequestParam String businessId){
-        return ResponseResult.SUCCESS();
+            @RequestParam String businessId,
+            @ApiParam(name = "processId", value = "流程id", required = false)
+            @RequestParam(required = false) String processId){
+        List<DgAuditProcess> processList = auditProcessService.queryProcessList(businessId,processId);
+        return ResponseResult.SUCCESS(processList);
     }
 
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
index 53e866ef..ff76f43b 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
@@ -99,8 +99,9 @@ public class DgGuaranteeLetterAssignUserController {
                 }});
         try {
             httpServletResponse.setContentType("application/msword");
-            httpServletResponse.setCharacterEncoding("utf-8");
-            httpServletResponse.setHeader("Content-disposition", "attachment;filename=GuaranteeLetter.docx");
+            String filePath = name + "担保函申请.docx";
+            String fileName = new String(filePath.getBytes(), "ISO-8859-1");
+            httpServletResponse.addHeader("Content-Disposition", "filename=" + fileName);
             template.write(httpServletResponse.getOutputStream());
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java
index 92f52bf5..f282184d 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAuditProcessMapper.java
@@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.daqing.framework.domain.guarantee.DgAuditProcess;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,6 +18,6 @@ import java.util.List;
 @Mapper
 public interface DgAuditProcessMapper extends BaseMapper<DgAuditProcess> {
 
-    List<DgAuditProcess> selectAuditProcessList(String businessId);
+    List<DgAuditProcess> selectAuditProcessList(@Param("businessId") String businessId,@Param("processId") String processId);
 
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
index 3a31b894..39999398 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
@@ -66,7 +66,7 @@ public class GuaranteeLetterListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
     @ApiModelProperty("申请期限(月)")
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
index 0a0988b3..b444cbab 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
@@ -53,7 +53,7 @@ public class LoanNoticeListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
     @ApiModelProperty("申请期限(月)")
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
index 9e66e9a8..3534bbbe 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
@@ -62,7 +62,7 @@ public class PaymentConfirmationListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
     @ApiModelProperty("申请期限(月)")
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java
index d52ba007..0a6c13b6 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAuditProcessService.java
@@ -15,6 +15,5 @@ import java.util.List;
  */
 public interface IDgAuditProcessService extends IService<DgAuditProcess> {
 
-    List<DgAuditProcess> auditProcessList(String businessId);
-
+    List<DgAuditProcess> queryProcessList(String businessId,String processId);
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index b836439d..74811359 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -182,7 +182,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","");
+            AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
         }
         return 1;
     }
@@ -367,7 +367,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 .eq("type",applyAmountList.getType()));
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","");
+        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","",1);
 
         //将业务流程状态设置为已撤销
 
@@ -487,7 +487,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保部经理",remark);
+            AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保部经理",remark,1);
         }
 
 
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
index efe6a203..e05e037f 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
@@ -232,7 +232,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent());
+        AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent(),3);
 
         return 1;
     }
@@ -273,7 +273,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部经理",approvalAssetsRequest.getApplyContent());
+            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部经理",approvalAssetsRequest.getApplyContent(),3);
 
         }
 
@@ -283,7 +283,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部分管领导",approvalAssetsRequest.getApplyContent());
+            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部分管领导",approvalAssetsRequest.getApplyContent(),3);
 
         }
 
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java
index 8d637691..224a8dad 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAuditProcessServiceImpl.java
@@ -20,9 +20,8 @@ import java.util.List;
 public class DgAuditProcessServiceImpl extends ServiceImpl<DgAuditProcessMapper, DgAuditProcess> implements IDgAuditProcessService {
 
     @Override
-    public List<DgAuditProcess> auditProcessList(String businessId) {
-        List<DgAuditProcess> auditProcessList = baseMapper.selectAuditProcessList(businessId);
+    public List<DgAuditProcess> queryProcessList(String businessId,String processId) {
+        List<DgAuditProcess> auditProcessList = baseMapper.selectAuditProcessList(businessId,processId);
         return auditProcessList;
     }
-
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index bc93d300..3190cbac 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -208,7 +208,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部A/B角",investigateGuaranteeRequest.getApplyContent());
+        AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部A/B角",investigateGuaranteeRequest.getApplyContent(),2);
 
         return 1;
     }
@@ -249,7 +249,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部经理",approvalGuaranteeRequest.getApplyContent());
+            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部经理",approvalGuaranteeRequest.getApplyContent(),2);
 
         }
 
@@ -259,7 +259,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(guaranteeUser.getBusinessId(),account,"担保部分管领导",approvalGuaranteeRequest.getApplyContent());
+            AuditProcessUtil.save(guaranteeUser.getBusinessId(),account,"担保部分管领导",approvalGuaranteeRequest.getApplyContent(),2);
 
         }
             return 1;
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
index e08060ba..49148197 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
@@ -166,7 +166,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，添加ab角数据
                     if (i > 0){
                         //添加a角
@@ -199,7 +199,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，更新ab角数据
                     if (i > 0){
                         //更新a角
@@ -244,7 +244,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，更新贷审会数据
                     if (i > 0){
                         //根据业务id查询贷审会数据
@@ -284,7 +284,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
                     //获取公司id
                     Integer companyId = guaranteeLetterAssignUser.getCompanyId();
                     //更新成功，添加回款确认数据
@@ -316,7 +316,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
                     //更新成功，更新回款确认数据
                     if (i > 0){
                         //更新财务部经理的回款数据
@@ -350,7 +350,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
                     //更新成功，更新AB角数据
                     if (i > 0){
                         //根据业务id查询A角数据
@@ -404,7 +404,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -442,7 +442,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -484,7 +484,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，更新b角数据及更新法规部经理数据
                     if (i > 0){
                         //更新b用户的审核状态为驳回
@@ -533,7 +533,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -572,7 +572,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -614,7 +614,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion);
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，更新a角数据及更新法规部经理数据
                     if (i > 0){
                         //更新a用户的审核状态为驳回
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
index b554e192..8e16cc5a 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
@@ -116,7 +116,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion);
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
             //更新成功更新业务流程已完成
             if (update > 0){
                 QueryWrapper<DgBusinessProcessStatus> businessProcessStatusQueryWrapper = new QueryWrapper<>();
@@ -142,7 +142,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion);
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
             //更新成功，更新回款确认的财务部经理数据
             if (update > 0){
                 QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
index fee22654..e03b872b 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
@@ -220,7 +220,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark());
+        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4);
 
         return 1;
     }
@@ -257,7 +257,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(messageInvestigation2.getBusinessId(),account,"信息部经理",approvalMessageRequest.getRemark());
+            AuditProcessUtil.save(messageInvestigation2.getBusinessId(),account,"信息部经理",approvalMessageRequest.getRemark(),4);
 
         }
 
@@ -266,7 +266,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && messageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark());
+            AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark(),4);
 
         }
         return 1;
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
index 6ee088fb..a372002e 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
@@ -125,7 +125,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             int update = baseMapper.updateById(paymentConfirmationConsider);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion);
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
             Integer companyId = paymentConfirmationConsider.getCompanyId();
             //更新成功，添加法规部经理数据
             if (update > 0){
@@ -153,7 +153,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             int update = baseMapper.updateById(paymentConfirmationConsider);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion);
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9);
             //更新成功，更新法规部经理数据
             if (update > 0){
                 QueryWrapper<DgLoanNotice> loanNoticeQueryWrapper = new QueryWrapper<>();
@@ -183,7 +183,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             int update = baseMapper.updateById(paymentConfirmationConsider);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion);
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
             //更新成功，更新资产部经理数据
             if (update > 0){
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>();
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
index ebbf9901..e016d1d8 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
@@ -26,12 +26,13 @@ public class AuditProcessUtil{
         auditProcessUtil.auditProcessMapper = this.auditProcessMapper;
     }
 
-    public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion) {
+    public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion,Integer processId) {
         DgAuditProcess auditProcess = new DgAuditProcess();
         auditProcess.setApprover(approver);
         auditProcess.setAuditOpinion(auditOpinion);
         auditProcess.setBusinessId(businessId);
         auditProcess.setDeptName(deptName);
+        auditProcess.setProcessId(processId);
         int insert = auditProcessUtil.auditProcessMapper.insert(auditProcess);
         return insert > 0;
     }
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
index c5bce3c3..e6680ac6 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
@@ -18,6 +18,9 @@
         from dg_audit_process dap
         left join dg_business_process_status dbps on dbps.business_id = dap.business_id
         where dap.business_id = #{businessId}
+        <if test="processId != null and processId != ''">
+            AND dap.process_id = #{processId}
+        </if>
     </select>
 
 </mapper>
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
index 282e29e5..5dde560d 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
@@ -1,6 +1,7 @@
 package com.daqing.framework.domain.guarantee;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -36,8 +37,12 @@ public class DgAuditProcess implements Serializable {
 
     @ApiModelProperty(value = "通过时间")
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    @ApiModelProperty(value = "流程标识：1业务申请，2担保部调查，3资产部调查，4信息部调查，5合规调查，6工作会，7贷审会，8担保函，9回款确认，10放款通知")
+    private Integer processId;
+
     @ApiModelProperty(value = "状态")
     private String status;