Merge remote-tracking branch 'origin/master'

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){
+            @RequestParam String businessId,
-        return ResponseResult.SUCCESS();
+            @ApiParam(name = "processId", value = "流程id", required = false)
+            @RequestParam(required = false) String processId){
+        List<DgAuditProcess> processList = auditProcessService.queryProcessList(businessId,processId);
+        return ResponseResult.SUCCESS(processList);
     }
 
 }

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");
+            String filePath = name + "担保函申请.docx";
-            httpServletResponse.setHeader("Content-disposition", "attachment;filename=GuaranteeLetter.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();

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);
 
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java

@@ -66,16 +66,16 @@ public class GuaranteeLetterListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
-    @ApiModelProperty("申请期限")
+    @ApiModelProperty("申请期限(月)")
-    @ExcelProperty(value = "申请期限",index = 5)
+    @ExcelProperty(value = "申请期限(月)",index = 5)
     private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("审核状态")

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java

@@ -53,16 +53,16 @@ public class LoanNoticeListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
-    @ApiModelProperty("申请期限")
+    @ApiModelProperty("申请期限(月)")
-    @ExcelProperty(value = "申请期限",index = 5)
+    @ExcelProperty(value = "申请期限(月)",index = 5)
     private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("审核状态")

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java

@@ -38,7 +38,7 @@ public class PaymentConfirmationListResponse {
 
     @ExcelIgnore
     @ApiModelProperty("贷审会同意时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date passingTime;
 
     @ExcelIgnore
@@ -62,16 +62,16 @@ public class PaymentConfirmationListResponse {
     private String businessType;
 
     @ApiModelProperty("申请额度")
-    @ExcelProperty(value = "申请额度",index = 4)
+    @ExcelProperty(value = "申请额度(万)",index = 4)
     private Double loanMoney;
 
-    @ApiModelProperty("申请期限")
+    @ApiModelProperty("申请期限(月)")
-    @ExcelProperty(value = "申请期限",index = 5)
+    @ExcelProperty(value = "申请期限(月)",index = 5)
     private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
     @ApiModelProperty("审核状态")

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);
-
 }

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;
     }
@@ -385,7 +385,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);
 
         //将业务流程状态设置为已撤销
 
@@ -514,7 +514,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保部经理",remark);
+            AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保部经理",remark,1);
         }
 
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java

@@ -234,7 +234,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;
     }
@@ -308,7 +308,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);
 
         }
 
@@ -338,7 +338,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);
 
         }
 

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) {
+    public List<DgAuditProcess> queryProcessList(String businessId,String processId) {
-        List<DgAuditProcess> auditProcessList = baseMapper.selectAuditProcessList(businessId);
+        List<DgAuditProcess> auditProcessList = baseMapper.selectAuditProcessList(businessId,processId);
         return auditProcessList;
     }
-
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java

@@ -249,7 +249,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;
     }
@@ -324,7 +324,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);
 
         }
 
@@ -354,7 +354,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;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -3,12 +3,14 @@ package com.daqing.financial.guarantee.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
 import com.daqing.financial.guarantee.mapper.DgGuaranteeLetterAssignUserMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest;
 import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest;
 import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
+import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.util.AuditProcessUtil;
@@ -20,6 +22,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +55,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
     @Autowired
     private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
 
+
     @Override
     public GuaranteeLetterListResponse selectGuaranteeLetter(String businessId) {
         GuaranteeLetterListResponse response = baseMapper.selectGuaranteeLetter(businessId);
@@ -72,7 +76,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
         List<GuaranteeLetterListResponse> excelDataList = baseMapper.selectBatchData(idList);
-        EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"GuaranteeLetterList","第一页");
+        EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"担保函列表","第一页");
     }
 
     @Override
@@ -96,7 +100,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
             List<GuaranteeLetterListResponse> records = guaranteeLetterVO.getRecords();
             records.forEach(guaranteeLetterListResponse -> {
                 //角色为法规部经理则设置值
-                if (roleIdList.contains(PromptSuccess.FG_JL_ID)){
+                if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){
                     guaranteeLetterListResponse.setIsFgJl(1);
                 }
             });
