Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java

@@ -88,7 +88,7 @@ public class DgComplianceInvestigationController {
      */
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出", notes = "导出")
-    public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids){
+    public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids) {
         Boolean result = iDgComplianceInvestigationService.excelExport(response, ids);
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java

@@ -196,7 +196,4 @@ public class DgGuaranteeAssignUserController {
         int result = dgGuaranteeAssignUserService.approvalGuarantee(approvalGuaranteeRequest);
         return result>0 ? ResponseResult.SUCCESS("审核成功！"):ResponseResult.FAIL(41002,"审核失败！");
     }
-
-
-
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -64,8 +65,18 @@ public class DgLoanCommitteeConsiderController {
      * 查看
      */
     @GetMapping("/query")
-    @ApiModelProperty(value = "查看",notes = "查看")
+    @ApiOperation(value = "查看", notes = "查看")
     public ResponseResult query(@RequestParam("id") Integer id) {
         return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.query(id));
     }
+
+    /**
+     * 导出
+     */
+    @GetMapping("excelExport")
+    @ApiOperation(value = "导出", notes = "导出")
+    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids) {
+        Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids);
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java

@@ -10,6 +10,7 @@ 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;
 
 /**
@@ -78,4 +79,14 @@ public class DgWorkConferenceConsiderController {
     public ResponseResult query(@RequestParam("id") Integer id) {
         return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.query(id));
     }
+
+    /**
+     * 导出
+     */
+    @GetMapping("/excelExport")
+    @ApiOperation(value = "导出", notes = "导出")
+    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids){
+        Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids);
+        return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java

@@ -50,11 +50,14 @@ public interface HrmsFeignService {
     ResponseResult insertUserRole(@RequestParam("userId") Long userId,@RequestParam("roleId")Long roleId);
 
     /**
-     * 给用户赋予一个橘色
+     * 给用户赋予一个角色
      */
     @GetMapping("hrms/employee/saveUserRole")
     ResponseResult saveUserRole(@RequestParam("userId") Long userId,@RequestParam("roleId")Long roleId);
 
     @PostMapping("hrms/employee/insertUsrRole")
     ResponseResult insertUsrRole(@RequestBody List<DgGuaranteePO> list);
+
+    @GetMapping("/hrms/employee/listEmpNameByUserId")
+    ResponseResult<List<EmployeeVO>> listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java

@@ -27,8 +27,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
     IPage<DgComplianceInvestigationResponse> list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest,
                                                   @Param("roleIds") List<Integer> roleIds, @Param("userId") Integer userId);
 
-    List<DgComplianceInvestigationResponse> listExcel(@Param("roleIds") List<Integer> roleIds, @Param("userId") Integer userId,
+    List<DgComplianceInvestigationResponse> listExcel(@Param("ids") List<Integer> ids);
-                                                      @Param("ids") List<Integer> ids);
 
     Boolean survey(@Param("iid") Integer iid, @Param("opinion") String opinion, @Param("date") Date date,
                    @Param("userId") Integer userId, @Param("operationStatus") Integer operationStatus,
@@ -62,4 +61,8 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
                                       @Param("opinion") String opinion);
 
     Boolean updateBusinessStatusByBusinessId(@Param("businessId") Integer businessId, @Param("businessStatus") Integer businessStatus);
+
+    Integer getGuaranteeId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
+
+    Integer getDgAssetsInvestigationId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java

@@ -24,4 +24,8 @@ public interface DgGuaranteeAssignUserMapper extends BaseMapper<DgGuaranteeAssig
     IPage<GuaranteeListResponse> pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List<String> roleIdlist,@Param("userId") String userId,@Param("status") Integer status);
 
     List<GuaranteeListResponse> selectListByIds(List<String> ids);
+
+    Boolean updateAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus);
+
+    Boolean updateOperationStatusById(@Param("businessId") Integer businessId, @Param("operationStatus") Integer operationStatus);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java

@@ -25,11 +25,10 @@ import java.util.List;
 @Mapper
 public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitteeConsider> {
 
-    IPage<DgLoanCommitteeConsiderResponse> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleId") List<Integer> roleId,
+    IPage<DgLoanCommitteeConsiderResponse> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
                                                 @Param("userId") Integer userId);
 
-    List<DgLoanCommitteeConsiderResponse> excelList(@Param("roleId") List<Integer> roleId, @Param("userId") Integer userId,
+    List<DgLoanCommitteeConsiderResponse> excelList(@Param("ids") List<Integer> ids);
-                                                    @Param("ids") List<Integer> ids);
 
     Boolean check(@Param("lr") DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest, @Param("userId") Integer userId,
                   @Param("status") Integer status, @Param("operatingStatus") Integer operatingStatus, @Param("date") Date date);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java

@@ -26,6 +26,8 @@ public interface DgWorkConferenceConsiderMapper extends BaseMapper<DgWorkConfere
     IPage<DgWorkConferencePO> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
                                    @Param("userId") Integer userId);
 
+    List<DgWorkConferencePO> excelList(@Param("ids") List<Integer> ids);
+
     Boolean check(@Param("id") Integer id, @Param("userId") Integer userId, @Param("opinion") String opinion,
                   @Param("auditStatus") Integer auditStatus, @Param("operationStatus") Integer operationStatus,
                   @Param("date") Date date, @Param("joinJudge") String joinJudge);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java

@@ -20,5 +20,5 @@ public class DgComplianceInvestigationRequest implements Serializable {
     private String codeOrName;
 
     @ApiModelProperty("流程状态")
-    private String status;
+    private Integer status;
 }

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

