格式转换

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

@@ -60,8 +60,8 @@ public class DgGuaranteeAssignUserController {
     public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size,
                                                   @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){
         //获取当前登录用户userId
-        String userId = dgApplyAmountInfoController.getUserId();
+        //String userId = dgApplyAmountInfoController.getUserId();
-        //String userId = "5";
+        String userId = "5";
         //根据角色查询担保部调查列表
         String roleIds = RedisUtil.get("dq:userRole:" + userId);
         PageUtils data = null;

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

@@ -23,7 +23,11 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    /**
+     * 业务id
+     */
+    @ApiModelProperty(value = "业务id")
+    private Integer businessId;
     /**
      * 企业id
      */
@@ -81,9 +85,23 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable
     private String phone;
 
     /**
-     * 状态
+     * 审批状态
      */
-    @ExcelProperty(value = "状态",index = 7)
+    @ExcelProperty(value = "审批状态",index = 7)
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "审批状态")
     private Integer status;
+
+    /**
+     * 业务状态
+     */
+    @ExcelProperty(value = "业务状态",index = 8)
+    @ApiModelProperty(value = "业务状态")
+    private Integer businessStatus;
+
+    /**
+     * 操作状态
+     */
+    @ExcelProperty(value = "操作状态",index = 9)
+    @ApiModelProperty(value = "操作状态")
+    private Integer operatingStatus;
 }

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

@@ -14,23 +14,19 @@ import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse;
 import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse;
 import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.util.ArraysUtil;
 import com.daqing.framework.domain.crms.CrmsCustomerRelated;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
-import com.daqing.framework.domain.crms.response.CompanyCustomerResponse;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
 import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
-import com.daqing.framework.domain.hrms.DeptEntity;
-import com.daqing.framework.domain.hrms.ext.EmployeeListVO;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RandomUtil;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -87,6 +83,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             e.printStackTrace();
         }
         System.out.println("反担保措施======"+ Arrays.toString(businessApplication.getEnGuaranteeMeasures()));
+        System.out.println("反担保措施======"+ ArraysUtil.toString(businessApplication.getEnGuaranteeMeasures()));
         //申请贷款相关信息
         DgApplyAmountInfo dgApplyAmountInfo = new DgApplyAmountInfo();
         dgApplyAmountInfo.setCompanyId(businessApplication.getCompanyId());
@@ -96,7 +93,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgApplyAmountInfo.setBank(businessApplication.getBank());//贷款银行
         dgApplyAmountInfo.setAmountWide(businessApplication.getAmountWide());//贷款用途
         dgApplyAmountInfo.setOtherAmountWide(businessApplication.getOtherAmountWide());//其他贷款用途
