diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java index 6bcc1716..4c1e9ea1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java @@ -433,30 +433,48 @@ public class CustomerAppletServiceImpl extends ServiceImpl已完成；1->已受理；2->审核中；3->已拒绝；4->已驳回；5->已撤销； + // 状态为已受理、审核中、拒绝、驳回、已撤销情况 + if (applyDetail.getAuditStatus() != null && (applyDetail.getAuditStatus() == 1 + || applyDetail.getAuditStatus() == 2 || applyDetail.getAuditStatus() == 3 + || applyDetail.getAuditStatus() == 4 || applyDetail.getAuditStatus() == 5)) { + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + } + + // 业务状态为已否决的情况,如果同时存在会覆盖以上情况 + if (applyDetail.getBusinessStatus() != null && applyDetail.getBusinessStatus() == 3) { + applyDetailResponse.setStatus(3);//状态设置为已拒绝 } + // 状态为已完成的情况,如果同时存在已完成会覆盖以上情况 + if (applyDetail.getBusinessStatus() != null && applyDetail.getBusinessStatus() == 2) { + applyDetailResponse.setStatus(0);//状态设置为已完成 + } + +// switch (applyDetail.getAuditStatus()) { +// case 1: // 已受理 +// applyDetailResponse.setStatus(applyDetail.getAuditStatus()); +// break; +// case 2: // 审核中 +// applyDetailResponse.setStatus(applyDetail.getAuditStatus()); +// break; +// case 3: // 已拒绝 +// applyDetailResponse.setStatus(applyDetail.getAuditStatus()); +// applyDetailResponse.setRemark(applyDetail.getRemark()); +// break; +// case 4: // 已驳回 +// applyDetailResponse.setStatus(applyDetail.getAuditStatus()); +// applyDetailResponse.setRemark(applyDetail.getRemark()); +// break; +// case 5: // 已撤销 +// applyDetailResponse.setStatus(applyDetail.getAuditStatus()); +// break; +// case 6: // 草稿,正常不会出现这个状态,避免报错设置为已受理 +// applyDetailResponse.setStatus(1); +// break; +// default: +// ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); +// } //根据业务id查询该业务中最后一个驳回的人的审核意见 String auditOpinion = this.getBaseMapper().getAuditOpinion(applyDetail.getBusinessId()); 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 86b9fa44..ff15fc81 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 @@ -251,10 +251,15 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"","")); response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"","")); - }else{ - response.setAccount("客户"); + } + if(response != null){ + if(response.getAccount()==null){ + response.setAccount("客户"); + } } } + + } } } 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 d4f5a179..c7d2d7db 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 @@ -140,8 +140,8 @@ public class UserLoginController implements UserLoginControllerApi { headerImg = URLDecoder.decode(imgUrl,encoder); //account = new String(username.getBytes("GBK"),"iso-8859-1"); log.info("account==========="+account+"headerImg============="+headerImg); - response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); -// response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); +// response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/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 56b1475c..4ce2ac40 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 @@ -94,8 +94,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://test.feifanhitech.com/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 + response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId); +// response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 } catch (IOException e) { e.printStackTrace(); } @@ -160,8 +160,8 @@ public class UserServiceImpl extends ServiceImpl imple if (countWeChatId > 0){ try { log.info("微信重复了,我走到了这里............................."); - response.sendRedirect("https://test.feifanhitech.com/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://test.feifanhitech.com/dq/index.html#/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,8 +171,8 @@ public class UserServiceImpl extends ServiceImpl imple if (result){ try { log.info("转发成功---------------------------------------"); - response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/workbench-manpower?token="+token); -// response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token); +// response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/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 4ab2a509..03c40cec 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,15 +32,15 @@ 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://test.feifanhitech.com/headImg/"; // 数据库/预加载图片路径 -// public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径 +// public static final String IMAGE_URL_PATH = "https://test.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://test.feifanhitech.com/enclosureFile/"; // 附件文件存放路径 -// public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径 +// public static final String ENCLOSUREFILE_URL_PATH = "https://test.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//"; // 附件文件存放路径