bug修复

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{

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;
+
+/**
+ * <p>
+ * 担保部记录
+ * </p>
+ *
+ * @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<String> 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;
+}

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

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

@@ -199,9 +199,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             status.setBusinessStatus(StatusCode.YW_IN_PROGRESS);//业务状态设置为进行中
             dgBusinessProcessStatusMapper.insert(status);
         }
-        //同时往审核流程进程表新增一条记录
+        //如果不为保存就往审核流程进程表新增一条记录
-        String account = dgApplyAmountInfoController.getAccount();
+        if(businessApplication.getIsSaveOrCommit()==1){
-        AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
+            String account = dgApplyAmountInfoController.getAccount();
+            AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
+        }
         return 1;
     }
 

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

@@ -28,6 +28,7 @@ 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;
@@ -167,16 +168,29 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
 
         //查询担保部经理审核的金额和期限
-        DgGuaranteeAssignUser assignUser = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+        DgGuaranteeAssignUser assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
                 .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
-        guaranteeAssignUser.setAmount(assignUser.getAmount());
+        guaranteeAssignUser.setAmount(assignUser1.getAmount());
-        guaranteeAssignUser.setTerm(assignUser.getTerm());
+        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<String> 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<DgGuaranteeAss
             dgGuaranteeAssignUser.setId(investigateGuaranteeRequest.getId());//主键id
             dgGuaranteeAssignUser.setRemark(investigateGuaranteeRequest.getApplyContent());//审核意见
 
-            if(investigateGuaranteeRequest.getIsSaveOrCommit()==1){//提交
+            if(investigateGuaranteeRequest.getIsSaveOrCommit() != null && investigateGuaranteeRequest.getIsSaveOrCommit()==1){//提交
                 //AB角调查，修改审核意见以及状态
                 dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//状态为审核中
                 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
@@ -360,10 +374,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         } else {
             deptName = "担保部B角";
         }
-        //同时往审核流程进程表新增一条记录
+        //不为保存的情况则往审核流程进程表新增一条记录
-        String account = dgApplyAmountInfoController.getAccount();
+        if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
-        AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2);
+            String account = dgApplyAmountInfoController.getAccount();
-
+            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2);
+        }
         return 1;
     }
 
@@ -583,6 +598,10 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
             }
         }
+        //同时往审核流程进程表新增一条记录
+        String account = dgApplyAmountInfoController.getAccount();
+        AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2);
+
         return ResponseResult.SUCCESS();
     }