From 82a2baf72a4d2b5bc34de4063113773bfd9bf036 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 13 May 2021 09:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/DgWorkConferenceResponse.java | 4 ++-- .../DgComplianceInvestigationServiceImpl.java | 4 ++-- ...gGuaranteeLetterAssignUserServiceImpl.java | 9 +++++++-- .../DgLoanCommitteeConsiderServiceImpl.java | 4 ++-- .../service/impl/DgLoanNoticeServiceImpl.java | 7 +++++-- ...aymentConfirmationConsiderServiceImpl.java | 10 +++++++--- .../DgWorkConferenceConsiderServiceImpl.java | 20 +++++++++---------- .../DgComplianceInvestigationMapper.xml | 3 ++- .../DgWorkConferenceConsiderMapper.xml | 8 ++++---- .../controller/UserLoginController.java | 5 +++-- .../hrauth/service/impl/UserServiceImpl.java | 1 + 11 files changed, 45 insertions(+), 30 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java index f1716f7c..5d6404bb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java @@ -60,11 +60,11 @@ public class DgWorkConferenceResponse extends BaseRowModel implements Serializab @ExcelProperty(value = "A角", index = 7) @ApiModelProperty("A角") - private String aRoleName; + private String aroleName; @ExcelProperty(value = "B角", index = 8) @ApiModelProperty("B角") - private String bRoleName; + private String broleName; @ExcelProperty(value = "法规监督部", index = 9) @ApiModelProperty("法规监督部") diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index 7a7a8a3c..e6e0eb4b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -567,9 +567,9 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl ids,Integer userId) { - if (ids == null || ids.size() == 0) { +/* if (ids == null || ids.size() == 0) { ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL); - } + }*/ List idList = new ArrayList<>(); for (String id : ids) { idList.add(Integer.parseInt(id)); 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 129fbac6..990edfcc 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 @@ -37,6 +37,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -87,8 +88,12 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl idList = Arrays.asList(id); + List idList= new ArrayList<>(); + if(ids!=null && ids !=""){ + String[] id = ids.split(","); + idList = Arrays.asList(id); + } + List excelDataList = baseMapper.selectBatchData(idList,userId); EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"担保函列表","第一页"); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index 15f93fbf..4b9b0fc7 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java @@ -313,9 +313,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl ids, Integer userId) { - if (null == ids || ids.size() == 0) { +/* if (null == ids || ids.size() == 0) { ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL); - } + }*/ List idList = new ArrayList<>(); for (String id : ids) { idList.add(Integer.parseInt(id)); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java index ad7f568c..a6edae5f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java @@ -106,8 +106,11 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl idList = Arrays.asList(id); + List idList= new ArrayList<>(); + if(ids!=null && ids !=""){ + String[] id = ids.split(","); + idList = Arrays.asList(id); + } List excelDataList = baseMapper.selectBatchData(idList, userId); EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"放款通知列表","第一页"); } 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 fc6a71b1..1cf048ae 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 @@ -34,6 +34,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -99,10 +100,13 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl idList = Arrays.asList(id); + List idList= new ArrayList<>(); + if(ids!=null && ids !=""){ + String[] id = ids.split(","); + idList = Arrays.asList(id); + } List excelDataList = baseMapper.selectBatchData(idList,userId); - EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页"); + EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"财务确认列表","第一页"); } @Override diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java index 57f6f8c1..351e29d8 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java @@ -8,10 +8,7 @@ import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper; import com.daqing.financial.guarantee.mapper.DgWorkConferenceConsiderMapper; -import com.daqing.financial.guarantee.model.response.AuditOpinionResponse; -import com.daqing.financial.guarantee.model.response.DgWorkConferenceConsiderQueryResponse; -import com.daqing.financial.guarantee.model.response.DgWorkConferenceResponse; -import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; +import com.daqing.financial.guarantee.model.response.*; import com.daqing.financial.guarantee.service.IDgCopyForService; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; @@ -31,6 +28,7 @@ import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.excel.EasyExcelUtil; import com.daqing.framework.utils.excel.ExcelUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -373,9 +371,9 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl ids,Integer userId) { - if (ids == null || ids.size() == 0) { +/* if (ids == null || ids.size() == 0) { ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL); - } + }*/ List idList = new ArrayList<>(); for (String id : ids) { idList.add(Integer.parseInt(id)); @@ -407,8 +405,10 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl - + ORDER BY a.create_time DESC + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index 3a2b706e..9fbb1857 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -86,11 +86,11 @@ AND (w.user_id =#{userId} or w.user_id is null) + AND /*c.del_or_not = 0*/ + /*AND*/ i.role_id = 70 + AND ass.role_id = 64 + AND m.role_id = 67 - AND /*c.del_or_not = 0*/ - /*AND*/ i.role_id = 70 - AND ass.role_id = 64 - AND m.role_id = 67 AND w.id IN #{id} 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..3c57c171 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 @@ -135,12 +135,13 @@ public class UserLoginController implements UserLoginControllerApi { String imgUrl = user.getHeadPortaritUrl(); String encoder = "UTF-8"; String account = URLEncoder.encode(username,encoder); + Long userId = user.getId(); String headerImg=null; if(imgUrl !=null) 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); + System.out.println("account==========="+account+"headerImg============="+headerImg+"userId===="+userId); + response.sendRedirect("https://test.feifanhitech.com/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg+"&userId="+userId); // response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); } }else { 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..2ba04e9c 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 @@ -82,6 +82,7 @@ public class UserServiceImpl extends ServiceImpl imple dbUser.setToken(data.getToken()); dbUser.setAccount(data.getAccount()); dbUser.setHeadPortaritUrl(data.getHeadPortaritUrl()); + dbUser.setId(data.getId()); /* SecurityUser userInfo = (SecurityUser) userDetailsService.loadUserByUsername(dbUser.getPhoneAccount());