diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
index 1a5a7dd2..9c816553 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
@@ -154,14 +154,11 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
*/
@GetMapping("/deleteServerFile")
public boolean deleteServerFile(@RequestParam("filePath")String filePath){
- log.info("filePath=========="+filePath);
boolean delete_flag = false;
String certainPath =PromptSuccess.FILE_URL_PATH;
filePath = certainPath + filePath;
- System.out.println("filePath============"+filePath);
File file = new File(filePath);
if (!file.exists()) {
- System.out.println("file==============="+file.getName());
return delete_flag;
}
try{
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgGuaranteeAssignUserResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgGuaranteeAssignUserResponse.java
new file mode 100644
index 00000000..43717ad3
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgGuaranteeAssignUserResponse.java
@@ -0,0 +1,101 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 担保部记录
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-05
+ */
+@Data
+@TableName("dg_guarantee_assign_user")
+public class DgGuaranteeAssignUserResponse implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 业务id
+ */
+ private Integer businessId;
+
+ /**
+ * 角色id
+ */
+ private Integer roleId;
+
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+
+ /**
+ * 用户id
+ */
+ private Integer empId;
+
+ /**
+ * 类型（1：第一审批人 2：指派人AB角 3:第一审批人审核 3：经理）
+ */
+ private Integer type;
+
+ /**
+ * 状态(1：待指派 2：审核中 3：审核通过 4：审核不通过 5：驳回)
+ */
+ private Integer status;
+
+ /**
+ * 操作状态: 0->已发起；2->待处理；3->已处理；
+ */
+ private Integer operatingStatus;
+
+ /**
+ * 审核金额
+ */
+ private BigDecimal amount;
+
+ /**
+ * 期限
+ */
+ private String term;
+
+ /**
+ * 补充调查原因
+ */
+ private List remark;
+
+ private String remarks;
+
+ /**
+ * 其他原因
+ */
+ private String otherRemark;
+
+ /**
+ * 审核意见
+ */
+ private String applyContent;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
index 3b2e0354..423594cf 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java
@@ -43,7 +43,7 @@ public class GuaranteeDetailResponse implements Serializable {
* 担保详情
*/
@ApiModelProperty(value = "担保详细")
- private DgGuaranteeAssignUser assignUser;
+ private DgGuaranteeAssignUserResponse assignUser;
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index a990b74a..d696bc31 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -199,9 +199,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl()
+ DgGuaranteeAssignUser assignUser1 = this.baseMapper.selectOne(new QueryWrapper()
.eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
- guaranteeAssignUser.setAmount(assignUser.getAmount());
- guaranteeAssignUser.setTerm(assignUser.getTerm());
+ guaranteeAssignUser.setAmount(assignUser1.getAmount());
+ guaranteeAssignUser.setTerm(assignUser1.getTerm());
+ DgGuaranteeAssignUserResponse assignUser = new DgGuaranteeAssignUserResponse();
+ BeanUtils.copyProperties(guaranteeAssignUser,assignUser);
+ assignUser.setRemarks(assignUser1.getRemark());
+
+ String remarks = assignUser1.getRemark();
+ if(remarks != null){
+ if (remarks.length() > 0) {
+ String a = remarks.substring(1, remarks.length() - 1);
+ String arry[] = a.split(",");
+ List demoList = Arrays.asList(arry);
+ assignUser.setRemark(demoList);
+ }
+ }
GuaranteeDetailResponse guaranteeDetailResponse = new GuaranteeDetailResponse();
guaranteeDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
guaranteeDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
guaranteeDetailResponse.setLinkedHashMap(linkedList);
- guaranteeDetailResponse.setAssignUser(guaranteeAssignUser);
+ guaranteeDetailResponse.setAssignUser(assignUser);
return guaranteeDetailResponse;
}
@@ -221,7 +235,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl