From 3858e3a7cdeec921b201810222d20faedddc6292 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 19 Mar 2021 17:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BA=BA=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmsCompanyPersonalController.java | 26 ++++++++++++------- .../mapper/AlInsuranceListMapper.java | 4 +++ .../model/response/AlInsuranceListRes.java | 3 ++- .../impl/AlInsuranceListServiceImpl.java | 5 ++-- .../guarantee/AlInsuranceListMapper.xml | 11 ++++++++ .../domain/crms/CrmsCompanyPersonal.java | 2 +- .../domain/guarantee/AlInsuranceList.java | 7 ++++- 7 files changed, 44 insertions(+), 14 deletions(-) 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 303c6c66..b930b0da 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 @@ -17,12 +17,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -61,15 +59,16 @@ public class CrmsCompanyPersonalController { @PostMapping("/insertCompanyPersonal") @ApiOperation(value = "新增个人/企业关联人") public ResponseResult insertCompanyPersonal(@RequestBody @Valid CrmsCompanyPersonal crmsCompanyPersonal) { - String dateStr = crmsCompanyPersonal.getRegisteredTime().toString(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date d = null; + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + String format = sdf.format(crmsCompanyPersonal.getRegisteredTime()); + Date parse = null; try { - d = sdf.parse(dateStr); + parse = sdf.parse(format); } catch (ParseException e) { e.printStackTrace(); } - crmsCompanyPersonal.setRegisteredTime(d); + + crmsCompanyPersonal.setRegisteredTime(parse); boolean result = crmsCompanyPersonalService.save(crmsCompanyPersonal); CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated(); crmsCustomerRelated.setRelatedId(crmsCompanyPersonal.getId().intValue());//关联人Id @@ -95,6 +94,15 @@ public class CrmsCompanyPersonalController { @PostMapping("/updateCompanyPersonal") @ApiOperation(value = "编辑个人/企业关联人") public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonal crmsCompanyPersonal){ + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + String format = sdf.format(crmsCompanyPersonal.getRegisteredTime()); + Date parse = null; + try { + parse = sdf.parse(format); + } catch (ParseException e) { + e.printStackTrace(); + } + crmsCompanyPersonal.setRegisteredTime(parse); boolean result = crmsCompanyPersonalService.updateById(crmsCompanyPersonal); return result ? ResponseResult.SUCCESS(crmsCompanyPersonal) : ResponseResult.FAIL(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java index b22fd43b..2ca25cd2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java @@ -7,6 +7,8 @@ import com.daqing.financial.guarantee.model.response.AlInsuranceListRes; import com.daqing.framework.domain.guarantee.AlInsuranceList; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *

* 保后管理列表 Mapper 接口 @@ -19,4 +21,6 @@ import org.apache.ibatis.annotations.Mapper; public interface AlInsuranceListMapper extends BaseMapper { IPage pageByCondition(Page page, String customerNumberOrName); + + List selectListByIds(List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlInsuranceListRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlInsuranceListRes.java index 3f603d72..ac193b3b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlInsuranceListRes.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlInsuranceListRes.java @@ -1,5 +1,6 @@ package com.daqing.financial.guarantee.model.response; +import com.alibaba.excel.metadata.BaseRowModel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,7 +22,7 @@ import java.util.Date; */ @Data @ToString -public class AlInsuranceListRes implements Serializable { +public class AlInsuranceListRes extends BaseRowModel implements Serializable { private static final long serialVersionUID = 1L; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java index 57cc99a1..5bd7bdae 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.mapper.AlInsuranceListMapper; import com.daqing.financial.guarantee.model.response.AlInsuranceListRes; +import com.daqing.financial.guarantee.model.response.AlRepaymentRes; import com.daqing.financial.guarantee.service.IAlInsuranceListService; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.AlInsuranceList; @@ -54,9 +55,9 @@ public class AlInsuranceListServiceImpl extends ServiceImpl ids, HttpServletResponse response) { - ListalInsuranceList = this.baseMapper.selectBatchIds(ids); + ListalInsuranceList = this.baseMapper.selectListByIds(ids); try { - ExcelUtil.writeExcelWithSheets(response, alInsuranceList, "还款记录一览表", "repaymentEntry", new AlInsuranceList()) + ExcelUtil.writeExcelWithSheets(response, alInsuranceList, "还款记录一览表", "repaymentEntry", new AlInsuranceListRes()) .finish(); return true; } catch (Exception e) { diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml index 7baf74a6..fa3bb2e7 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml @@ -34,4 +34,15 @@ order by create_time desc + + diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java index 2252dd82..0ec22ad7 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java @@ -59,7 +59,7 @@ public class CrmsCompanyPersonal implements Serializable { * 注册时间 */ @ApiModelProperty(value = "注册时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date registeredTime; /** diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java index 0696c2a2..379eb2db 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java @@ -18,7 +18,7 @@ import java.util.Date; */ @Data @TableName("al_insurance_list") -public class AlInsuranceList extends BaseRowModel implements Serializable { +public class AlInsuranceList implements Serializable { private static final long serialVersionUID = 1L; @@ -98,6 +98,11 @@ public class AlInsuranceList extends BaseRowModel implements Serializable { */ private Integer paymentStatus; + /** + * 是否逾期过：0->是；1->否； + */ + private Integer isOverdue; + /** * 创建时间 */