Merge remote-tracking branch 'origin/master'

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

@@ -12,6 +12,7 @@ import com.daqing.framework.enums.OperationUnit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +45,10 @@ public class DgCopyUserController {
         List<CopyForMeResponse> copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest);
         //转换任务节点
         copyForMeList.forEach(copyForMeResponse -> {
+            //提单人为空，默认赋值客户
+            if (StringUtils.isEmpty(copyForMeResponse.getApplicant())){
+                copyForMeResponse.setApplicant("客户");
+            }
             String taskNode = copyForMeResponse.getTaskNode();
             if (taskNode != null) {
                 String converter = TaskNodeUtil.converter(taskNode);

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

@@ -19,9 +19,11 @@ import com.daqing.framework.enums.OperationUnit;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
+import com.daqing.framework.xss.SQLFilter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +35,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 流程效率
@@ -154,27 +157,26 @@ public class DgEfficiencyController {
         numResponse.setCopySendNum(size);
         //转换任务节点，并统计操作状态个数
         responseList.forEach(personalEfficiencyListResponse -> {
+            //耗时为空，默认为0
+            if (StringUtils.isEmpty(personalEfficiencyListResponse.getTimeConsuming())){
+                personalEfficiencyListResponse.setTimeConsuming("0天0小时0分钟");
+            }
+            //提单人为空，默认赋值客户
+            if (StringUtils.isEmpty(personalEfficiencyListResponse.getApplicant())){
+                personalEfficiencyListResponse.setApplicant("客户");
+            }
             String taskNode = personalEfficiencyListResponse.getTaskNode();
             if (taskNode != null) {
                 String converter = TaskNodeUtil.converter(taskNode);
                 personalEfficiencyListResponse.setTaskNode(converter);
             }
             if (personalEfficiencyListResponse.getOperatingStatus() != null) {
-                switch (personalEfficiencyListResponse.getOperatingStatus()) {
+                if (personalEfficiencyListResponse.getOperatingStatus()==0){
-                    case 0:
+                    numResponse.setInitiateNum(numResponse.getInitiateNum() + 1);
-                        numResponse.setInitiateNum(numResponse.getInitiateNum() + 1);
+                }else if (personalEfficiencyListResponse.getOperatingStatus()==1){
-                        break;
+                    numResponse.setPendingNum(numResponse.getPendingNum() + 1);
-                    case 1:
+                }else if (personalEfficiencyListResponse.getOperatingStatus()==2){
-                        numResponse.setPendingNum(numResponse.getPendingNum() + 1);
+                    numResponse.setProcessedNum(numResponse.getProcessedNum() + 1);
-                        break;
-                    case 2:
-                        numResponse.setProcessedNum(numResponse.getProcessedNum() + 1);
-                        break;
-                    default:
-                        numResponse.setInitiateNum(0);
-                        numResponse.setPendingNum(0);
-                        numResponse.setProcessedNum(0);
-                        break;
                 }
             }
         });
@@ -238,7 +240,20 @@ public class DgEfficiencyController {
                 }
             }
         }
-        return R.ok().data("responseList", responseList).data("statistics", numResponse);
+        //按时间降序排列
+        List<PersonalEfficiencyListResponse> collect = responseList.stream().sorted((o1, o2) -> {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                Date dt1 = format.parse(o1.getApplicationDate());
+                Date dt2 = format.parse(o2.getApplicationDate());
+                // 默认降序
+                return Long.compare(dt2.getTime(), dt1.getTime());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return 0;
+        }).collect(Collectors.toList());
+        return R.ok().data("responseList", collect).data("statistics", numResponse);
     }
 
     public static long getLongDate(String stringDate) {

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

@@ -41,17 +41,17 @@ public class CopyForMeResponse {
     @ExcelProperty(value = "任务节点",index = 3,converter = TaskNodeConverter.class)
     private String taskNode;
 
-    @ApiModelProperty("审批人")
+    // @ApiModelProperty("审批人")
-    @ExcelProperty(value = "审批人",index = 4)
+    // @ExcelProperty(value = "审批人",index = 4)
-    private String approve;
+    // private String approve;
 
-    @ApiModelProperty("审批时间")
+    @ApiModelProperty("完成时间")
-    @ExcelProperty(value = "审批时间",index = 5)
+    @ExcelProperty(value = "完成时间",index = 4)
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String approveDate;
 
     @ApiModelProperty("业务状态")
-    @ExcelProperty(value = "业务状态",index = 6,converter = BusinessStatusConverter.class)
+    @ExcelProperty(value = "业务状态",index = 5,converter = BusinessStatusConverter.class)
     private Integer businessStatus;
 
     @ExcelIgnore

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

@@ -204,20 +204,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(dgApplyAmountInfo.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        getEnclosure(businessApplication,dgEnclosureInfo);
-        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
         dgEnclosureInfoMapper.insert(dgEnclosureInfo);
 
         //根据企业id查询企业详情
@@ -264,6 +251,39 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         return 1;
     }
 
+    public void getEnclosure(BusinessApplicationRequest businessApplication,DgEnclosureInfo dgEnclosureInfo){
+        //上传附件信息
+//        if(businessApplication.getBusinessLicense()!=null)
+            dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+//        if(businessApplication.getLegalCardCopy()!=null)
+            dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+//        if(businessApplication.getMarriageCopy()!=null)
+            dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+//        if(businessApplication.getLegalCopy()!=null)
+            dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+//        if(businessApplication.getCompanyConstitution()!=null)
+            dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
+//        if(businessApplication.getAccountingFirm()!=null)
+            dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+//        if(businessApplication.getCompanyCredit()!=null)
+            dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
+//        if(businessApplication.getCreditReport()!=null)
+            dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+//        if(businessApplication.getCertificateAuthorization()!=null)
+            dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+//        if(businessApplication.getTaxCertificate()!=null)
+            dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+//        if(businessApplication.getMeetingMinutes()!=null)
+            dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+//        if(businessApplication.getAssessmentReport()!=null)
+            dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+//        if(businessApplication.getConversationSummary()!=null)
+            dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
+//        if(businessApplication.getInspectionPhotos()!=null)
+            dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
+
+    }
+
     @Override
     public PageUtils queryPage(Integer page, Integer size, String CustomerNumberOrName) {
         //分页参数
@@ -304,6 +324,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgApplyAmountList.getBusinessId());
 
         List<String>list = new ArrayList<>();
+        System.out.println(dgEnclosureInfo.getAccountingFirm());
         list.add(dgEnclosureInfo.getAccountingFirm());
         list.add(dgEnclosureInfo.getAssessmentReport());
         list.add(dgEnclosureInfo.getBusinessLicense());
@@ -332,20 +353,23 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 arr1List2.add(i,null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+/*        if(arr1List2.size()>0){
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(0).toString().equals("[]"))*/
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+            dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+            dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+            dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+            dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+            dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+            dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+            dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+            dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+            dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+            dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+            dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+            dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+            dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+            dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+//        }
 
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
@@ -433,20 +457,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(businessApplication.getBusinessId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        getEnclosure(businessApplication,dgEnclosureInfo);
-        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
 
         //根据业务id查询对应的附件信息
         DgEnclosureInfo dgEnclosureInfo1 = dgEnclosureInfoMapper.selectOne(new QueryWrapper<DgEnclosureInfo>().eq("business_id", businessApplication.getBusinessId()));

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

@@ -101,11 +101,11 @@ public class DgCopyUserServiceImpl extends ServiceImpl<DgCopyUserMapper, DgCopyU
                         if (response.getApplicantId()!=null && response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下，就往对象里面赋值
                             response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", ""));
                         }
-                        if (response.getApproveId()!=null){
+                        // if (response.getApproveId()!=null){
-                            if (response.getApproveId().equals(res.get("id"))) {//如果审批人id相同情况下，就往对象里面赋值
+                        //     if (response.getApproveId().equals(res.get("id"))) {//如果审批人id相同情况下，就往对象里面赋值
-                                response.setApprove(JSONObject.toJSONString(res.get("account")).replace("\"", ""));
+                        //         response.setApprove(JSONObject.toJSONString(res.get("account")).replace("\"", ""));
-                            }
+                        //     }
-                        }
+                        // }
                     }
                 }
             }

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

@@ -164,20 +164,23 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 arr1List2.add(i, null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+/*        if(arr1List2.size()>0){
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(0).toString().equals("[]"))*/
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+                dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+                dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+                dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+                dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+                dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+                dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+                dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+                dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+                dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+                dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+                dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+                dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+                dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+                dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+//        }
 
 
         //查询担保部经理审核的金额和期限

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

@@ -238,20 +238,23 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 arr1List2.add(i,null);
             }
         }
-        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+/*        if(arr1List2.size()>0){
-        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+            if(!arr1List2.get(0).toString().equals("[]"))*/
-        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+                dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+                dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+                dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+                dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+                dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+                dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+                dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+                dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+                dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+                dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+                dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+                dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+                dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+                dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+//        }
 
         //查询该业务id下对应的C角
         DgMessageInvestigation messageInvestigate = this.baseMapper.selectOne(new QueryWrapper<DgMessageInvestigation>()

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

@@ -46,6 +46,7 @@
         <if test="clientName != null and clientName != ''">
             AND cc.name LIKE '%' #{clientName} '%'
         </if>
+        order by aai.create_time desc
     </select>
 
 </mapper>

dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml

@@ -80,7 +80,7 @@
     </delete>
 
     <select id="uniqueRoleName" parameterType="string" resultType="java.lang.Integer">
-        select count(0) from hrms_role where `name` = #{name}
+        select count(0) from hrms_role where `name` = #{name} and del_or_not=0
     </select>
 
     <select id="selectRoleByUserId" parameterType="long" resultType="com.daqing.framework.domain.hrms.EmployeeRoleEntity">