@@ -1,11 +1,13 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.LinkedHashMap;
 
 /**
  * AB角合规调查等审核意见、审核人、时间
@@ -23,6 +25,7 @@ public class AuditOpinionResponse implements Serializable {
     @ApiModelProperty("A角姓名")
     private String aName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("A角调查时间")
     private Date aTime;
 
@@ -32,6 +35,7 @@ public class AuditOpinionResponse implements Serializable {
     @ApiModelProperty("B角姓名")
     private String bName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("B角调查时间")
     private Date bTime;
 
@@ -41,6 +45,7 @@ public class AuditOpinionResponse implements Serializable {
     @ApiModelProperty("资产姓名")
     private String assetName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("资产审核时间")
     private Date assetTime;
 
@@ -50,6 +55,7 @@ public class AuditOpinionResponse implements Serializable {
     @ApiModelProperty("信息姓名")
     private String messageName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("信息审核时间")
     private Date messageTime;
 
@@ -59,6 +65,19 @@ public class AuditOpinionResponse implements Serializable {
     @ApiModelProperty("法规姓名")
     private String regulationName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("法规审核时间")
     private Date regulationTime;
+
+    /**
+     * 业务申请详细
+     */
+    @ApiModelProperty(value = "业务申请详细")
+    private DgApplyAmountInfoResponse dgApplyAmountInfo;
+
+    /**
+     * 企业详细
+     */
+    @ApiModelProperty(value = "企业详细")
+    private LinkedHashMap linkedHashMap;
 }

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

@@ -0,0 +1,31 @@
+package com.daqing.financial.guarantee.model.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * 合规调查详情查看
+ *
+ * @auther River
+ * @date 2020/12/1 10:17
+ */
+@Data
+@ToString
+public class DgComplianceInvestigationInfoResponse implements Serializable {
+
+    @ApiModelProperty("担保部调查详情")
+    private GuaranteeDetailResponse guaranteeDetailResponse;
+
+    @ApiModelProperty("资产调查详细")
+    private DgAssetsInvestigationResponse assetsResponse;
+
+    @ApiModelProperty("合规调查的附件文件")
+    private String fileUrl;
+
+    @ApiModelProperty("合规调查的审核(调查)意见")
+    private String opinion;
+
+}

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

@@ -10,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import java.io.Serializable;
 import java.util.Date;
 

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

@@ -1,5 +1,11 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,45 +22,58 @@ import java.util.Date;
  */
 @Data
 @ToString
-public class DgLoanCommitteeConsiderResponse implements Serializable {
+public class DgLoanCommitteeConsiderResponse extends BaseRowModel implements Serializable {
 
+    @ExcelIgnore
     @ApiModelProperty("贷审会表id")
     private Integer id;
 
+    @ExcelProperty(value = "业务编号" , index = 0)
     @ApiModelProperty("业务编号")
     private String businessCode;
 
+    @ExcelProperty(value = "客户名称" , index = 1)
     @ApiModelProperty("客户名称")
     private String name;
 
+    @ExcelProperty(value = "联系电话" , index = 2)
     @ApiModelProperty("联系电话")
     private String phone;
 
+    @ExcelProperty(value = "业务类别" , index = 3)
     @ApiModelProperty("业务类别")
     private String businessType;
 
+    @ExcelProperty(value = "金额" , index = 4)
     @ApiModelProperty("金额")
     private Double applyAmount;
 
+    @ExcelProperty(value = "期限" , index = 5)
     @ApiModelProperty("期限")
     private String applyTime;
 
+    @ExcelProperty(value = "申请日期" , index = 6)
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
+    @ExcelProperty(value = "操作状态" , index = 7 ,converter = OperatingStatusConverter.class)
     @ApiModelProperty("操作状态,0:已发起,1:待处理,2:已处理")
     private Integer operatingStatus;
 
+    @ExcelProperty(value = "审核状态" , index = 8 ,converter = ApprovalStatusConverter.class)
     @ApiModelProperty("审核状态,0:待指派,1:审核中,2:已审核,3:已拒绝,4:已驳回,5:草稿,6:已撤销")
     private Integer status;
 
+    @ExcelProperty(value = "业务状态" , index = 9 ,converter = BusinessStatusConverter.class)
     @ApiModelProperty("业务状态,1->进行中;2->已完成;3->已否决")
     private Integer businessStatus;
 
+    @ExcelIgnore
     @ApiModelProperty("角色id")
     private Integer roleId;
 
+    @ExcelIgnore
     @ApiModelProperty("业务id")
     private Integer businessId;
 }

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

@@ -1,5 +1,11 @@
 package com.daqing.financial.guarantee.model.response;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.daqing.framework.utils.excel.ApprovalStatusConverter;
+import com.daqing.framework.utils.excel.BusinessStatusConverter;
+import com.daqing.framework.utils.excel.OperatingStatusConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,60 +22,78 @@ import java.util.Date;
  */
 @ToString
 @Data
-public class DgWorkConferenceResponse implements Serializable {
+public class DgWorkConferenceResponse extends BaseRowModel implements Serializable {
 
+    @ExcelIgnore
     @ApiModelProperty("工作会表id")
     private Integer id;
 
+    @ExcelProperty(value = "业务编号", index = 0)
     @ApiModelProperty("业务编号")
     private String businessCode;
 
+    @ExcelProperty(value = "客户名称", index = 1)
     @ApiModelProperty("客户名称")
     private String name;
 
+    @ExcelProperty(value = "联系电话", index = 2)
     @ApiModelProperty("联系电话")
     private String phone;
 
+    @ExcelProperty(value = "业务类别", index = 3)
     @ApiModelProperty("业务类别")
     private String businessType;
 
+    @ExcelProperty(value = "金额", index = 4)
     @ApiModelProperty("金额")
     private Double applyAmount;
 
+    @ExcelProperty(value = "期限", index = 5)
     @ApiModelProperty("期限")
     private String applyTime;
 
+    @ExcelProperty(value = "申请日期", index = 6)
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
+    @ExcelProperty(value = "A角", index = 7)
     @ApiModelProperty("A角")
     private String aRoleName;
 
+    @ExcelProperty(value = "B角", index = 8)
     @ApiModelProperty("B角")
     private String bRoleName;
 
+    @ExcelProperty(value = "法规监督部", index = 9)
     @ApiModelProperty("法规监督部")
     private String regulationName;
 
+    @ExcelProperty(value = "资产管理部", index = 10)
     @ApiModelProperty("资产管理部")
     private String assetName;
 
+    @ExcelProperty(value = "信息服务部", index = 11)
     @ApiModelProperty("信息服务部")
     private String messageName;
 
+    @ExcelProperty(value = "操作状态", index = 12, converter = OperatingStatusConverter.class)
     @ApiModelProperty("操作状态,0:已发起,1:待处理,2:已处理")
     private Integer operationStatus;
 
+    @ExcelProperty(value = "审核状态", index = 13, converter = ApprovalStatusConverter.class)
     @ApiModelProperty("审核状态,0:待指派,1:审核中,2:已审核,3:已拒绝,4:已驳回,5:草稿,6:已撤销")
     private Integer auditStatus;
 
+    @ExcelProperty(value = "业务状态", index = 14, converter = BusinessStatusConverter.class)
     @ApiModelProperty("业务状态,1->进行中;2->已完成;3->已否决")
     private Integer businessStatus;
 
+    @ExcelIgnore
     @ApiModelProperty("角色id")
     private Integer roleId;
 
+    @ExcelIgnore
     @ApiModelProperty("业务id")
     private Integer businessId;
 }

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

@@ -39,6 +39,4 @@ public class GuaranteeDetailResponse implements Serializable {
     private DgEnclosureInfoResponse dgEnclosureInfo;
 
 
-
-
 }

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

@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest;
+import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse;
 import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
 import com.daqing.framework.utils.PageUtils;
 
@@ -20,13 +21,13 @@ public interface IDgComplianceInvestigationService extends IService<DgCompliance
 
     PageUtils list(Integer page, Integer size, DgComplianceInvestigationRequest dgComplianceInvestigationRequest);
 
-    Boolean assign(Integer iid,Integer userId);
+    Boolean assign(Integer iid, Integer userId);
 
-    Boolean survey(Integer iid, String fileUrl, String opinion,Integer status);
+    Boolean survey(Integer iid, String fileUrl, String opinion, Integer status);
 
-    Boolean check(Integer iid,String opinion,Integer status);
+    Boolean check(Integer iid, String opinion, Integer status);
 
-    DgComplianceInvestigation query(Integer iid);
+    DgComplianceInvestigationInfoResponse query(Integer iid);
 
     Boolean excelExport(HttpServletResponse response, List<String> ids);
 }

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

@@ -5,6 +5,7 @@ import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderReque
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
 import com.daqing.framework.utils.PageUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -24,4 +25,6 @@ public interface IDgLoanCommitteeConsiderService extends IService<DgLoanCommitte
     List<String> getJudges(Integer id);
 
     DgLoanCommitteeConsider query(Integer id);
+
+    Boolean excelExport(HttpServletResponse response, List<String> ids);
 }

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