-        dgApplyAmountInfo.setEnGuaranteeMeasures(Arrays.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
+        dgApplyAmountInfo.setEnGuaranteeMeasures(ArraysUtil.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
         dgApplyAmountInfo.setBusinessCode(RandomUtil.getRandomNum(12));
@@ -126,20 +123,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(dgApplyAmountInfo.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(Arrays.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(Arrays.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(Arrays.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(Arrays.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(Arrays.toString(businessApplication.getCompanyConstitution()));//公司章程
+        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(Arrays.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(Arrays.toString(businessApplication.getCompanyCredit()));//企业信用报告
+        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(Arrays.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(Arrays.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(Arrays.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(Arrays.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(Arrays.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(Arrays.toString(businessApplication.getConversationSummary()));
+        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(Arrays.toString(businessApplication.getInspectionPhotos()));
+        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
         return dgEnclosureInfoMapper.insert(dgEnclosureInfo);
     }
 
@@ -257,7 +254,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgApplyAmountInfo.setBank(businessApplication.getBank());//贷款银行
         dgApplyAmountInfo.setAmountWide(businessApplication.getAmountWide());//贷款用途
         dgApplyAmountInfo.setOtherAmountWide(businessApplication.getOtherAmountWide());//其他贷款用途
-        dgApplyAmountInfo.setEnGuaranteeMeasures(Arrays.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
+        dgApplyAmountInfo.setEnGuaranteeMeasures(ArraysUtil.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
         dgApplyAmountInfo.setUpdateTime(new Date());
@@ -267,20 +264,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(businessApplication.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(Arrays.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(Arrays.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(Arrays.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(Arrays.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(Arrays.toString(businessApplication.getCompanyConstitution()));//公司章程
+        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(Arrays.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(Arrays.toString(businessApplication.getCompanyCredit()));//企业信用报告
+        dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        dgEnclosureInfo.setCreditReport(Arrays.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+        dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(Arrays.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+        dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(Arrays.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+        dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(Arrays.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(Arrays.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+        dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        dgEnclosureInfo.setConversationSummary(Arrays.toString(businessApplication.getConversationSummary()));
+        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(Arrays.toString(businessApplication.getInspectionPhotos()));
+        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
 
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id",businessApplication.getId()));

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

@@ -13,6 +13,7 @@ import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest;
 import com.daqing.financial.guarantee.model.response.*;
 import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.util.ArraysUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
@@ -116,12 +117,15 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         List arr1List2 = new ArrayList<>();
 
         for(int i=0;i<list.size();i++){
-            if(list.get(i).length()>0){
+            List<String> arr1List;
+            if(list.get(i)!=null){
                 String a1 = list.get(i).substring(1,list.get(i).length()-1);
                 String arr1[]=a1.split(",");
-                List<String> arr1List = Arrays.asList(arr1);
+                arr1List = Arrays.asList(arr1);
                 arr1List2.add(i,arr1List);
-
+                System.out.println("arr1LIst===="+arr1List);
+            }else{
+                arr1List2.add(i,null);
             }
         }
         dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
@@ -164,15 +168,15 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(guaranteeAssignUser.getBusinessId());//业务id
         dgEnclosureInfo.setCompanyId(guaranteeAssignUser.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(Arrays.toString(investigateGuaranteeRequest.getBusinessLicense()));//营业执照复印件
+        dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(investigateGuaranteeRequest.getBusinessLicense()));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(Arrays.toString(investigateGuaranteeRequest.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(investigateGuaranteeRequest.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(Arrays.toString(investigateGuaranteeRequest.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(investigateGuaranteeRequest.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(Arrays.toString(investigateGuaranteeRequest.getLegalCopy()));//法定代表人身份证明
+        dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(investigateGuaranteeRequest.getLegalCopy()));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(Arrays.toString(investigateGuaranteeRequest.getCompanyConstitution()));//公司章程
+        dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(investigateGuaranteeRequest.getCompanyConstitution()));//公司章程
-        dgEnclosureInfo.setAccountingFirm(Arrays.toString(investigateGuaranteeRequest.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(investigateGuaranteeRequest.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setMeetingMinutes(Arrays.toString(investigateGuaranteeRequest.getMeetingMinutes()));//股东会会议纪要
+        dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(investigateGuaranteeRequest.getMeetingMinutes()));//股东会会议纪要
-        dgEnclosureInfo.setConversationSummary(Arrays.toString(investigateGuaranteeRequest.getConversationSummary()));
+        dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(investigateGuaranteeRequest.getConversationSummary()));
-        dgEnclosureInfo.setInspectionPhotos(Arrays.toString(investigateGuaranteeRequest.getInspectionPhotos()));
+        dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(investigateGuaranteeRequest.getInspectionPhotos()));
 
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id",guaranteeAssignUser.getBusinessId()));
@@ -205,7 +209,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
         dgGuaranteeAssignUser.setId(approvalGuaranteeRequest.getId());
         dgGuaranteeAssignUser.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
-        dgGuaranteeAssignUser.setRemark(Arrays.toString(approvalGuaranteeRequest.getRemark()));//补充调查原因
+        dgGuaranteeAssignUser.setRemark(ArraysUtil.toString(approvalGuaranteeRequest.getRemark()));//补充调查原因
         dgGuaranteeAssignUser.setStatus(approvalGuaranteeRequest.getStatus());
         dgGuaranteeAssignUser.setAmount(approvalGuaranteeRequest.getAmount());//金额
         dgGuaranteeAssignUser.setTerm(approvalGuaranteeRequest.getTerm());//期限

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/ArraysUtil.java

@@ -0,0 +1,169 @@
+package com.daqing.financial.guarantee.util;
+
+
+/**
+ * @auther River
+ * @date 2020/11/9 15:53
+ */
+public class ArraysUtil {
+    public static String toString(long[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+    public static String toString(int[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+    public static String toString(short[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+
+    public static String toString(char[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+
+    public static String toString(byte[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+
+    public static String toString(boolean[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+
+    public static String toString(float[] a) {
+        if (a == null)
+            return "null";
+
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+    public static String toString(double[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+    public static String toString(Object[] a) {
+        if (a == null)
+            return "null";
+
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(String.valueOf(a[i]));
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(",");
+        }
+    }
+
+}
+

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

@@ -9,6 +9,7 @@
         <result column="emp_id" property="empId" />
         <result column="type" property="type" />
         <result column="status" property="status" />
+        <result column="operating_status" property="operatingStatus" />
         <result column="amount" property="amount" />
         <result column="term" property="term" />
         <result column="remark" property="remark" />
@@ -18,12 +19,13 @@
     </resultMap>
 
     <select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.GuaranteeListResponse">
-        select ai.id,ai.company_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,ai.create_time,
+        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
-        ai.status,cc.name,cc.phone
+        au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_guarantee_assign_user au
         left join dg_apply_amount_info ai on au.business_id = ai.id
         left join crms_company_customer ccl on ai.company_id = ccl.id
         left join crms_customer cc on cc.id = ccl.customer_id
+        left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
         <where>
             au.role_id in
             <foreach collection="roleIdlist" open="(" separator="," close=")" item="id">

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

@@ -58,6 +58,11 @@ public class DgGuaranteeAssignUser implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 操作状态: 0->已发起；2->待处理；3->已处理；
+     */
+    private Integer operatingStatus;
+
     /**
      * 审核金额
      */