From abe5ae271e8aa130ae51bc03874a2d8c6ce1aae2 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 17 Nov 2020 15:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmsCompanyPersonalController.java | 9 +- .../mapper/CrmsCompanyPersonalMapper.java | 3 +- .../service/ICrmsCompanyPersonalService.java | 2 +- .../impl/CrmsCompanyPersonalServiceImpl.java | 4 +- .../src/main/resources/bootstrap.properties | 2 +- .../mapper/crms/CompanyCustomerDao.xml | 1 + .../mapper/crms/CrmsCompanyPersonalMapper.xml | 3 + .../resources/mapper/crms/CustomerDao.xml | 2 +- .../DgApplyAmountInfoController.java | 4 +- .../DgGuaranteeInvestigationController.java | 20 --- .../guarantee/feign/CrmsFeignService.java | 8 + .../mapper/DgApplyAmountInfoMapper.java | 2 + .../mapper/DgEnclosureInfoMapper.java | 3 +- .../DgGuaranteeInvestigationMapper.java | 18 --- .../request/BusinessApplicationRequest.java | 18 +++ .../BusinessApplicationDetailResponse.java | 10 +- .../BusinessApplicationListResponse.java | 11 +- .../response/DgApplyAmountInfoResponse.java | 114 ++++++++++++++ .../response/DgEnclosureInfoResponse.java | 138 +++++++++++++++++ .../IDgGuaranteeInvestigationService.java | 16 -- .../impl/DgApplyAmountInfoServiceImpl.java | 143 +++++++++++++----- .../DgGuaranteeInvestigationServiceImpl.java | 20 --- .../src/main/resources/bootstrap.properties | 2 +- .../guarantee/DgApplyAmountInfoMapper.xml | 4 + .../guarantee/DgEnclosureInfoMapper.xml | 2 +- .../DgGuaranteeInvestigationMapper.xml | 21 --- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../response/CompanyCustomerResponse.java | 5 + .../domain/guarantee/DgApplyAmountInfo.java | 10 ++ .../domain/guarantee/DgEnclosureInfo.java | 10 ++ .../guarantee/DgGuaranteeInvestigation.java | 87 ----------- .../src/main/resources/bootstrap.properties | 2 +- 33 files changed, 454 insertions(+), 244 deletions(-) delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeInvestigationController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeInvestigationMapper.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgApplyAmountInfoResponse.java create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgEnclosureInfoResponse.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeInvestigationService.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeInvestigationServiceImpl.java delete mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java index af85d191..7290e587 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java @@ -39,8 +39,9 @@ public class CrmsCompanyPersonalController { */ @GetMapping("/companyPersonalList") @ApiOperation(value = "个人/企业关联人列表") - public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size) { - PageUtils data = crmsCompanyPersonalService.queryPage(page, size); + public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size + , @RequestParam(value="customerId",required = false) Integer customerId) { + PageUtils data = crmsCompanyPersonalService.queryPage(page, size, customerId); return new ResponseResult().SUCCESS(data); } @@ -70,9 +71,9 @@ public class CrmsCompanyPersonalController { /** * 删除个人/企业关联人 */ - @GetMapping("/deleteCompanyPersonal") + @PostMapping("/deleteCompanyPersonal") @ApiOperation(value = "删除个人/企业关联人") - public ResponseResult deleteCompanyPersonal(@RequestParam("ids") Long[] ids) { + public ResponseResult deleteCompanyPersonal(@RequestBody Long[] ids) { boolean result = crmsCompanyPersonalService.removeByIds(Arrays.asList(ids)); //同时删除关联关系 boolean relate = crmsCustomerRelatedService.deleteByRelateIds(Arrays.asList(ids)); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java index 8bd2b943..09ecd3a4 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java @@ -17,7 +17,8 @@ import org.apache.ibatis.annotations.Param; */ @Mapper public interface CrmsCompanyPersonalMapper extends BaseMapper { - IPage pageByCondition(Page page); boolean updateIsExistRelated(@Param("id") Integer id, @Param("isExistRelated") Integer isExistRelated); + + IPage pageByCondition(Page page, Integer customerId); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java index a95768b3..6ee22d18 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java @@ -14,7 +14,7 @@ import com.daqing.framework.utils.PageUtils; */ public interface ICrmsCompanyPersonalService extends IService { - PageUtils queryPage(Integer page, Integer size); + PageUtils queryPage(Integer page, Integer size, Integer customerId); boolean updateIsExistRelated(Integer id, Integer isExistRelated); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java index bc7ee781..fdb8a4f9 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; @Service public class CrmsCompanyPersonalServiceImpl extends ServiceImpl implements ICrmsCompanyPersonalService { @Override - public PageUtils queryPage(Integer page, Integer size) { + public PageUtils queryPage(Integer page, Integer size, Integer customerId) { //分页参数 if (page <= 0) { page = 1; @@ -28,7 +28,7 @@ public class CrmsCompanyPersonalServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size)); + IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerId); return new PageUtils(positionVO); } diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index 6cccc927..58a12085 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -2,7 +2,7 @@ #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml index b0bbc85d..81c743d1 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -48,6 +48,7 @@ FROM crms_company_customer cu left join crms_customer cc on cu.customer_id = cc.id + cc.del_or_not=0 and cc.status=0 AND cc.code LIKE CONCAT('%',#{applyAmountInfo.code},'%') diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml index e50107d1..4cd6ed18 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml @@ -33,5 +33,8 @@ select cp.id,cp.relationship,cp.`type`,cp.related_name,cp.phone,cp.address from crms_company_personal cp left join crms_customer_related cr on cr.related_id=cp.id + + cr.customer_id=#{customerId} + diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index 807dbea4..e77752a5 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -92,7 +92,7 @@ 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 21e9a588..94b72f4a 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 @@ -165,7 +165,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA e.printStackTrace(); } //根据userId获取用户名以及部门名称 - ResponseResult employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId)); + ResponseResult employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5L); PageUtils data = applyAmountInfoService.queryPage(page, size,CustomerNumberOrName); //遍历data里面的数据提单人id,找出匹配id,将用户名以及部门名称赋值进去 @@ -209,7 +209,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA * @param id * @return */ - @PostMapping("/revokeBusinessApplication") + @GetMapping("/revokeBusinessApplication") @ApiOperation(value = "根据业务id撤销业务申请内容") public ResponseResult revokeBusinessApplication(@RequestParam("id") Integer id){ int result = applyAmountInfoService.revokeBusinessApplication(id); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeInvestigationController.java deleted file mode 100644 index 521f11f0..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeInvestigationController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 担保调查 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@RestController -@RequestMapping("/dg-guarantee-investigation") -public class DgGuaranteeInvestigationController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java index 70129446..f6d770ec 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java @@ -5,6 +5,7 @@ import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.model.response.ResponseResult; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -33,4 +34,11 @@ public interface CrmsFeignService { */ @PostMapping("/crms-company-personal/updateIsExistRelated") ResponseResult updateIsExistRelated(@RequestParam("id")Integer id, @RequestParam("isExistRelated")Integer isExistRelated); + + /** + * 个人/企业关联人列表 + */ + @GetMapping("/crms-company-personal/companyPersonalList") + ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size, @RequestParam("customerId") Integer customerId); + } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java index 6e8bfe43..ea5fcb3f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; +import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,5 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { List excelList(); + DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEnclosureInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEnclosureInfoMapper.java index df20c7e4..308d933d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEnclosureInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEnclosureInfoMapper.java @@ -1,6 +1,7 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; import com.daqing.framework.domain.guarantee.DgEnclosureInfo; import org.apache.ibatis.annotations.Mapper; @@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DgEnclosureInfoMapper extends BaseMapper { - DgEnclosureInfo selectByCompanyId(Integer id); + DgEnclosureInfoResponse selectByCompanyId(Integer id); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeInvestigationMapper.java deleted file mode 100644 index 7b77f57c..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeInvestigationMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.daqing.financial.guarantee.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 担保调查 Mapper 接口 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@Mapper -public interface DgGuaranteeInvestigationMapper extends BaseMapper { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java index 34934264..443d34dd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java @@ -57,6 +57,12 @@ public class BusinessApplicationRequest implements Serializable { @ApiModelProperty(value = "贷款用途") private String amountWide; + /** + * 其他贷款用途 + */ + @ApiModelProperty(value = "其他贷款用途") + private String otherAmountWide; + /** * 反担保措施（中划线隔开） */ @@ -160,6 +166,18 @@ public class BusinessApplicationRequest implements Serializable { @ApiModelProperty(value = "反担保资料和评估报告") private String[] assessmentReport; + /** + * 谈话纪要 + */ + @ApiModelProperty(value = "谈话纪要") + private String[] conversationSummary; + + /** + * 考察照片 + */ + @ApiModelProperty(value = "考察照片") + private String[] inspectionPhotos; + /** * 区分保存和提交按钮 true->commit */ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java index 3f948c92..e4eaf70c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java @@ -26,7 +26,7 @@ public class BusinessApplicationDetailResponse implements Serializable { * 业务申请详细 */ @ApiModelProperty(value = "业务申请详细") - private DgApplyAmountInfo dgApplyAmountInfo; + private DgApplyAmountInfoResponse dgApplyAmountInfo; /** * 企业详细 @@ -38,7 +38,13 @@ public class BusinessApplicationDetailResponse implements Serializable { * 附件详细 */ @ApiModelProperty(value = "附件详细") - private DgEnclosureInfo dgEnclosureInfo; + private DgEnclosureInfoResponse dgEnclosureInfo; + + /** + * 关联人信息列表 + */ + @ApiModelProperty(value = "关联人信息列表") + private LinkedHashMap linkedHashMap2; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java index b7a83f87..e98da7ef 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java @@ -89,16 +89,23 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser /** * 提单人 */ - @ExcelProperty(value = "提单人",index = 7) + @ExcelProperty(value = "提单人",index = 8) @ApiModelProperty(value = "提单人") private String account; /** * 部门名称 */ - @ExcelProperty(value = "部门名称",index = 8) + @ExcelProperty(value = "部门名称",index = 9) @ApiModelProperty(value = "部门名称") private String deptName; + /** + * 状态 + */ + @ExcelProperty(value = "状态",index = 7) + @ApiModelProperty(value = "状态") + private Integer status; + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgApplyAmountInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgApplyAmountInfoResponse.java new file mode 100644 index 00000000..e560289e --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgApplyAmountInfoResponse.java @@ -0,0 +1,114 @@ +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 +public class DgApplyAmountInfoResponse implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 企业id + */ + private Integer companyId; + + /** + * 提单人id + */ + private Integer presenterId; + + /** + * 申请额度 + */ + private BigDecimal applyAmount; + + /** + * 申请期限 + */ + private String applyTime; + + /** + * 贷款银行（用中划线隔开） + */ + private String bank; + + /** + * 贷款用途 + */ + private String amountWide; + + /** + * 其他贷款用途 + */ + private String otherAmountWide; + + /** + * 反担保措施（中划线隔开） + */ + private List enGuaranteeMeasure; + + /** + * 反担保措施（中划线隔开） + */ + private String enGuaranteeMeasures; + + /** + * 业务类型 + */ + private String businessType; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 反担保措施描述 + */ + private String description; + + /** + * 状态 1->审核中；2->已审核；3->拒绝；4->驳回； + */ + private Integer status; + + /** + * 审批人Id + */ + private Integer approvalId; + + /** + * 审批意见 + */ + private String remark; + + /** + * 业务编号 + */ + private String businessCode; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgEnclosureInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgEnclosureInfoResponse.java new file mode 100644 index 00000000..d5700e22 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgEnclosureInfoResponse.java @@ -0,0 +1,138 @@ +package com.daqing.financial.guarantee.model.response; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 申请贷款信息 + *

+ * + * @author Qyq + * @since 2020-11-05 + */ +@Data +public class DgEnclosureInfoResponse 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 companyId; + + /** + * 营业执照复印件 + */ + private List businessLicenseList; + + /** + * 上传法定代表人夫妻及企业实际经营者身份证复印件 + */ + private List legalCardCopyList; + + /** + * 法定代表人夫妻户口本，结婚证（离婚证）复印件 + */ + private List marriageCopyList; + + /** + * 法定代表人身份证明 + */ + private List legalCopyList; + + /** + * 公司章程 + */ + private List companyConstitutionList; + + /** + * 会计师事务所审计的上一年度及本年度审计报告 + */ + private List accountingFirmList; + + /** + * 企业信用报告 + */ + private List companyCreditList; + + /** + * 企业法人夫妇信用报告，实际经营者信用报告 + */ + private List creditReportList; + + /** + * 征信业务授权书，承诺书 + */ + private List certificateAuthorizationList; + + /** + * 增值税纳税申报表首表复印件/完税证明 + */ + private List taxCertificateList; + + /** + * 股东会会议纪要 + */ + private List meetingMinutesList; + + /** + * 反担保资料和评估报告 + */ + private List assessmentReportList; + + /** + * 谈话纪要 + */ + private List conversationSummaryList; + + /** + * 考察照片 + */ + private List inspectionPhotosList; + + private String businessLicense; + + private String legalCardCopy; + + private String marriageCopy; + + private String legalCopy; + + private String companyConstitution; + + private String accountingFirm; + + private String companyCredit; + + private String creditReport; + + private String certificateAuthorization; + + private String taxCertificate; + + private String meetingMinutes; + + private String assessmentReport; + + private String conversationSummary; + + private String inspectionPhotos; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeInvestigationService.java deleted file mode 100644 index fd7ee3a9..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeInvestigationService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.daqing.financial.guarantee.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation; - -/** - *

- * 担保调查 服务类 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -public interface IDgGuaranteeInvestigationService extends IService { - -} 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 ca685dbb..ea3c826b 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 @@ -10,6 +10,8 @@ import com.daqing.financial.guarantee.mapper.DgEnclosureInfoMapper; import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest; import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; +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.framework.domain.crms.CrmsCustomerRelated; @@ -23,6 +25,7 @@ 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; @@ -39,9 +42,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; /** *

@@ -85,18 +86,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl0){ + String a = measures.substring(1,measures.length()-1); + String arry[]=a.split(","); + List demoList = Arrays.asList(arry); + dgApplyAmountInfo.setEnGuaranteeMeasure(demoList); + System.out.println("arry==============="+demoList); + } + System.out.println("业务申请详细========="+dgApplyAmountInfo); DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest(); @@ -165,20 +179,67 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl pojos = mapper.convertValue(linkedList, new TypeReference>() {});*/ - System.out.println("企业详细============"+linkedList); //查询附件详细，附件关联业务主键id - DgEnclosureInfo dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(id); + DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(id); + + Listlist = new ArrayList<>(); + list.add(dgEnclosureInfo.getAccountingFirm()); + list.add(dgEnclosureInfo.getAssessmentReport()); + list.add(dgEnclosureInfo.getBusinessLicense()); + list.add(dgEnclosureInfo.getCertificateAuthorization()); + list.add(dgEnclosureInfo.getCompanyConstitution()); + list.add(dgEnclosureInfo.getCompanyCredit()); + list.add(dgEnclosureInfo.getConversationSummary()); + list.add(dgEnclosureInfo.getCreditReport()); + list.add(dgEnclosureInfo.getInspectionPhotos()); + list.add(dgEnclosureInfo.getLegalCardCopy()); + list.add(dgEnclosureInfo.getLegalCopy()); + list.add(dgEnclosureInfo.getTaxCertificate()); + list.add(dgEnclosureInfo.getMeetingMinutes()); + list.add(dgEnclosureInfo.getMarriageCopy()); + + List arr1List2 = new ArrayList<>(); + + for(int i=0;i0){ + String a1 = list.get(i).substring(1,list.get(i).length()-1); + String arr1[]=a1.split(","); + List arr1List = Arrays.asList(arr1); + arr1List2.add(i,arr1List); + + } + } + dgEnclosureInfo.setAccountingFirmList((List) arr1List2.get(0)); + dgEnclosureInfo.setAssessmentReportList((List) arr1List2.get(1)); + dgEnclosureInfo.setBusinessLicenseList((List) arr1List2.get(2)); + dgEnclosureInfo.setCertificateAuthorizationList((List) arr1List2.get(3)); + dgEnclosureInfo.setCompanyConstitutionList((List) arr1List2.get(4)); + dgEnclosureInfo.setCompanyCreditList((List) arr1List2.get(5)); + dgEnclosureInfo.setConversationSummaryList((List) arr1List2.get(6)); + dgEnclosureInfo.setCreditReportList((List) arr1List2.get(7)); + dgEnclosureInfo.setInspectionPhotosList((List) arr1List2.get(8)); + dgEnclosureInfo.setLegalCardCopyList((List) arr1List2.get(9)); + dgEnclosureInfo.setLegalCopyList((List) arr1List2.get(10)); + dgEnclosureInfo.setTaxCertificateList((List) arr1List2.get(11)); + dgEnclosureInfo.setMeetingMinutesList((List) arr1List2.get(12)); + dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); + System.out.println("附件详细=============="+dgEnclosureInfo); +/* int page=1; + int size=10; + //关联人信息列表展示 + ResponseResult list = crmsFeignService.companyPersonalList(page,size,dgApplyAmountInfo.getCompanyId()); + LinkedHashMap personalList = (LinkedHashMap)list.getData(); + System.out.println("关联人信息列表======================="+personalList);*/ + BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse(); businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo); businessApplicationDetail.setDgEnclosureInfo(dgEnclosureInfo); businessApplicationDetail.setLinkedHashMap(linkedList); - + //businessApplicationDetail.setLinkedHashMap2(personalList); return businessApplicationDetail; } @@ -192,7 +253,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl().eq("business_id",businessApplication.getId())); @@ -247,7 +310,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5l); + ResponseResult employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId)); try { List list = this.getBaseMapper().excelList(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeInvestigationServiceImpl.java deleted file mode 100644 index b6adcfe7..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeInvestigationServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.daqing.financial.guarantee.service.impl; - -import com.daqing.financial.guarantee.mapper.DgGuaranteeInvestigationMapper; -import com.daqing.financial.guarantee.service.IDgGuaranteeInvestigationService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation; -import org.springframework.stereotype.Service; - -/** - *

- * 担保调查 服务实现类 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@Service -public class DgGuaranteeInvestigationServiceImpl extends ServiceImpl implements IDgGuaranteeInvestigationService { - -} diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index b57d1313..670bae18 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-guarantee #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml index db4cc87e..0d216ce6 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml @@ -38,4 +38,8 @@ left join crms_customer cc on cc.id = ccl.customer_id + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEnclosureInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEnclosureInfoMapper.xml index 90b6a279..b5d52330 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEnclosureInfoMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEnclosureInfoMapper.xml @@ -21,7 +21,7 @@ - select * from dg_enclosure_info where business_id=#{id} diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml deleted file mode 100644 index 2cd658f3..00000000 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 5c6e276b..484333b1 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ # 开发和测试环境（dev） spring.application.name=dq-financial-hrms-auth -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index beabdee9..4b44d356 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 #spring.cloud.nacos.config.group=prod diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CompanyCustomerResponse.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CompanyCustomerResponse.java index a171afa2..fac6f819 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CompanyCustomerResponse.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CompanyCustomerResponse.java @@ -73,6 +73,11 @@ public class CompanyCustomerResponse implements Serializable { */ @ApiModelProperty(value = "业务来源") private String businessSource; + /** + * 是否存在关联人 + */ + @ApiModelProperty(value = "是否存在关联人") + private Integer isExistRelated; /** * 客户基本信息表id */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java index 2c3c7d1a..423e7717 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java @@ -58,6 +58,11 @@ public class DgApplyAmountInfo implements Serializable { */ private String amountWide; + /** + * 其他贷款用途 + */ + private String otherAmountWide; + /** * 反担保措施（中划线隔开） */ @@ -96,4 +101,9 @@ public class DgApplyAmountInfo implements Serializable { */ private String remark; + /** + * 业务编号 + */ + private String businessCode; + } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgEnclosureInfo.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgEnclosureInfo.java index ee74e120..f0846ad3 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgEnclosureInfo.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgEnclosureInfo.java @@ -96,4 +96,14 @@ public class DgEnclosureInfo implements Serializable { * 反担保资料和评估报告 */ private String assessmentReport; + + /** + * 谈话纪要 + */ + private String conversationSummary; + + /** + * 考察照片 + */ + private String inspectionPhotos; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java deleted file mode 100644 index dc1dc64c..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.daqing.framework.domain.guarantee; - -import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 担保调查 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@Data -@TableName("dg_guarantee_investigation") -public class DgGuaranteeInvestigation implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - /** - * 企业id - */ - private Integer companyId; - - /** - * 调查者id - */ - private Integer empId; - - /** - * 营业执照复印件 - */ - private String businessLicense; - - /** - * 上传法定代表人夫妻及企业实际经营者身份证复印件 - */ - private String legalCardCopy; - - /** - * 法定代表人夫妻户口本，结婚证（离婚证）复印件 - */ - private String marriageCopy; - - /** - * 法定代表人身份证明 - */ - private String legalCopy; - - /** - * 公司章程 - */ - private String companyConstitution; - - /** - * 会计师事务所审计的上一年度及本年度审计报告 - */ - private String accountingFirm; - - /** - * 股东会会议纪要 - */ - private String meetingMinutes; - - /** - * 谈话纪要 - */ - private String conversation; - - @ApiModelProperty(value = "创建时间") - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - @ApiModelProperty(value = "更新时间") - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; -} diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index c821a64b..6ab3e58c 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25 spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml