From 1753ab896a218722e9d6d37691b9db14c9847f1d Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 29 Mar 2021 16:18:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DgApplyAmountInfoServiceImpl.java | 78 ++++++++----------- .../DgBusinessProcessStatusMapper.xml | 5 +- .../domain/guarantee/GuaranteeCode.java | 2 +- 3 files changed, 36 insertions(+), 49 deletions(-) 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 b100cba5..07d6c6a4 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 @@ -62,8 +62,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl redisTemplate; @Resource private CrmsFeignService crmsFeignService; @@ -136,20 +134,16 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl businessCompanyList = dgBusinessCompanyMapper.selectList(new QueryWrapper() - .eq("social_unified_code", businessApplication.getSocialUnifiedCode())); - List businessIds = new ArrayList(); - for (DgBusinessCompany businessCompany:businessCompanyList) { - businessIds.add(businessCompany.getBusinessId()); - } - //根据业务id查询dg_business_process_status表中是否存在业务为进行中的记录 - Integer businessStatus=StatusCode.YW_IN_PROGRESS;//进行中 - int count2 = dgBusinessProcessStatusMapper.selectBybusinessIdAndStatus(businessIds,businessStatus); - //如果存在，则不能再申请业务 - if(count2>0){ - ExceptionCast.cast(GuaranteeCode.REPEAT_BUSINESS); + DgApplyAmountList dgApplyAmountList = new DgApplyAmountList(); + if(businessApplication.getIsSaveOrCommit()==1){//提交 + //根据社会统一信用代码判断是否可以申请业务，同一客户如果有一笔业务在业务流程在进行中，则不能再申请 + this.repeatBusiness(businessApplication); + + dgApplyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审批状态 设置为审核中 + dgApplyAmountList.setOperatingStatus(StatusCode.CZ_LAUNCH);//操作状态设置为已发起 + }else{//保存 + dgApplyAmountList.setStatus(StatusCode.SP_DRAFT);//审批状态 保存为草稿 + dgApplyAmountList.setOperatingStatus(StatusCode.CZ_TO_BE_SUBMITTED);//操作状态设置为待提交 } //申请贷款相关信息 @@ -194,41 +188,18 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl relatedList = new ArrayList<>(); - List intList = businessApplication.getRelatedId(); - - for(int i=0;i() .eq("business_id", dgApplyAmountList.getBusinessId())); @@ -392,6 +356,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl businessCompanyList = dgBusinessCompanyMapper.selectList(new QueryWrapper() + .eq("social_unified_code", businessApplication.getSocialUnifiedCode())); + List businessIds = new ArrayList(); + for (DgBusinessCompany businessCompany:businessCompanyList) { + businessIds.add(businessCompany.getBusinessId()); + } + //根据业务id查询dg_business_process_status表中是否存在业务为进行中的记录 + Integer businessStatus=StatusCode.YW_IN_PROGRESS;//进行中 + if(businessIds.size()>0){ + int count2 = dgBusinessProcessStatusMapper.selectBybusinessIdAndStatus(businessIds,businessStatus); + //如果存在，则不能再申请业务 + if(count2>0){ + ExceptionCast.cast(GuaranteeCode.REPEAT_BUSINESS); + } + } + } + } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml index 8f71754e..bc8c142d 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml @@ -12,11 +12,12 @@ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java index 8de8578f..1559ae1e 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/GuaranteeCode.java @@ -34,7 +34,7 @@ public enum GuaranteeCode implements ResultCode { FROM_DESIGN_PROCESS_ERROR(false,140001,"当前节点数据不存在!"), FROM_DESIGN_NAME_NOT_NULL(false,140002,"字段名称不能为空!"), - REPEAT_BUSINESS(false,140002,"企业已申请进行中的业务，不能再次申请！"); + REPEAT_BUSINESS(false,150001,"企业存在进行中的业务，不能再次申请！"); /** * 操作是否成功 */ From 707318994a04d14a935dc62bfc8cfe9013f87bb8 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Mon, 29 Mar 2021 16:41:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DgGuaranteeLetterAssignUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index 3e0140fb..a90aebaa 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -438,7 +438,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl Date: Mon, 29 Mar 2021 18:25:03 +0800 Subject: [PATCH 3/5] =?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 4/5] =?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//"; // 附件文件存放路径 From 9742bdba7f3396a169fe6e22ece8f8d9a2e5a928 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 30 Mar 2021 15:40:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...aymentConfirmationConsiderServiceImpl.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index cd2cb566..8b73b277 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -202,7 +202,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ - //更新法规部经理数据 + //更新担保函法规部经理数据 //根据业务id查询法规部经理数据 QueryWrapper guaranteeLetterAssignUserQueryWrapperFg = new QueryWrapper<>(); guaranteeLetterAssignUserQueryWrapperFg.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); @@ -210,7 +210,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>(); guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID); @@ -218,7 +218,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>(); guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); @@ -226,12 +226,29 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>(); guaranteeLetterAssignUserQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.ZC_JL_ID); DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper); dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT); dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND); dgGuaranteeLetterAssignUser.setAuditOpinion(""); + + //如果财务确认的法规部经理有数据，更新法规部经理数据 + //法规部数据存在，更新法规部经理财务回款数据 + QueryWrapper paymentConfirmationConsiderFG = new QueryWrapper<>(); + paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); + DgPaymentConfirmationConsider paymentConfirmationConsiderFg = baseMapper.selectOne(paymentConfirmationConsiderFG); + //数据存在，进行更新 + if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){ + paymentConfirmationConsiderFg.setStatus(StatusCode.SP_REJECT); + //清空上次的审批意见及银行回单 + paymentConfirmationConsiderFg.setAuditOpinion(""); + paymentConfirmationConsiderFg.setImgFile(""); + baseMapper.updateById(paymentConfirmationConsiderFg); + } + int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser); //更新成功，返回操作结果 log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");