@@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
+import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper;
 import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest;
+import com.daqing.financial.guarantee.model.response.AssetsDetailResponse;
+import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse;
 import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse;
+import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
+import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService;
 import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.financial.guarantee.util.AuditProcessUtil;
+import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
 import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider;
@@ -49,6 +54,15 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
     @Autowired
     private HrmsFeignService hrmsFeignService;
 
+    @Autowired
+    private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
+
+    @Autowired
+    private IDgGuaranteeAssignUserService guaranteeAssignUserService;
+
+    @Autowired
+    private IDgAssetsInvestigationService dgAssetsInvestigationService;
+
     /**
      * 列表
      */
@@ -131,6 +145,9 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
             if (fileUrl == null || fileUrl.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_UPLOAD_NOT_NULL);
             }
+            // 将合规调查的审核状态为审核中
+            this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                    StatusCode.SP_IN_REVIEW);
             // 更新合规调查表调查数据,表示调查完成
             Boolean result = this.getBaseMapper().survey(iid, opinion, new Date(), Integer.parseInt(userId),
                     StatusCode.CZ_PROCESSED, StatusCode.SP_IN_REVIEW, fileUrl);
@@ -153,6 +170,27 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
             if (opinion == null || opinion.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
+            // 先改变合规调查的审核状态为驳回
+            Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                    StatusCode.SP_REJECT);
+            if (result) {
+                // 再改变自己的操作状态为已处理
+                Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                if (result1) {
+                    // 改变担保部的审核状态为驳回
+                    Boolean result2 = dgGuaranteeAssignUserMapper.updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            StatusCode.SP_REJECT);
+                    if (result2) {
+                        // 修改AB角的操作状态为待处理
+                        Boolean result3 = dgGuaranteeAssignUserMapper.updateOperationStatusById(this.getComplianceInvestigation(iid)
+                                .getBusinessId(), StatusCode.CZ_ON_HAND);
+                        if (result3) {
+                            // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
+                            return true;
+                        }
+                    }
+                }
+            }
         }
         return false;
     }
@@ -170,8 +208,72 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         String userId = "1";
         Integer operationStatus = this.getBaseMapper().getOperationStatusByBusinessId(
                 this.getComplianceInvestigation(iid).getBusinessId(), PromptSuccess.FG_JL_ID);