@@ -115,7 +119,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
     @Transactional
     @Override
     public boolean updateGuaranteeLetterStatus(GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) {
-        // TODO 所有操作待添加业务流程数据
         //更新条件
         Integer businessId = guaranteeLetterUpdateStatusRequest.getBusinessId();
         //状态值为2表示通过或同意，为4表示驳回操作
@@ -138,7 +141,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
         if (roleIdList!=null){
 
             //角色为法规部经理则生成担保函操作和驳回操作
-            if (roleIdList.contains(PromptSuccess.FG_JL_ID)){
+            if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){
                 //更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新ab角用户数据，如果审批状态为审批中，则添加ab角用户数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperTemp = new QueryWrapper<>();
                 queryWrapperTemp.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
@@ -158,8 +161,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //获取公司id
                     Integer companyId = guaranteeLetterAssignUser.getCompanyId();
-                    //根据当前用户更新审核状态和操作状态及审核意见  TODO 添加业务流程
+                    //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
+
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，添加ab角数据
                     if (i > 0){
                         //添加a角
@@ -188,8 +195,11 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
-                    //根据当前用户更新审核状态和操作状态及审核意见  TODO 添加业务流程
+                    //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，更新ab角数据
                     if (i > 0){
                         //更新a角
@@ -232,7 +242,10 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
-                    //TODO 更新成功，更新贷审会数据
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
+                    //更新成功，更新贷审会数据
                     if (i > 0){
                         //根据业务id查询贷审会数据
                         QueryWrapper<DgLoanCommitteeConsider> loanCommitteeConsiderQueryWrapper = new QueryWrapper<>();
@@ -249,7 +262,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
             }
 
             //角色为资产部经理则确认担保函操作和驳回操作
-            if (roleIdList.contains(PromptSuccess.ZC_JL_ID)){
+            if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){
                 //更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新回款确认数据，如果审批状态为审批中，则添加回款确认数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperTemp = new QueryWrapper<>();
                 queryWrapperTemp.eq("business_id",businessId).eq("role_id",PromptSuccess.ZC_JL_ID);
@@ -269,9 +282,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
                     //获取公司id
                     Integer companyId = guaranteeLetterAssignUser.getCompanyId();
-                    //更新成功，添加回款确认数据 TODO 添加业务流程
+                    //更新成功，添加回款确认数据
                     if (i > 0){
                         //添加财务部经理的回款数据
                         DgPaymentConfirmationConsider paymentConfirmationConsider = new DgPaymentConfirmationConsider();
@@ -298,7 +314,10 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
-                    //更新成功，更新回款确认数据 TODO 添加业务流程
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
+                    //更新成功，更新回款确认数据
                     if (i > 0){
                         //更新财务部经理的回款数据
                         QueryWrapper<DgPaymentConfirmationConsider> paymentConfirmationConsiderQueryWrapper = new QueryWrapper<>();
@@ -329,6 +348,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
                     //更新成功，更新AB角数据
                     if (i > 0){
                         //根据业务id查询A角数据
@@ -359,7 +381,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
 
             //角色为a角确认担保函操作和驳回操作
-            if (roleIdList.contains(PromptSuccess.DB_A_ID)){
+            if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))){
                 //更新之前,获取此用户数据的审批状态，如果审批状态为驳回，则更新资产部经理数据，如果审批状态为审批中，则添加资产部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperTemp = new QueryWrapper<>();
                 queryWrapperTemp.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
@@ -380,6 +402,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -397,6 +422,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //添加成功，返回操作结果
                             log.info(insert > 0 ? "资产部经理添加成功" : "资产部经理添加失败");
                             return insert > 0;
+                        //b用户审核没通过，返回结果
+                        }else {
+                            return true;
                         }
                     }
                 }
@@ -412,6 +440,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -432,6 +463,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
                             return update > 0;
+                            //b用户审核没通过，返回结果
+                        }else {
+                            return true;
                         }
                     }
                 }
@@ -448,6 +482,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
                     //更新成功后，更新b角数据及更新法规部经理数据
                     if (i > 0){
                         //更新b用户的审核状态为驳回
@@ -473,7 +510,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
 
             //角色为b角确认担保函操作和驳回操作
-            if (roleIdList.contains(PromptSuccess.DB_B_ID)){
+            if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){
                 //更新之前,获取此用户数据的审批状态，如果审批状态为驳回，则更新资产部经理数据，如果审批状态为审批中，则添加资产部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperTemp = new QueryWrapper<>();
                 queryWrapperTemp.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
@@ -494,6 +531,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -511,6 +551,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //添加成功，返回操作结果
                             log.info(insert > 0 ? "资产部经理添加成功" : "资产部经理添加失败");
                             return insert > 0;
+                            //a用户审核没通过，返回结果
+                        }else {
+                            return true;
                         }
                     }
                 }
@@ -527,6 +570,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -547,6 +593,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
                             return update > 0;
+                            //a用户审核没通过，返回结果
+                        }else {
+                            return true;
                         }
                     }
                 }
@@ -563,6 +612,9 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     //根据当前用户更新审核状态和操作状态及审核意见
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     log.info(i > 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败");
+                    //同时往审核流程进程表新增一条记录
+                    String account = DgApplyAmountInfoController.getAccount();
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
                     //更新成功后，更新a角数据及更新法规部经理数据
                     if (i > 0){
                         //更新a用户的审核状态为驳回

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
 import com.daqing.financial.guarantee.mapper.DgBusinessProcessStatusMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
@@ -13,6 +14,7 @@ import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.guarantee.DgBusinessProcessStatus;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
@@ -21,6 +23,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import jdk.nashorn.internal.ir.IfNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,15 +91,15 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
         List<LoanNoticeListResponse> excelDataList = baseMapper.selectBatchData(idList);
-        EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"LoanNoticeList","第一页");
+        EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"放款通知列表","第一页");
     }
 
     @Override
     public boolean updateLoanNotice(LoanNoticeUpdateRequest loanNoticeUpdateRequest) {
-        // TODO 所有操作待添加业务流程数据
         //取出条件
         Integer businessId = loanNoticeUpdateRequest.getBusinessId();
-        Integer currentUser = loanNoticeUpdateRequest.getCurrentUser();
+        //获取当前登录用户id
+        Integer currentUser = Integer.parseInt(this.getUserId());
         String auditOpinion = loanNoticeUpdateRequest.getAuditOpinion();
         //状态为2表示通过，为4表示驳回
         Integer status = loanNoticeUpdateRequest.getStatus();
@@ -111,6 +114,9 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             loanNotice.setStatus(StatusCode.SP_REVIEWED);
             loanNotice.setOperatingStatus(StatusCode.CZ_PROCESSED);
             int update = baseMapper.updateById(loanNotice);
+            //同时往审核流程进程表新增一条记录
+            String account = DgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
             //更新成功更新业务流程已完成
             if (update > 0){
                 QueryWrapper<DgBusinessProcessStatus> businessProcessStatusQueryWrapper = new QueryWrapper<>();
@@ -134,6 +140,9 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             loanNotice.setStatus(StatusCode.SP_REVIEWED);
             loanNotice.setOperatingStatus(StatusCode.CZ_PROCESSED);
             int update = baseMapper.updateById(loanNotice);
+            //同时往审核流程进程表新增一条记录
+            String account = DgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
             //更新成功，更新回款确认的财务部经理数据
             if (update > 0){
                 QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java

@@ -235,7 +235,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;
     }
@@ -305,7 +305,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);
 
         }
 
@@ -335,7 +335,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
             //同时往审核流程进程表新增一条记录
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark());
+            AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark(),4);
 
         }
         return 1;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -3,15 +3,18 @@ package com.daqing.financial.guarantee.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
 import com.daqing.financial.guarantee.mapper.DgGuaranteeLetterAssignUserMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
+import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
@@ -20,6 +23,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
+import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -87,12 +91,11 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
         List<PaymentConfirmationListResponse> excelDataList = baseMapper.selectBatchData(idList);
-        EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"PaymentConfirmationList","第一页");
+        EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页");
     }
 
     @Override
     public boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) {
-        // TODO 所有操作待添加业务流程数据
         //取出条件
         Integer businessId = paymentConfirmationUpdateRequest.getBusinessId();
         //获取当前登录用户id
@@ -120,7 +123,9 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
             paymentConfirmationConsider.setImgFile(imgFile);
             int update = baseMapper.updateById(paymentConfirmationConsider);
-
+            //同时往审核流程进程表新增一条记录
+            String account = DgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
             Integer companyId = paymentConfirmationConsider.getCompanyId();
             //更新成功，添加法规部经理数据
             if (update > 0){
@@ -146,6 +151,9 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
             paymentConfirmationConsider.setImgFile(imgFile);
             int update = baseMapper.updateById(paymentConfirmationConsider);
+            //同时往审核流程进程表新增一条记录
+            String account = DgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9);
             //更新成功，更新法规部经理数据
             if (update > 0){
                 QueryWrapper<DgLoanNotice> loanNoticeQueryWrapper = new QueryWrapper<>();
@@ -173,6 +181,9 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
             paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
             paymentConfirmationConsider.setImgFile(imgFile);
             int update = baseMapper.updateById(paymentConfirmationConsider);
+            //同时往审核流程进程表新增一条记录
+            String account = DgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
             //更新成功，更新资产部经理数据
             if (update > 0){
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>();

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;
     }

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>

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;
 

dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/EasyExcelUtil.java

@@ -14,8 +14,9 @@ import java.util.List;
 public class EasyExcelUtil {
     public static void download(HttpServletResponse response, Class head, List list, String fileName, String sheetName) throws IOException {
         response.setContentType("application/vnd.ms-excel");
-        response.setCharacterEncoding("utf-8");
+        String filePath = fileName + ".xlsx";
-        response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
+        fileName = new String(filePath.getBytes(), "ISO-8859-1");
+        response.addHeader("Content-Disposition", "filename=" + fileName);
         EasyExcel.write(response.getOutputStream(), head).sheet(sheetName).doWrite(list);
     }
 }

dq-govern-gateway/src/main/resources/jwt.properties

@@ -16,7 +16,12 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-apply-amount-info/excelExport,\
   /api-guarantee/dg-message-investigation/excelExport,\
   /api-guarantee/dg-assets-investigation/excelExport,\
-  /api-guarantee/dg-guarantee-assign-user/excelExport
+  /api-guarantee/dg-guarantee-assign-user/excelExport,\
+  /api-guarantee/dg-guarantee-letter-assign-user/exportGuaranteeLetter,\
+  /api-guarantee/dg-guarantee-letter-assign-user/guaranteeLetterListExport,\
+  /api-guarantee/dg-payment-confirmation-consider/paymentConfirmationListExport,\
+  /api-guarantee/dg-loan-notice/loanNoticeListExport
+