From afeb1e4d1c012938e793e70a48217a139a15f537 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 29 Mar 2021 18:25:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=90=8E=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AlRepaymentEntryServiceImpl.java | 47 +++++++++++++++---- .../controller/SystemLogController.java | 2 + 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java index 39d1c1c4..52c71b84 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java @@ -27,10 +27,7 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -50,6 +47,24 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpllist = this.baseMapper.selectBind(); Date date = new Date(); - long times1 = date.getTime();//当前时间 + //long times1 = date.getTime();//当前时间 + + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date four = null; + Date now = new Date(); + + try { + four = formatter2.parse(formatter.format(now)+" 00:00:00"); + } catch (ParseException e) { + e.printStackTrace(); + } + long times1 = four.getTime();//当前时间 //遍历list取出应还款日，计算逾期天数=当前时间-应还款日 for (AlRepaymentEntryRes res:list) { @@ -179,7 +206,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl times2){ + if(res.getActualRepaymentDate()==null && times1 > times2){ int days = (int)((times1-times2)/1000/60/60/24); entry.setOverdueDays(days); entry.setRepaymentStatus(3);//已逾期 @@ -189,16 +216,16 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl是；1->否； alInsuranceListMapper.updateById(alInsuranceList); - }else if(times1==times2){//应还款日=当前日期，则显示状态为待还款 + }else if(res.getActualRepaymentDate()==null && times1==times2){//应还款日=当前日期，则显示状态为待还款 entry.setRepaymentStatus(1);//待还款 this.baseMapper.updateById(entry);//更新状态 - }else if(times3 <= times1){//实际还款日不超过当前日期时，状态为已还款 + }else if(res.getActualRepaymentDate()!=null && times3 <= times1){//实际还款日不超过当前日期时，状态为已还款 entry.setRepaymentStatus(2);//已还款 this.baseMapper.updateById(entry);//更新状态 - }else if(times1 <= times2){//当前日期未到应还款日,状态为未到期 + }else if(res.getActualRepaymentDate()==null && times1 <= times2){//当前日期未到应还款日,状态为未到期 entry.setRepaymentStatus(4);//未到期 this.baseMapper.updateById(entry);//更新状态 - if(res.getRemainAmount().doubleValue()>0){//如果存在剩余额度,保后管理列表状态为还款中 + if(res.getRemainAmount()!=null && res.getActualRepaymentDate()==null && res.getRemainAmount().doubleValue()>0){//如果存在剩余额度,保后管理列表状态为还款中 alInsuranceList.setPaymentStatus(1);//还款中 alInsuranceListMapper.updateById(alInsuranceList); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java index 0520af69..328a56a3 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java @@ -11,6 +11,7 @@ import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,7 @@ public class SystemLogController implements SystemLogControllerApi { private LoginLogService loginLogService; @GetMapping("/list") + @ApiOperation(value = "系统日志列表") @Log(detail = "系统日志列表",level = 3,operationUnit = OperationUnit.SYSLOG,operationType = OperationType.SELECT) public ResponseResult list(@RequestParam("page") Integer page, @RequestParam("size") Integer size,UserLoginLogRequest userLoginLogRequest) { From 134e4562bf66e1aaa2b6fdc008838202fcbb3965 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 30 Mar 2021 09:39:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9E=E5=87=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrauth/controller/UserLoginController.java | 4 ++-- .../hrauth/service/impl/UserServiceImpl.java | 12 ++++++------ .../framework/model/response/PromptSuccess.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java index 043c9a92..727dd310 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java @@ -141,8 +141,8 @@ public class UserLoginController implements UserLoginControllerApi { //account = new String(username.getBytes("GBK"),"iso-8859-1"); log.info("account==========="+account+"headerImg============="+headerImg); //response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); - response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); -// response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); +// response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); + response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); } }else { userService.weChatBinding(code,response,state); diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java index b99ad50f..9c7458cc 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java @@ -92,8 +92,8 @@ public class UserServiceImpl extends ServiceImpl imple if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口 log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~"); try { -// response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId); - response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 + response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId); +// response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 } catch (IOException e) { e.printStackTrace(); @@ -159,9 +159,9 @@ public class UserServiceImpl extends ServiceImpl imple if (countWeChatId > 0){ try { log.info("微信重复了,我走到了这里............................."); - response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1"); +// response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1"); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1"); -// response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1"); + response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1"); } catch (IOException e) { e.printStackTrace(); } @@ -171,9 +171,9 @@ public class UserServiceImpl extends ServiceImpl imple if (result){ try { log.info("转发成功---------------------------------------"); - response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token); +// response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token); -// response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token); + response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token); }catch (IOException e){ e.printStackTrace(); } diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 6a3c080e..d30c3063 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -32,17 +32,17 @@ public class PromptSuccess { public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径 - public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 +// public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 //public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径 -// public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径 + public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径 public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加 public static final String STATUS_REFUSE = "拒绝"; - public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 +// public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径 -// public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径 + public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径