-        // 待处理,表示业务进行到法规经理审核
+        // 1.待处理,表示业务进行到法规经理审核
         if (Objects.equals(operationStatus, StatusCode.CZ_ON_HAND)) {
+            // 查询业务流程表,找出该业务id的最新操作记录的角色id
+            Integer roleId = 70;
+            if (roleId.equals(PromptSuccess.DB_A_ID) || roleId.equals(PromptSuccess.DB_B_ID)) {
+                // 1.1.若为A/B角,表示为驳回数据
+                // 同意
+                if (status == 1) {
+                    // 改变自己的状态为已处理
+                    Boolean result = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                    if (result) {
+                        // 改变C角的这条数据的操作状态为待处理
+                        Boolean result1 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
+                                StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
+                        if (result1) {
+                            // 在业务流程表中插入一条法规经理同意的数据
+                            return true;
+                        }
+                    }
+                }
+                // 驳回
+                if (status == 2) {
+                    if (opinion == null || opinion.length() == 0) {
+                        ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
+                    }
+                    // 先改变所有的审核状态为驳回
+                    Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            StatusCode.SP_REJECT);
+                    if (result) {
+                        // 再改变自己当前的操作状态为已处理
+                        Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                        if (result1) {
+                            // 最后改变C角的这条数据的操作状态为待处理
+                            Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
+                                    StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
+                            if (result2) {
+                                // 在业务流程表中插入一条法规经理驳回的数据
+                                return true;
+                            }
+                        }
+                    }
+                }
+                // 拒绝
+                if (status == 3) {
+                    if (opinion == null || opinion.length() == 0) {
+                        ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
+                    }
+                    // 先改变所有的审核状态为已拒绝
+                    Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            StatusCode.SP_REFUSE);
+                    if (result) {
+                        // 再改变自己当前的操作状态为已处理
+                        Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                        if (result1) {
+                            // 最后改变该条贷款信息的业务状态为已否决
+                            Boolean result2 = this.getBaseMapper().updateBusinessStatusByBusinessId(
+                                    this.getComplianceInvestigation(iid).getBusinessId(), StatusCode.YW_REJECTED);
+                            if (result2) {
+                                // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
+                                return true;
+                            }
+                        }
+                    }
+                }
+            } else {
+                // 1.2.若为C角,表示为非驳回数据
                 // 同意
                 if (status == 1) {
                     Boolean result = this.getBaseMapper().check(iid, opinion, new Date(),
@@ -194,7 +296,25 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 }
                 // 驳回
                 if (status == 2) {
-
+                    if (opinion == null || opinion.length() == 0) {
+                        ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
+                    }
+                    // 先改变所有的审核状态为驳回
+                    Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            StatusCode.SP_REJECT);
+                    if (result) {
+                        // 再改变自己当前的操作状态为已处理
+                        Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                        if (result1) {
+                            // 最后改变C角的这条数据的操作状态为待处理
+                            Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
+                                    StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
+                            if (result2) {
+                                // 在业务流程表中插入一条法规经理驳回的数据
+                                return true;
+                            }
+                        }
+                    }
                 }
                 // 拒绝
                 if (status == 3) {
@@ -219,7 +339,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                     }
                 }
             }
-        // 已处理,表示业务进行到法规领导审核
+        }
+        // 2.已处理,表示业务进行到法规领导审核
         if (Objects.equals(operationStatus, StatusCode.CZ_PROCESSED)) {
             // 同意
             if (status == 1) {
@@ -245,7 +366,25 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
             }
             // 驳回
             if (status == 2) {
-
+                if (opinion == null || opinion.length() == 0) {
+                    ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
+                }
+                // 先改变所有的审核状态为驳回
+                Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                        StatusCode.SP_REJECT);
+                if (result) {
+                    // 再改变自己当前的操作状态为已处理
+                    Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                    if (result1) {
+                        // 最后改变法规部经理的这条数据的操作状态为待处理
+                        Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
+                                StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
+                        if (result2) {
+                            // 在业务流程表中插入一条法规领导驳回的数据
+                            return true;
+                        }
+                    }
+                }
             }
             // 拒绝
             if (status == 3) {
@@ -277,8 +416,27 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
      * 查看
      */
     @Override
-    public DgComplianceInvestigation query(Integer iid) {
+    public DgComplianceInvestigationInfoResponse query(Integer iid) {
-        return this.getBaseMapper().queryDgComplianceInvestigation(iid);
+        DgComplianceInvestigationInfoResponse dgComplianceInvestigationInfoResponse = new DgComplianceInvestigationInfoResponse();
+        // 担保领导的数据id
+        Integer guaranteeId = this.getBaseMapper().getGuaranteeId(this.getComplianceInvestigation(iid).getBusinessId(),
+                PromptSuccess.DB_LD_ID);
+        // 资产领导的数据id
+        Integer dgAssetsInvestigationId = this.getBaseMapper().getDgAssetsInvestigationId(this.getComplianceInvestigation(iid).getBusinessId(),
+                PromptSuccess.ZC_LD_ID);
+        // 担保详情
+        GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId);
+        // 资产详情
+        AssetsDetailResponse assetsDetailResponse = dgAssetsInvestigationService.assetsDetail(dgAssetsInvestigationId);
+        // 合规附件和意见
+        DgComplianceInvestigation dgComplianceInvestigation = this.getBaseMapper().queryDgComplianceInvestigation(iid);
+        // 统一返回
+        dgComplianceInvestigationInfoResponse.setGuaranteeDetailResponse(guaranteeDetailResponse);
+        dgComplianceInvestigationInfoResponse.setAssetsResponse(assetsDetailResponse.getAssetsResponse());
+        dgComplianceInvestigationInfoResponse.setFileUrl(dgComplianceInvestigation.getFile());
+        dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
+
+        return dgComplianceInvestigationInfoResponse;
     }
 
     /**
@@ -289,27 +447,14 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         if (ids == null || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
         }
-        /*String userId = this.getUserId();
-        // 获取当前登录用户的角色id
-        String roleIdString = RedisUtil.get("dq:userRole:" + userId);
-        if (roleIdString == null || roleIdString.length() == 0) {
-            ExceptionCast.cast(GuaranteeCode.ROLE_IS_NOT);
-        }
-        String[] roleIds = roleIdString.split(",");*/
-        String userId = "1";
-        String[] roleIds = {"70"};
-        List<Integer> roleList = new ArrayList<>();
-        for (String roleId : roleIds) {
-            roleList.add(Integer.parseInt(roleId));
-        }
         List<Integer> idList = new ArrayList<>();
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
         }
-        List<DgComplianceInvestigationResponse> list = this.getBaseMapper().listExcel(roleList, Integer.parseInt(userId), idList);
+        List<DgComplianceInvestigationResponse> list = this.getBaseMapper().listExcel(idList);
         try {
-            ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "complianceInvestigation",
+            ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "NO.1", new DgComplianceInvestigationResponse())
-                    new DgComplianceInvestigationResponse());
+                    .finish();
         } catch (Exception e) {
             ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
         }

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

@@ -6,8 +6,11 @@ import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest;
 import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse;
+import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
 import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.crms.response.CrmsCode;
+import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
 import com.daqing.framework.domain.guarantee.GuaranteeCode;
 import com.daqing.framework.exception.ExceptionCast;
@@ -16,12 +19,14 @@ import com.daqing.framework.model.response.CommonCode;
 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.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 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 javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -42,6 +47,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
     @Autowired
     private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
 
+    @Autowired
+    private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService;
+
     /**
      * 列表
      */
@@ -90,14 +98,23 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
             }
             Boolean result = this.getBaseMapper().check(dgLoanCommitteeConsiderRequest, Integer.getInteger(userId), StatusCode.SP_REVIEWED, StatusCode.CZ_PROCESSED, new Date());
             if (result) {
-                // 在业务流程表中插入一条审议成功的数据;在担保函表中插入条数据
+                // 在担保函表中插入条数据
-                return true;
+                DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
+                guaranteeLetterAssignUser.setBusinessId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                        .getBusinessId());
+                guaranteeLetterAssignUser.setUserId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                        .getCompanyId());
+                boolean result1 = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAssignUser);
+                if (result1) {
+                    // 在业务流程表中插入一条审议成功的数据
+                }
+                return false;
             }
         }
         // 拒绝
         if (dgLoanCommitteeConsiderRequest.getStatus() == 2) {
             if (dgLoanCommitteeConsiderRequest.getRefuseOpinion() == null
-                    || dgLoanCommitteeConsiderRequest.getRefuseOpinion().length() == 0 ) {
+                    || dgLoanCommitteeConsiderRequest.getRefuseOpinion().length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
             // 先改变所有的审核状态为已拒绝
@@ -113,7 +130,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                     Boolean result2 = dgComplianceInvestigationMapper.updateBusinessStatusByBusinessId(
                             this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
                             StatusCode.YW_REJECTED);
-                    if (result2){
+                    if (result2) {
                         // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                         return true;
                     }
@@ -155,6 +172,25 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
         return this.getBaseMapper().query(id);
     }
 
+    /**
+     * 导出
+     */
+    @Override
+    public Boolean excelExport(HttpServletResponse response, List<String> ids) {
+        List<Integer> idList = new ArrayList<>();
+        for (String id : ids) {
+            idList.add(Integer.parseInt(id));
+        }
+        List<DgLoanCommitteeConsiderResponse> list = this.getBaseMapper().excelList(idList);
+        try {
+            ExcelUtil.writeExcelWithSheets(response, list, "贷审会数据一览表", "NO.1", new DgLoanCommitteeConsiderResponse())
+                    .finish();
+        } catch (Exception e) {
+            ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
+        }
+        return false;
+    }
+
     /**
      * 获取当前登录用户信息
      */

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

@@ -2,24 +2,33 @@ package com.daqing.financial.guarantee.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.mapper.DgWorkConferenceConsiderMapper;
 import com.daqing.financial.guarantee.model.response.AuditOpinionResponse;
+import com.daqing.financial.guarantee.model.response.DgWorkConferenceResponse;
+import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
+import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
 import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider;
 import com.daqing.framework.domain.guarantee.GuaranteeCode;
 import com.daqing.framework.domain.guarantee.po.AuditOpinionPO;
 import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO;
+import com.daqing.framework.domain.hrms.ext.EmployeeVO;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.CommonCode;
 import com.daqing.framework.model.response.PromptSuccess;
+import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
+import com.daqing.framework.utils.excel.ExcelUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +40,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -50,6 +60,12 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
     @Autowired
     private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
 
+    @Autowired
+    private IDgGuaranteeAssignUserService guaranteeAssignUserService;
+
+    @Autowired
+    private HrmsFeignService hrmsFeignService;
+
     /**
      * 列表
      */
@@ -73,7 +89,27 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             roleList.add(Integer.parseInt(roleId));
         }
         IPage<DgWorkConferencePO> list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId));
-        return new PageUtils(list);
+        List<DgWorkConferencePO> dgWorkConferencePOS = list.getRecords();
+        System.out.println(dgWorkConferencePOS);
+        Integer[] userIds = new Integer[dgWorkConferencePOS.size() * 5];
+        for (int i = 0; i < userIds.length; i += 5) {
+            for (int j = i / 5; j < i / 5 + 1; j++) {
+                userIds[i] = dgWorkConferencePOS.get(j).getAUserId();
+                userIds[i + 1] = dgWorkConferencePOS.get(j).getBUserId();
+                userIds[i + 2] = dgWorkConferencePOS.get(j).getIUserId();
+                userIds[i + 3] = dgWorkConferencePOS.get(j).getAssUserId();
+                userIds[i + 4] = dgWorkConferencePOS.get(j).getMUserId();
+            }
+        }
+        // 根据userId获取对应的员工姓名
+        ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
+        System.out.println(responseResult.getData());
+        // 将对应的userId转换为name
+        List<DgWorkConferenceResponse> workConferenceResponses = this.transitionUserName(dgWorkConferencePOS, responseResult.getData());
+        IPage<DgWorkConferenceResponse> iPage = new Page<>();
+        BeanUtils.copyProperties(list, iPage);
+        iPage.setRecords(workConferenceResponses);
+        return new PageUtils(iPage);
     }
 
     /**
@@ -135,6 +171,27 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             if (opinion == null || opinion.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
+            // 先修改工作会的审核状态为驳回
+            Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getBaseMapper()
+                    .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
+            if (result) {
+                // 再修改自己的状态为已处理
+                Boolean result1 = this.getBaseMapper().updateOperationStatusById(id, StatusCode.CZ_PROCESSED, opinion);
+                if (result1) {
+                    // 修改合规调查的审核状态为驳回
+                    Boolean result2 = dgComplianceInvestigationMapper.updateAuditStatusByBusinessId(this.getBaseMapper()
+                            .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
+                    if (result2) {
+                        // 修改法规领导的操作状态为待处理
+                        Boolean result3 = dgComplianceInvestigationMapper.updateToAudit(this.getBaseMapper()
+                                .getWorkConferenceConsider(id).getBusinessId(), StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
+                        if (result3) {
+                            // 在业务流程表中插入一条工作会驳回的数据
+                            return true;
+                        }
+                    }
+                }
+            }
         }
         return false;
     }
@@ -193,9 +250,41 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             ExceptionCast.cast(CommonCode.INVALID_PARAM);
         }
         AuditOpinionPO auditOpinion = dgLoanCommitteeConsiderMapper.getAuditOpinion(businessId);
+        AuditOpinionResponse auditOpinionResponse = new AuditOpinionResponse();
         // 将对应的用户id转换成姓名返回回去
         System.out.println(auditOpinion);
-        return null;
+        Integer[] userIds = new Integer[5];
+        userIds[0] = auditOpinion.getAEmpId();
+        userIds[1] = auditOpinion.getBEmpId();
+        userIds[2] = auditOpinion.getAssetEmpId();
+        userIds[3] = auditOpinion.getMessageEmpId();
+        userIds[4] = auditOpinion.getRegulationEmpId();
+        ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
+        List<EmployeeVO> employees = responseResult.getData();
+        for (EmployeeVO employee : employees) {
+            if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())){
+                auditOpinionResponse.setAName(employee.getName());
+            }
+            if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())){
+                auditOpinionResponse.setBName(employee.getName());
+            }
+            if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())){
+                auditOpinionResponse.setAssetName(employee.getName());
+            }
+            if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())){
+                auditOpinionResponse.setMessageName(employee.getName());
+            }
+            if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())){
+                auditOpinionResponse.setRegulationName(employee.getName());
+            }
+        }
+        BeanUtils.copyProperties(auditOpinion, auditOpinionResponse);
+        // 获取担保信息
+        Integer guaranteeId = dgComplianceInvestigationMapper.getGuaranteeId(businessId, PromptSuccess.DB_LD_ID);
+        GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId);
+        auditOpinionResponse.setDgApplyAmountInfo(guaranteeDetailResponse.getDgApplyAmountInfo());
+        auditOpinionResponse.setLinkedHashMap(guaranteeDetailResponse.getLinkedHashMap());
+        return auditOpinionResponse;
     }
 
     /**
@@ -212,9 +301,40 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
     /**
      * 导出
      */
+    @Transactional
     @Override
     public Boolean excelExport(HttpServletResponse response, List<String> ids) {
-        return null;
+        if (ids == null || ids.size() == 0) {
+            ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
+        }
+        List<Integer> idList = new ArrayList<>();
+        for (String id : ids) {
+            idList.add(Integer.parseInt(id));
+        }
+        List<DgWorkConferencePO> list = this.getBaseMapper().excelList(idList);
+        System.out.println(list);
+        // 获取所有的userId
+        Integer[] userIds = new Integer[list.size() * 5];
+        for (int i = 0; i < userIds.length; i += 5) {
+            for (int j = i / 5; j < i / 5 + 1; j++) {
+                userIds[i] = list.get(j).getAUserId();
+                userIds[i + 1] = list.get(j).getBUserId();
+                userIds[i + 2] = list.get(j).getIUserId();
+                userIds[i + 3] = list.get(j).getAssUserId();
+                userIds[i + 4] = list.get(j).getMUserId();
+            }
+        }
+        // 根据userId获取对应的员工姓名
+        ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
+        System.out.println(responseResult.getData());
+        List<DgWorkConferenceResponse> excelList = this.transitionUserName(list, responseResult.getData());
+        try {
+            ExcelUtil.writeExcelWithSheets(response, excelList, "工作会数据一览表", "NO.1", new DgWorkConferenceResponse())
+                    .finish();
+        } catch (Exception e) {
+            ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT);
+        }
+        return false;
     }
 
     /**
@@ -229,4 +349,35 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         }
         return userId;
     }
+
+    /**
+     * 将userId转换为对应的名字返回给前端
+     */
+    private List<DgWorkConferenceResponse> transitionUserName(List<DgWorkConferencePO> workConferences, List<EmployeeVO> employees) {
+        List<DgWorkConferenceResponse> workConferenceResponses = new ArrayList<>();
+        DgWorkConferenceResponse workConferenceResponse;
+        for (DgWorkConferencePO workConference : workConferences) {
+            workConferenceResponse = new DgWorkConferenceResponse();
+            for (EmployeeVO employee : employees) {
+                if (Objects.equals(workConference.getAUserId().longValue(), employee.getId())) {
+                    workConferenceResponse.setARoleName(employee.getName());
+                }
+                if (Objects.equals(workConference.getBUserId().longValue(), employee.getId())) {
+                    workConferenceResponse.setBRoleName(employee.getName());
+                }
+                if (Objects.equals(workConference.getIUserId().longValue(), employee.getId())) {
+                    workConferenceResponse.setRegulationName(employee.getName());
+                }
+                if (Objects.equals(workConference.getAssUserId().longValue(), employee.getId())) {
+                    workConferenceResponse.setAssetName(employee.getName());
+                }
+                if (Objects.equals(workConference.getMUserId().longValue(), employee.getId())) {
+                    workConferenceResponse.setMessageName(employee.getName());
+                }
+            }
+            BeanUtils.copyProperties(workConference, workConferenceResponse);
+            workConferenceResponses.add(workConferenceResponse);
+        }
+        return workConferenceResponses;
+    }
 }

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml

@@ -41,12 +41,7 @@
         LEFT JOIN dg_business_process_status AS b
         ON b.business_id = a.id
         WHERE c.del_or_not  = 0
-        AND i.role_id IN
+        AND i.id IN
-        <foreach collection="roleIds" open="(" separator="," close=")" item="roleId">
-            #{roleId}
-        </foreach>
-        AND (i.user_id = #{userId} OR i.user_id IS NULL)
-        WHERE i.id IN
         <foreach collection="ids" open="(" separator="," close=")" item="id">
             #{id}
         </foreach>
@@ -134,4 +129,12 @@
         UPDATE dg_business_process_status SET business_status = #{businessStatus} WHERE business_id = #{businessId}
     </update>
 
+    <select id="getGuaranteeId" resultType="integer">
+        SELECT id FROM dg_guarantee_assign_user WHERE business_id = #{businessId} AND role_id = #{roleId}
+    </select>
+
+    <select id="getDgAssetsInvestigationId" resultType="integer">
+        SELECT id FROM dg_assets_investigation WHERE business_id = #{businessId} AND role_id = #{roleId}
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml

@@ -58,4 +58,15 @@
         </foreach>
     </select>
 
+    <!-- 改变所有业务id相同的审核状态,用于拒绝或者驳回 -->
+    <update id="updateAuditStatusByBusinessId">
+        UPDATE dg_compliance_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId}
+    </update>
+
+    <!-- 根据业务id和角色id改变该数据的操作状态 -->
+    <update id="updateOperationStatusById">
+       UPDATE dg_compliance_assign_user SET operating_status = #{operationStatus}
+       WHERE business_id = #{businessId} AND (role_id = 59 OR role_id = 60)
+    </update>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml

@@ -31,7 +31,7 @@
         LEFT JOIN dg_business_process_status AS b
         ON b.business_id = a.id
         WHERE c.del_or_not = 0
-        AND (l.consider = #{userId} OR l.consider_id IS NULL)
+        AND (l.consider_id = #{userId} OR l.consider_id IS NULL)
         AND l.role_id IN
         <foreach collection="roleIds" open="(" separator="," close=")" item="roleId">
             #{roleId}
@@ -54,10 +54,9 @@
         LEFT JOIN dg_business_process_status AS b
         ON b.business_id = a.id
         WHERE c.del_or_not = 0
-        AND (l.consider = #{userId} OR l.consider_id IS NULL)
+        AND l.id IN
-        AND l.role_id IN
+        <foreach collection="ids" open="(" separator="," close=")" item="id">
-        <foreach collection="roleIds" open="(" separator="," close=")" item="roleId">
+            #{id}
-            #{roleId}
         </foreach>
         ORDER BY a.create_time DESC
     </select>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml

@@ -8,7 +8,6 @@
         <result column="company_id" property="companyId" />
         <result column="consider_id" property="considerId" />
         <result column="remark" property="remark" />
-        <result column="status" property="status" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
     </resultMap>
@@ -52,6 +51,39 @@
         ORDER BY a.create_time DESC
     </select>
 
+    <select id="excelList" resultType="com.daqing.framework.domain.guarantee.po.DgWorkConferencePO">
+        SELECT a.business_code AS business_code,a.business_type AS business_type,a.apply_amount AS apply_amount,
+        a.apply_time AS apply_time,a.create_time AS create_time,c.name AS name,c.phone AS phone,w.audit_status AS audit_status,
+        w.operation_status AS operation_status,b.business_status AS business_status,i.user_id AS i_user_id,ass.emp_id AS ass_user_id,
+        m.emp_id AS m_user_id,ab.A AS a_user_id,ab.B AS b_user_id
+        FROM dg_work_conference_consider AS w
+        LEFT JOIN dg_apply_amount_info AS a
+        ON a.id = w.business_id
+        LEFT JOIN crms_customer AS c
+        ON a.company_id = c.id
+        LEFT JOIN dg_business_process_status AS b
+        ON b.business_id = a.id
+        LEFT JOIN (SELECT business_id,SUM(CASE role_id WHEN 59 THEN emp_id ELSE 0 END) AS A,
+        SUM(CASE role_id WHEN 60 THEN emp_id ELSE 0 END) AS B
+        FROM dg_guarantee_assign_user GROUP BY business_id) AS ab
+        ON a.id = ab.business_id
+        LEFT JOIN dg_compliance_investigation AS i
+        ON a.id = i.business_id
+        LEFT JOIN dg_assets_investigation AS ass
+        ON a.id = ass.business_id
+        LEFT JOIN dg_message_investigation AS m
+        ON a.id = m.business_id
+        WHERE c.del_or_not = 0
+        AND i.role_id = 70
+        AND ass.role_id = 64
+        AND m.role_id = 67
+        AND w.id IN
+        <foreach collection="ids" open="(" separator="," close=")" item="id">
+            #{id}
+        </foreach>
+        ORDER BY a.create_time DESC
+    </select>
+
     <!-- 审议 -->
     <update id="check">
         UPDATE dg_work_conference_consider

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java

@@ -245,6 +245,15 @@ public class EmployeeController implements EmployeeControllerApi {
         return new ResponseResult<>().SUCCESS(employeeService.getAccountAndDeptNameById(ids));
     }
 
+    /**
+     * 根据userId获取对应的员工姓名
+     */
+    @GetMapping("/listEmpNameByUserId")
+    public ResponseResult listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds) {
+
+        return new ResponseResult<List<EmployeeVO>>().SUCCESS(employeeService.listEmpNameByUserId(Arrays.asList(userIds)));
+    }
+
     /**
      * 新增用户角色
      *
@@ -263,6 +272,6 @@ public class EmployeeController implements EmployeeControllerApi {
 
     @GetMapping("/saveUserRole")
     public ResponseResult saveUserRole(@RequestParam("userId") Long userId, @RequestParam("roleId") Long roleId) {
-        return ResponseResult.SUCCESS(employeeService.saveUserRole(userId,roleId));
+        return ResponseResult.SUCCESS(employeeService.saveUserRole(userId, roleId));
     }
 }

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java

@@ -105,4 +105,6 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
     boolean insertUsrRole(@Param("list") List<DgGuaranteePO> list);
 
     int saveUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId);
+
+    List<EmployeeVO> listEmpNameByUserId(@Param("userIds") List<Long> userIds);
 }

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java

@@ -71,5 +71,7 @@ public interface EmployeeService extends IService<EmployeeEntity> {
     boolean insertUsrRole(List<DgGuaranteePO> list);
 
     Boolean saveUserRole(Long userId, Long roleId);
+
+    List<EmployeeVO> listEmpNameByUserId(List<Integer> userIds);
 }
 

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java

@@ -22,6 +22,7 @@ import com.daqing.framework.util.Md5Util;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONArray;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -620,4 +621,16 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
         }
         return false;
     }
+
+    /**
+     * 根据用户id获取对应的员工姓名
+     */
+    @Override
+    public List<EmployeeVO> listEmpNameByUserId(List<Integer> userIds) {
+        List<Long> userIdList = new ArrayList<>();
+        for (Integer userId : userIds) {
+            userIdList.add(userId.longValue());
+        }
+        return this.getBaseMapper().listEmpNameByUserId(userIdList);
+    }
 }

dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml

@@ -592,4 +592,17 @@
         GROUP BY hu.id
     </select>
 
+    <!-- 根据userId查询对应的员工姓名 -->
+    <select id="listEmpNameByUserId" parameterType="integer" resultType="com.daqing.framework.domain.hrms.ext.EmployeeVO">
+        SELECT u.id id,e.name name
+        FROM hrms_employee e
+        LEFT JOIN hrms_user u
+        ON e.user_id = u.id
+        WHERE u.del_or_not = 0
+        AND u.id IN
+        <foreach collection="userIds" open="(" separator="," close=")" item="userId">
+            #{userId}
+        </foreach>
+    </select>
+
 </mapper>

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AuditOpinionPO.java

@@ -1,5 +1,6 @@
 package com.daqing.framework.domain.guarantee.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
@@ -20,45 +21,50 @@ public class AuditOpinionPO implements Serializable {
     @ApiModelProperty("担保A角调查意见")
     private String aAuditOpinion;
 
-    @ApiModelProperty("A角姓名")
+    @ApiModelProperty("A角id")
     private Integer aEmpId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("A角调查时间")
     private Date aTime;
 
     @ApiModelProperty("担保B角调查意见")
     private String bAuditOpinion;
 
-    @ApiModelProperty("B角姓名")
+    @ApiModelProperty("B角id")
-    private String bEmpId;
+    private Integer bEmpId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("B角调查时间")
     private Date bTime;
 
     @ApiModelProperty("资产审核意见")
     private String assetAuditOpinion;
 
-    @ApiModelProperty("资产姓名")
+    @ApiModelProperty("资产id")
-    private String assetEmpId;
+    private Integer assetEmpId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("资产审核时间")
     private Date assetTime;
 
     @ApiModelProperty("信息审核意见")
     private String messageAuditOpinion;
 
-    @ApiModelProperty("信息姓名")
+    @ApiModelProperty("信息id")
-    private String messageEmpId;
+    private Integer messageEmpId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("信息审核时间")
     private Date messageTime;
 
     @ApiModelProperty("法规审核意见")
     private String regulationAuditOpinion;
 
-    @ApiModelProperty("法规姓名")
+    @ApiModelProperty("法规id")
-    private String regulationEmpId;
+    private Integer regulationEmpId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty("法规审核时间")
     private Date regulationTime;
 }

dq-framework-utils/pom.xml

@@ -47,6 +47,11 @@
             <artifactId>easyexcel</artifactId>
             <version>2.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>3.15</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>

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

@@ -17,6 +17,9 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-message-investigation/excelExport,\
   /api-guarantee/dg-assets-investigation/excelExport,\
   /api-guarantee/dg-guarantee-assign-user/excelExport,\
+  /api-guarantee/compliance/investigation/excelExport,\
+  /api-guarantee/work/conference/excelExport,\
+  /api-guarantee/committee/consider/excelExport,\
   /api-guarantee/dg-guarantee-letter-assign-user/exportGuaranteeLetter,\
   /api-guarantee/dg-guarantee-letter-assign-user/guaranteeLetterListExport,\
   /api-guarantee/dg-payment-confirmation-consider/paymentConfirmationListExport,\