Skip to content

Y
yd-backend
Commit e918ca9d by Water Wang
Options

Merge branch 'dev_20200612_practitioner' into dev

parents 2b7ecb8d 114ae02f
Showing with 832 additions and 23 deletions
yd-api/pom.xml
...@@ -144,6 +144,22 @@ ...@@ -144,6 +144,22 @@
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.2.2</version> <version>3.2.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
yd-api/src/main/java/com/yd/api/practitioner/PayScalePdfRequestVO.java 0 → 100644
package com.yd.api.practitioner;
public class PayScalePdfRequestVO {
private Integer monShId;
private Long practitionerId;
public Long getPractitionerId() {
return practitionerId;
}
public void setPractitionerId(Long practitionerId) {
this.practitionerId = practitionerId;
}
public Integer getMonShId() {
return monShId;
}
public void setMonShId(Integer monShId) {
this.monShId = monShId;
}
}
yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java
package com.yd.api.practitioner; package com.yd.api.practitioner;
import com.yd.api.practitioner.service.PractitionerPolicyService; import com.yd.api.practitioner.service.PractitionerBasicInfoService;
import com.yd.api.practitioner.service.PractitionerService; import com.yd.api.practitioner.service.PractitionerService;
import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO; import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO; import com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO;
import com.yd.api.practitioner.vo.media.MediaGetReqVO; import com.yd.api.practitioner.vo.media.MediaGetReqVO;
import com.yd.api.practitioner.vo.media.MediaGetRespVO; import com.yd.api.practitioner.vo.media.MediaGetRespVO;
import com.yd.api.practitioner.vo.opportunity.*; import com.yd.api.practitioner.vo.opportunity.*;
import com.yd.api.practitioner.vo.payscale.PayScalePdfResponseVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO; import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO;
...@@ -20,10 +23,10 @@ import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryReques ...@@ -20,10 +23,10 @@ import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryReques
import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO; import com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO;
import com.yd.api.result.JsonResult; import com.yd.api.result.JsonResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RestController;
@Controller @Controller
@RestController @RestController
...@@ -33,7 +36,7 @@ public class PractitionerController { ...@@ -33,7 +36,7 @@ public class PractitionerController {
@Autowired @Autowired
private PractitionerService practitionerService; private PractitionerService practitionerService;
@Autowired @Autowired
private PractitionerPolicyService practitionerPolicyService; private PractitionerBasicInfoService practitionerBasicInfoService;
/** /**
* 经纪人登录 * 经纪人登录
...@@ -422,7 +425,7 @@ public class PractitionerController { ...@@ -422,7 +425,7 @@ public class PractitionerController {
@RequestMapping("/policyListQuery") @RequestMapping("/policyListQuery")
public Object practitionerPolicyListQuery(@RequestBody PolicyListQueryRequestVO requestVO){ public Object practitionerPolicyListQuery(@RequestBody PolicyListQueryRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
PolicyListQueryResponseVO responseVO = practitionerPolicyService.policyListQuery(requestVO); PolicyListQueryResponseVO responseVO = practitionerBasicInfoService.policyListQuery(requestVO);
result.setData(responseVO); result.setData(responseVO);
result.addResult(responseVO); result.addResult(responseVO);
return result; return result;
...@@ -436,7 +439,36 @@ public class PractitionerController { ...@@ -436,7 +439,36 @@ public class PractitionerController {
@RequestMapping("/policyInfoQuery") @RequestMapping("/policyInfoQuery")
public Object policyInfoQuery(@RequestBody PolicyInfoQueryRequestVO requestVO){ public Object policyInfoQuery(@RequestBody PolicyInfoQueryRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
PolicyInfoQueryResponseVO responseVO = practitionerPolicyService.policyInfoQuery(requestVO); PolicyInfoQueryResponseVO responseVO = practitionerBasicInfoService.policyInfoQuery(requestVO);
result.setData(responseVO);
result.addResult(responseVO);
return result;
}
/**
* 经纪人薪资表查询接口
* @param requestVO 请求信息
* @return PolicyInfoQueryResponseVO
*/
@RequestMapping("/payScaleListQuery")
public Object payScaleListQuery(@RequestBody PayScaleQueryRequestVO requestVO){
JsonResult result = new JsonResult();
PayScaleQueryResponseVO responseVO = practitionerBasicInfoService.payScaleListQuery(requestVO);
result.setData(responseVO);
result.addResult(responseVO);
return result;
}
/**
* 获取经纪人的薪资表
* @param requestVO 请求信息
* @return 返回信息
*/
@PostMapping(value = "/payScalePdf")
public Object payScalePdf(@RequestBody PayScalePdfRequestVO requestVO){
JsonResult result = new JsonResult();
PayScalePdfResponseVO responseVO = practitionerBasicInfoService.payScalePdf(requestVO);
result.setData(responseVO); result.setData(responseVO);
result.addResult(responseVO); result.addResult(responseVO);
return result; return result;
......
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerPolicyService.java → yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerBasicInfoService.java
package com.yd.api.practitioner.service; package com.yd.api.practitioner.service;
import com.yd.api.practitioner.PayScalePdfRequestVO;
import com.yd.api.practitioner.vo.payscale.PayScalePdfResponseVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO; import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestVO;
import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryResponseVO; import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryResponseVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service("practitionerPolicyService") import javax.servlet.http.HttpServletResponse;
public interface PractitionerPolicyService {
@Service("practitionerBasicInfoService")
public interface PractitionerBasicInfoService {
/** /**
* 经纪人保单列表查询 * 经纪人保单列表查询
* @param requestVO 请求信息 * @param requestVO 请求信息
...@@ -21,4 +27,18 @@ public interface PractitionerPolicyService { ...@@ -21,4 +27,18 @@ public interface PractitionerPolicyService {
* @return PolicyInfoQueryResponseVO * @return PolicyInfoQueryResponseVO
*/ */
PolicyInfoQueryResponseVO policyInfoQuery(PolicyInfoQueryRequestVO requestVO); PolicyInfoQueryResponseVO policyInfoQuery(PolicyInfoQueryRequestVO requestVO);
/**
* eGolden -- 经纪人薪资表查询
* @param requestVO 请求信息
* @return 相应
*/
PayScaleQueryResponseVO payScaleListQuery(PayScaleQueryRequestVO requestVO);
/**
* 获取经纪人的薪资表
* @param requestVO 请求信息
* @return 响应信息
*/
PayScalePdfResponseVO payScalePdf(PayScalePdfRequestVO requestVO);
} }
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerPolicyServiceImpl.java → yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
package com.yd.api.practitioner.service.impl; package com.yd.api.practitioner.service.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.yd.api.practitioner.service.PractitionerPolicyService; import com.yd.api.practitioner.PayScalePdfRequestVO;
import com.yd.api.practitioner.service.PractitionerBasicInfoService;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
import com.yd.api.practitioner.vo.payscale.PayScalePdfResponseVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryRequestVO;
import com.yd.api.practitioner.vo.payscale.PayScaleQueryResponseVO;
import com.yd.api.practitioner.vo.policy.PolicyInfo; import com.yd.api.practitioner.vo.policy.PolicyInfo;
import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO;
import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO; import com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO;
import com.yd.api.practitioner.vo.policy.policyinfoquery.*; import com.yd.api.practitioner.vo.policy.policyinfoquery.*;
import com.yd.api.result.CommonResult; import com.yd.api.result.CommonResult;
import com.yd.dal.entity.customer.AclFileUpload;
import com.yd.dal.entity.customer.AclPractitioner; import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
import com.yd.dal.entity.meta.OptionsEGolden; import com.yd.dal.entity.meta.OptionsEGolden;
import com.yd.dal.entity.order.CustomerPolicyInfo; import com.yd.dal.entity.order.CustomerPolicyInfo;
import com.yd.dal.entity.order.PolicyDetailInfoE; import com.yd.dal.entity.order.PolicyDetailInfoE;
import com.yd.dal.entity.order.PolicyFactorInfoE; import com.yd.dal.entity.order.PolicyFactorInfoE;
import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
import com.yd.dal.entity.product.Product; import com.yd.dal.entity.product.Product;
import com.yd.dal.entity.product.ProductE; import com.yd.dal.entity.product.ProductE;
import com.yd.dal.entity.product.ProductPlan; import com.yd.dal.entity.product.ProductPlan;
import com.yd.dal.service.customer.AclFileUploadDALService;
import com.yd.dal.service.customer.AclPractitionerDALService; import com.yd.dal.service.customer.AclPractitionerDALService;
import com.yd.dal.service.meta.MdDropOptionsDALService; import com.yd.dal.service.meta.MdDropOptionsDALService;
import com.yd.dal.service.order.PoOrderDALService; import com.yd.dal.service.order.PoOrderDALService;
import com.yd.dal.service.product.ProductDALService; import com.yd.dal.service.product.ProductDALService;
import com.yd.dal.service.product.ProductPlanDALService; import com.yd.dal.service.product.ProductPlanDALService;
import com.yd.rmi.ali.oss.service.OssService;
import com.yd.rmi.ali.oss.vo.OssOperateTypeEnum;
import com.yd.rmi.ali.oss.vo.OssRequestVO;
import com.yd.rmi.ali.oss.vo.OssResponseVO;
import com.yd.rmi.cache.SystemConfigService;
import com.yd.util.CommonUtil; import com.yd.util.CommonUtil;
import com.yd.util.config.ZHBErrorConfig; import com.yd.util.config.ZHBErrorConfig;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.*;
import java.util.*; import java.util.*;
@Service("practitionerPolicyService") @Service("practitionerBasicInfoService")
public class PractitionerPolicyServiceImpl implements PractitionerPolicyService { public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoService {
@Autowired @Autowired
private AclPractitionerDALService aclPractitionerDALService; private AclPractitionerDALService aclPractitionerDALService;
...@@ -41,6 +57,13 @@ public class PractitionerPolicyServiceImpl implements PractitionerPolicyService ...@@ -41,6 +57,13 @@ public class PractitionerPolicyServiceImpl implements PractitionerPolicyService
private ProductDALService productDALService; private ProductDALService productDALService;
@Autowired @Autowired
private MdDropOptionsDALService mdDropOptionsDALService; private MdDropOptionsDALService mdDropOptionsDALService;
@Autowired
private SystemConfigService systemConfigService;
@Autowired
private OssService ossService;
@Autowired
private AclFileUploadDALService aclFileUploadDALService;
@Override @Override
public PolicyListQueryResponseVO policyListQuery(PolicyListQueryRequestVO requestVO) { public PolicyListQueryResponseVO policyListQuery(PolicyListQueryRequestVO requestVO) {
PolicyListQueryResponseVO responseVO = new PolicyListQueryResponseVO(); PolicyListQueryResponseVO responseVO = new PolicyListQueryResponseVO();
...@@ -94,6 +117,231 @@ public class PractitionerPolicyServiceImpl implements PractitionerPolicyService ...@@ -94,6 +117,231 @@ public class PractitionerPolicyServiceImpl implements PractitionerPolicyService
return responseVO; return responseVO;
} }
@Override
public PayScaleQueryResponseVO payScaleListQuery(PayScaleQueryRequestVO requestVO) {
PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
String practitionerIdEG = requestVO.getPractitionerIdEG();
if(!Strings.isNullOrEmpty(practitionerIdEG)){
List<PayScaleInfo> payScaleInfoListAll = aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
if(!payScaleInfoListAll.isEmpty()){
Map<String,String> dtlTypeMap = new HashMap<>();
Map<String,String> titleMap = new HashMap<>();
List<OptionsEGolden> optionsEGoldenList = mdDropOptionsDALService.findByMasterIdsE(Collections.singletonList(101));
optionsEGoldenList.forEach(i->dtlTypeMap.put(i.getOptAttr(),i.getOptName()));
List<OptionsEGolden> titleList = mdDropOptionsDALService.findAllTitleEG();
titleList.forEach(i->titleMap.put(i.getTitleCode(),i.getTitleName()));
Map<Integer,PayScaleInfo> payScaleInfoMap = new HashMap<>();
PayScaleInfo payScaleInfo;
Integer time;
for(PayScaleInfo item : payScaleInfoListAll){
time = item.getMonDtlPeriod();
if(payScaleInfoMap.containsKey(time)){
payScaleInfo = payScaleInfoMap.get(time);
calculateRAmount(payScaleInfo,item);
}else{
calculateRAmount(item,item);
item.setMonDtlItem("实发薪水");
payScaleInfoMap.put(time,item);
item.setDrpTitleCode(titleMap.get(item.getDrpTitleCode()));
item.setMonDtlType(dtlTypeMap.get(item.getMonDtlType()));
}
}
//修改金钱格式
for(PayScaleInfo item : payScaleInfoListAll){
item.setMonDtlRAmount(CommonUtil.doubleFormat(item.getMonDtlRAmount(),2));
}
List<PayScaleInfo> resultList = new ArrayList<>(payScaleInfoMap.values());
resultList.sort(Comparator.comparingInt(PayScaleInfo :: getMonDtlPeriod).reversed());
responseVO.setPayScaleInfos(resultList);
}
responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
}else{
String[] params = {"practitionerIdEG"};
responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("610002", params)));
}
return responseVO;
}
@Override
public PayScalePdfResponseVO payScalePdf(PayScalePdfRequestVO requestVO) {
PayScalePdfResponseVO responseVO = new PayScalePdfResponseVO();
Integer monShId = requestVO.getMonShId();
Long practitionerId = requestVO.getPractitionerId();
if(monShId != null && practitionerId != null){
PayScaleBasicInfo payScaleBasicInfo = aclPractitionerDALService.findFilePathByMonShId(monShId);
if(payScaleBasicInfo != null){
Integer time = payScaleBasicInfo.getMonDtlPeriod();
if(time != null){
AclFileUpload aclFileUpload = aclFileUploadDALService.findByTargetIdAndRemark(1,practitionerId,time.toString());
String url;
if(aclFileUpload != null){
url = aclFileUpload.getFilePath();
if(Strings.isNullOrEmpty(url)){
url = checkPractitionerId(payScaleBasicInfo,practitionerId,time.toString());
}
}else{
url = checkPractitionerId(payScaleBasicInfo,practitionerId,time.toString());
}
if(!Strings.isNullOrEmpty(url)){
responseVO.setUrl(url);
responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
}
}
}
}
responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("820001")));
return responseVO;
}
private String checkPractitionerId(PayScaleBasicInfo payScaleBasicInfo, Long practitionerId,String time){
if(payScaleBasicInfo != null){
String practitionerIdEG = payScaleBasicInfo.getSalMstId();
PractitionerBasicInfo practitionerBasicInfo = aclPractitionerDALService.findByIdEG(practitionerIdEG);
if(practitionerBasicInfo != null){
String mobileNo = practitionerBasicInfo.getMobileNo();
if(!Strings.isNullOrEmpty(mobileNo)){
PractitionerInfo practitionerInfo = aclPractitionerDALService.findPractitionerInfoByLogin(mobileNo);
if(practitionerInfo != null){
Long practitionerIdDB = practitionerInfo.getPractitionerId();
if(practitionerIdDB != null && practitionerIdDB.equals(practitionerId)){
String filePath = payScaleBasicInfo.getUploadPath();
return getPDFUrl(filePath,practitionerId,time);
}
}
}
}
}
return null;
}
private String getPDFUrl(String filePath,Long practitionerId,String time) {
String url = null;
String[] filePathStr = filePath.split("salaryCalculation/");
if(filePathStr.length == 2) {
filePath = "/home/egolden/shareSalaryCalculation/" + filePathStr[1];
// filePath = "/users/water/Salary_201908_YDSH00032.pdf";
File file = new File(filePath);
if (file.exists()) {// 如果文件名存在，则进行下载
// 获取文件名和日期
String[] str = filePath.split("/");
String fileName = str[str.length-1];
String timeScale = str[str.length-2];
String prefix = "payScale/"+timeScale+"/";
String ossKey = fileName.replaceAll(" ", "").replaceAll(" ", "");
ossKey = prefix+CommonUtil.getRandomNum(5)+ossKey;
try{
OssRequestVO requestVO = new OssRequestVO();
requestVO.setOperateType(OssOperateTypeEnum.PUT_OBJECT.getCode());
requestVO.setBucketName(systemConfigService.getSingleConfigValue("ALI_OSS_BUCKET_NAME"));
requestVO.setKey(ossKey);
requestVO.setFile(file);
OssResponseVO ossresponseVO = ossService.ossOperate(requestVO);
if(ossresponseVO.getCommonResult().isSuccess()){
requestVO.setOperateType(OssOperateTypeEnum.GENERATE_URL.getCode());
ossresponseVO = ossService.ossOperate(requestVO);
url = ossresponseVO.getUrl();
AclFileUpload aclFileUpload = new AclFileUpload();
aclFileUpload.setTargetType(1);
aclFileUpload.setTargetId(practitionerId);
aclFileUpload.setTargetNo("payScale");
aclFileUpload.setFileType("PDF");
aclFileUpload.setFileName(fileName);
aclFileUpload.setFilePath(url);
aclFileUpload.setTargetUseFor(10);
aclFileUpload.setFileSize(String.valueOf(file));
aclFileUpload.setOssKey(ossKey);
aclFileUpload.setIsActive(1);
aclFileUpload.setUploadedAt(new Date());
aclFileUpload.setUploadedBy(-1L);
aclFileUpload.setRemark(time);
aclFileUploadDALService.saveFileUpload(aclFileUpload);
}
}catch(Exception e){
e.printStackTrace();
}finally{
file.deleteOnExit();
}
}
}
return url;
}
// private void getPayScalePdf(String filePath, HttpServletResponse response) {
// File file = new File(filePath);
// // 如果文件名存在，则进行下载
// if (file.exists()) {
// // 配置文件下载
// String[] str = filePath.split("/");
// String fileName = str[str.length-1];
// response.setHeader("content-type", "application/pdf");
// response.setHeader("Cache-Control", "max-age=30");
// response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
// response.setHeader("Pragma", "public");
// // 下载文件能正常显示中文
// try {
// response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
// } catch (UnsupportedEncodingException e) {
// e.printStackTrace();
// }
// response.setContentType("application/pdf");
// // 实现文件下载
// byte[] buffer = new byte[1024];
// FileInputStream fis = null;
// BufferedInputStream bis = null;
// try {
// fis = new FileInputStream(file);
// bis = new BufferedInputStream(fis);
// OutputStream os = response.getOutputStream();
// int i = bis.read(buffer);
// while (i != -1) {
// os.write(buffer, 0, i);
// i = bis.read(buffer);
// }
// } catch (Exception e) {
// e.printStackTrace();
// } finally {
// if (bis != null) {
// try {
// bis.close();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
// if (fis != null) {
// try {
// fis.close();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
// }
// }
// }
private void calculateRAmount(PayScaleInfo payScaleInfoMain, PayScaleInfo payScaleInfoElse) {
if(payScaleInfoMain != null && payScaleInfoElse != null){
Integer shIdMain = payScaleInfoMain.getMonShId();
Integer shIdElse = payScaleInfoElse.getMonShId();
Double all = payScaleInfoMain.getMonDtlRAmount();
double allA = (shIdMain.equals(shIdElse))? 0D : payScaleInfoMain.getMonDtlAmount();
Double temp = payScaleInfoElse.getMonDtlAmount();
String type = payScaleInfoElse.getMonDtlItem();
if(!Strings.isNullOrEmpty(type)){
if(type.startsWith("W")){
all = all - temp;
}else{
all = all + temp;
allA = allA + temp;
}
payScaleInfoMain.setMonDtlRAmount(all);
payScaleInfoMain.setMonDtlAmount(allA);
}
}
}
private String getOrderNoE(String policyNo) { private String getOrderNoE(String policyNo) {
String orderNo = null; String orderNo = null;
if(!Strings.isNullOrEmpty(policyNo)){ if(!Strings.isNullOrEmpty(policyNo)){
......
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
...@@ -174,6 +174,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -174,6 +174,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
isSpecial = mobileSpecials.contains(mobileNo); isSpecial = mobileSpecials.contains(mobileNo);
} }
if(28L == practitionerType || isSpecial){//只有寿险的经纪人和注册为经纪人的员工才能登录 if(28L == practitionerType || isSpecial){//只有寿险的经纪人和注册为经纪人的员工才能登录
PractitionerBasicInfo practitionerBasicInfo = aclPractitionerDALService.findByMobileNoE(mobileNo);
Long practitionerId = practitionerInfo.getPractitionerId(); Long practitionerId = practitionerInfo.getPractitionerId();
Long customerId = practitionerInfo.getCustomerId(); Long customerId = practitionerInfo.getCustomerId();
AclCustomer customer = aclCustomerDALService.findById(customerId); AclCustomer customer = aclCustomerDALService.findById(customerId);
...@@ -193,6 +194,9 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -193,6 +194,9 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
basicInfo.setSubordinateLeader(subordinateInfo.getSubordinateLeader()); basicInfo.setSubordinateLeader(subordinateInfo.getSubordinateLeader());
} }
} }
if(practitionerBasicInfo != null){
responseVO.setPractitionerIdEG(practitionerBasicInfo.getPractitionerId());
}
//获取用户的登录次数 //获取用户的登录次数
List<AclCustomerLog> customerLogList = aclCustomerLogDALService.findLogInfoByCustomerId(customerId); List<AclCustomerLog> customerLogList = aclCustomerLogDALService.findLogInfoByCustomerId(customerId);
int logTimes = (customerLogList.isEmpty()) ? 0 : customerLogList.size(); int logTimes = (customerLogList.isEmpty()) ? 0 : customerLogList.size();
...@@ -225,7 +229,6 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -225,7 +229,6 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
+ "appid=" + appId + "appid=" + appId
+ "&redirect_uri=" + redirectUri + "&redirect_uri=" + redirectUri
+ "&response_type=code&scope=snsapi_base&state=123#wechat_redirect"; + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
System.out.println(">>>>>url>>>>>>>:" + url);
responseVO.setGetOpenIdUrl(url); responseVO.setGetOpenIdUrl(url);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
......
yd-api/src/main/java/com/yd/api/practitioner/vo/login/PractitionerLoginResponseVO.java
...@@ -6,6 +6,7 @@ import com.yd.api.result.CommonResult; ...@@ -6,6 +6,7 @@ import com.yd.api.result.CommonResult;
public class PractitionerLoginResponseVO { public class PractitionerLoginResponseVO {
private Long customerId; private Long customerId;
private Long practitionerId; private Long practitionerId;
private String practitionerIdEG;
private Integer loginTimes; private Integer loginTimes;
private String getOpenIdUrl; private String getOpenIdUrl;
private PractitionerLoginBasicInfo practitionerBasicInfo; private PractitionerLoginBasicInfo practitionerBasicInfo;
...@@ -43,6 +44,14 @@ public class PractitionerLoginResponseVO { ...@@ -43,6 +44,14 @@ public class PractitionerLoginResponseVO {
this.practitionerBasicInfo = practitionerBasicInfo; this.practitionerBasicInfo = practitionerBasicInfo;
} }
public String getPractitionerIdEG() {
return practitionerIdEG;
}
public void setPractitionerIdEG(String practitionerIdEG) {
this.practitionerIdEG = practitionerIdEG;
}
public String getGetOpenIdUrl() { public String getGetOpenIdUrl() {
return getOpenIdUrl; return getOpenIdUrl;
} }
......
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java 0 → 100644
package com.yd.api.practitioner.vo.payscale;
public class PayScaleInfo {
private Integer monShId;
private String salMstId;
private String drpTitleCode;
private String monDtlType;
private String monDtlItem;
private Integer monDtlPeriod;
private Double monDtlAmount;
private Double monDtlRAmount;
private String createDate;
private String createUser;
public Integer getMonShId() {
return monShId;
}
public void setMonShId(Integer monShId) {
this.monShId = monShId;
}
public String getSalMstId() {
return salMstId;
}
public void setSalMstId(String salMstId) {
this.salMstId = salMstId;
}
public String getDrpTitleCode() {
return drpTitleCode;
}
public void setDrpTitleCode(String drpTitleCode) {
this.drpTitleCode = drpTitleCode;
}
public String getMonDtlType() {
return monDtlType;
}
public void setMonDtlType(String monDtlType) {
this.monDtlType = monDtlType;
}
public String getMonDtlItem() {
return monDtlItem;
}
public void setMonDtlItem(String monDtlItem) {
this.monDtlItem = monDtlItem;
}
public Double getMonDtlAmount() {
return monDtlAmount;
}
public void setMonDtlAmount(Double monDtlAmount) {
this.monDtlAmount = monDtlAmount;
}
public Double getMonDtlRAmount() {
return monDtlRAmount;
}
public void setMonDtlRAmount(Double monDtlRAmount) {
this.monDtlRAmount = monDtlRAmount;
}
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
public String getCreateUser() {
return createUser;
}
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
public Integer getMonDtlPeriod() {
return monDtlPeriod;
}
public void setMonDtlPeriod(Integer monDtlPeriod) {
this.monDtlPeriod = monDtlPeriod;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScalePdfResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.payscale;
import com.yd.api.result.CommonResult;
public class PayScalePdfResponseVO {
private String url;
private CommonResult commonResult;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public CommonResult getCommonResult() {
return commonResult;
}
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleQueryRequestVO.java 0 → 100644
package com.yd.api.practitioner.vo.payscale;
public class PayScaleQueryRequestVO {
private String practitionerIdEG;
public String getPractitionerIdEG() {
return practitionerIdEG;
}
public void setPractitionerIdEG(String practitionerIdEG) {
this.practitionerIdEG = practitionerIdEG;
}
}
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleQueryResponseVO.java 0 → 100644
package com.yd.api.practitioner.vo.payscale;
import com.yd.api.result.CommonResult;
import java.util.List;
public class PayScaleQueryResponseVO {
private List<PayScaleInfo> payScaleInfos;
private CommonResult commonResult;
public List<PayScaleInfo> getPayScaleInfos() {
return payScaleInfos;
}
public void setPayScaleInfos(List<PayScaleInfo> payScaleInfos) {
this.payScaleInfos = payScaleInfos;
}
public CommonResult getCommonResult() {
return commonResult;
}
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
}
yd-api/src/main/java/com/yd/dal/entity/customer/practitioner/PractitionerBasicInfo.java
...@@ -8,6 +8,7 @@ public class PractitionerBasicInfo { ...@@ -8,6 +8,7 @@ public class PractitionerBasicInfo {
private String titleCode; private String titleCode;
private String titleName; private String titleName;
private String gender; private String gender;
private String mobileNo;
public Long getCustomerId() { public Long getCustomerId() {
return customerId; return customerId;
...@@ -65,4 +66,11 @@ public class PractitionerBasicInfo { ...@@ -65,4 +66,11 @@ public class PractitionerBasicInfo {
this.gender = gender; this.gender = gender;
} }
public String getMobileNo() {
return mobileNo;
}
public void setMobileNo(String mobileNo) {
this.mobileNo = mobileNo;
}
} }
yd-api/src/main/java/com/yd/dal/entity/meta/OptionsEGolden.java
...@@ -6,6 +6,9 @@ public class OptionsEGolden { ...@@ -6,6 +6,9 @@ public class OptionsEGolden {
private String optName; private String optName;
private String optAttr; private String optAttr;
private String optOrder; private String optOrder;
private String titleCode;
private String titleName;
private String titleLevel;
public Integer getOptId() { public Integer getOptId() {
return optId; return optId;
...@@ -46,4 +49,28 @@ public class OptionsEGolden { ...@@ -46,4 +49,28 @@ public class OptionsEGolden {
public void setOptOrder(String optOrder) { public void setOptOrder(String optOrder) {
this.optOrder = optOrder; this.optOrder = optOrder;
} }
public String getTitleCode() {
return titleCode;
}
public void setTitleCode(String titleCode) {
this.titleCode = titleCode;
}
public String getTitleName() {
return titleName;
}
public void setTitleName(String titleName) {
this.titleName = titleName;
}
public String getTitleLevel() {
return titleLevel;
}
public void setTitleLevel(String titleLevel) {
this.titleLevel = titleLevel;
}
} }
yd-api/src/main/java/com/yd/dal/entity/practitioner/payscale/PayScaleBasicInfo.java 0 → 100644
package com.yd.dal.entity.practitioner.payscale;
public class PayScaleBasicInfo {
private Integer monShId;
private String salMstId;
private String drpTitleCode;
private String monDtlType;
private String monDtlItem;
private Integer monDtlPeriod;
private Double monDtlAmount;
private Double monDtlRAmount;
private String createDate;
private String createUser;
private String uploadPath;
private String uploadTime;
public Integer getMonShId() {
return monShId;
}
public void setMonShId(Integer monShId) {
this.monShId = monShId;
}
public String getSalMstId() {
return salMstId;
}
public void setSalMstId(String salMstId) {
this.salMstId = salMstId;
}
public String getDrpTitleCode() {
return drpTitleCode;
}
public void setDrpTitleCode(String drpTitleCode) {
this.drpTitleCode = drpTitleCode;
}
public String getMonDtlType() {
return monDtlType;
}
public void setMonDtlType(String monDtlType) {
this.monDtlType = monDtlType;
}
public String getMonDtlItem() {
return monDtlItem;
}
public void setMonDtlItem(String monDtlItem) {
this.monDtlItem = monDtlItem;
}
public Double getMonDtlAmount() {
return monDtlAmount;
}
public void setMonDtlAmount(Double monDtlAmount) {
this.monDtlAmount = monDtlAmount;
}
public Double getMonDtlRAmount() {
return monDtlRAmount;
}
public void setMonDtlRAmount(Double monDtlRAmount) {
this.monDtlRAmount = monDtlRAmount;
}
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
public String getCreateUser() {
return createUser;
}
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
public Integer getMonDtlPeriod() {
return monDtlPeriod;
}
public void setMonDtlPeriod(Integer monDtlPeriod) {
this.monDtlPeriod = monDtlPeriod;
}
public String getUploadPath() {
return uploadPath;
}
public void setUploadPath(String uploadPath) {
this.uploadPath = uploadPath;
}
public String getUploadTime() {
return uploadTime;
}
public void setUploadTime(String uploadTime) {
this.uploadTime = uploadTime;
}
}
yd-api/src/main/java/com/yd/dal/mapper/customer/AclFileUploadMapper.java
...@@ -22,4 +22,6 @@ public interface AclFileUploadMapper { ...@@ -22,4 +22,6 @@ public interface AclFileUploadMapper {
CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType")Integer targetType, @Param("targetUseFor")Integer targetUseFor, @Param("practitionerId")Long practitionerId); CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType")Integer targetType, @Param("targetUseFor")Integer targetUseFor, @Param("practitionerId")Long practitionerId);
List<AclFileUpload> findByAclFileUpload(AclFileUpload fileUpload); List<AclFileUpload> findByAclFileUpload(AclFileUpload fileUpload);
AclFileUpload findByTargetIdAndRemark(@Param("type")Integer type, @Param("targetId")Long targetId, @Param("remark")String remark);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerMapper.java
package com.yd.dal.mapper.customer; package com.yd.dal.mapper.customer;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo; import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
import com.yd.dal.entity.customer.AclPractitioner; import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo; import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerInfo; import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo; import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo; import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -54,4 +56,10 @@ public interface AclPractitionerMapper { ...@@ -54,4 +56,10 @@ public interface AclPractitionerMapper {
PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time); PractitionerRankInfo getPractitionerRankInfoByPractitionerIdEG(@Param("practitionerIdEG") String practitionerIdEG, @Param("time") Integer time);
PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId")Long practitionerId, @Param("time")Integer time); PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(@Param("practitionerId")Long practitionerId, @Param("time")Integer time);
List<PayScaleInfo> findPayScaleByPractitionerEG(@Param("practitionerIdEG")String practitionerIdEG);
PayScaleBasicInfo findFilePathByMonShId(@Param("monShId")Integer monShId);
PractitionerBasicInfo findByIdEG(@Param("practitionerIdEG")String practitionerIdEG);
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/mapper/meta/MdDropOptionsMapper.java
...@@ -31,4 +31,6 @@ public interface MdDropOptionsMapper { ...@@ -31,4 +31,6 @@ public interface MdDropOptionsMapper {
List<MdDropOptions> findByMasterCodeAndOptionsCode(@Param("masterCode")String masterCode, @Param("optionsCode")String optionsCode); List<MdDropOptions> findByMasterCodeAndOptionsCode(@Param("masterCode")String masterCode, @Param("optionsCode")String optionsCode);
List<OptionsEGolden> findByMasterIdsE(@Param("materIds")List<Integer> materIds); List<OptionsEGolden> findByMasterIdsE(@Param("materIds")List<Integer> materIds);
List<OptionsEGolden> findAllTitleEG();
} }
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/service/customer/AclFileUploadDALService.java
...@@ -42,4 +42,13 @@ public interface AclFileUploadDALService { ...@@ -42,4 +42,13 @@ public interface AclFileUploadDALService {
* @param aclFileUpload * @param aclFileUpload
*/ */
void saveFileUpload(AclFileUpload aclFileUpload); void saveFileUpload(AclFileUpload aclFileUpload);
/**
* 根据条件查询
* @param type 类型
* @param targetId id
* @param remark 备注
* @return
*/
AclFileUpload findByTargetIdAndRemark(Integer type, Long targetId, String remark);
} }
yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerDALService.java
package com.yd.dal.service.customer; package com.yd.dal.service.customer;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo; import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo; import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
import com.yd.dal.entity.customer.AclPractitioner; import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo; import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerInfo; import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo; import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -139,4 +141,25 @@ public interface AclPractitionerDALService { ...@@ -139,4 +141,25 @@ public interface AclPractitionerDALService {
* @return 返回结果 * @return 返回结果
*/ */
PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time); PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time);
/**
* eGolden -- 根据经纪人id获取薪资表列表
* @param practitionerIdEG 经纪人id
* @return 结果
*/
List<PayScaleInfo> findPayScaleByPractitionerEG(String practitionerIdEG);
/**
* 查询经纪人薪资文件路径
* @param monShId 流水号
* @return 结果
*/
PayScaleBasicInfo findFilePathByMonShId(Integer monShId);
/**
* 根据EGolden查询
* @param practitionerIdEG id
* @return 返回
*/
PractitionerBasicInfo findByIdEG(String practitionerIdEG);
} }
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclFileUploadDALServiceImpl.java
...@@ -6,6 +6,7 @@ import com.yd.dal.mapper.customer.AclFileUploadMapper; ...@@ -6,6 +6,7 @@ import com.yd.dal.mapper.customer.AclFileUploadMapper;
import com.yd.dal.service.customer.AclFileUploadDALService; import com.yd.dal.service.customer.AclFileUploadDALService;
import com.yd.util.intercept.annotation.TargetDataSource; import com.yd.util.intercept.annotation.TargetDataSource;
import com.yd.util.intercept.commons.DataSourceKey; import com.yd.util.intercept.commons.DataSourceKey;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -47,4 +48,9 @@ public class AclFileUploadDALServiceImpl implements AclFileUploadDALService { ...@@ -47,4 +48,9 @@ public class AclFileUploadDALServiceImpl implements AclFileUploadDALService {
public void saveFileUpload(AclFileUpload aclFileUpload) { public void saveFileUpload(AclFileUpload aclFileUpload) {
aclFileUploadMapper.insertSelective(aclFileUpload); aclFileUploadMapper.insertSelective(aclFileUpload);
} }
@Override
public AclFileUpload findByTargetIdAndRemark(Integer type,Long targetId, String remark ) {
return aclFileUploadMapper.findByTargetIdAndRemark(type,targetId,remark);
}
} }
yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerDALServiceImpl.java
package com.yd.dal.service.customer.impl; package com.yd.dal.service.customer.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.yd.api.practitioner.vo.payscale.PayScaleInfo;
import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo; import com.yd.dal.entity.practitioner.opportunity.PlayerSalesActivityInfo;
import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo; import com.yd.dal.entity.practitioner.opportunity.OwnOpportunityInfo;
import com.yd.dal.entity.customer.AclPractitioner; import com.yd.dal.entity.customer.AclPractitioner;
import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo; import com.yd.dal.entity.customer.practitioner.PractitionerBasicInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerInfo; import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo; import com.yd.dal.entity.customer.practitioner.PractitionerRankInfo;
import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
import com.yd.dal.mapper.customer.AclPractitionerMapper; import com.yd.dal.mapper.customer.AclPractitionerMapper;
import com.yd.dal.service.customer.AclPractitionerDALService; import com.yd.dal.service.customer.AclPractitionerDALService;
import com.yd.util.deshandler.DESTypeHandler; import com.yd.util.deshandler.DESTypeHandler;
...@@ -135,4 +137,22 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService ...@@ -135,4 +137,22 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
public PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time) { public PractitionerRankInfo getPractitionerRankInfoByPractitionerIdYD(Long practitionerId, Integer time) {
return aclPractitionerMapper.getPractitionerRankInfoByPractitionerIdYD(practitionerId,time); return aclPractitionerMapper.getPractitionerRankInfoByPractitionerIdYD(practitionerId,time);
} }
@Override
@TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
public List<PayScaleInfo> findPayScaleByPractitionerEG(String practitionerIdEG) {
return aclPractitionerMapper.findPayScaleByPractitionerEG(practitionerIdEG);
}
@Override
@TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
public PayScaleBasicInfo findFilePathByMonShId(Integer monShId) {
return aclPractitionerMapper.findFilePathByMonShId(monShId);
}
@Override
@TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
public PractitionerBasicInfo findByIdEG(String practitionerIdEG) {
return aclPractitionerMapper.findByIdEG(practitionerIdEG);
}
} }
yd-api/src/main/java/com/yd/dal/service/meta/MdDropOptionsDALService.java
...@@ -21,4 +21,6 @@ public interface MdDropOptionsDALService { ...@@ -21,4 +21,6 @@ public interface MdDropOptionsDALService {
List<MdDropOptions> findByMasterCodeAndOptionsCode(String team_building_track, String s); List<MdDropOptions> findByMasterCodeAndOptionsCode(String team_building_track, String s);
List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds); List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds);
List<OptionsEGolden> findAllTitleEG();
} }
yd-api/src/main/java/com/yd/dal/service/meta/impl/MdDropOptionsDALServiceImpl.java
...@@ -61,4 +61,10 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService { ...@@ -61,4 +61,10 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
public List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds) { public List<OptionsEGolden> findByMasterIdsE(List<Integer> materIds) {
return mdDropOptionsMapper.findByMasterIdsE(materIds); return mdDropOptionsMapper.findByMasterIdsE(materIds);
} }
@Override
@TargetDataSource(dataSourceKey = DataSourceKey.DB_EGOLDEN)
public List<OptionsEGolden> findAllTitleEG() {
return mdDropOptionsMapper.findAllTitleEG();
}
} }
yd-api/src/main/java/com/yd/rmi/ali/oss/service/OssService.java
package com.yd.rmi.ali.oss.service; package com.yd.rmi.ali.oss.service;
import com.yd.rmi.ali.oss.vo.OssRequestVO;
import com.yd.rmi.ali.oss.vo.OssResponseVO;
import java.io.InputStream; import java.io.InputStream;
public interface OssService { public interface OssService {
String putFileToOss(String string, String key, InputStream is) throws Exception; String putFileToOss(String string, String key, InputStream is) throws Exception;
OssResponseVO ossOperate(OssRequestVO ossRequestVO);
} }
yd-api/src/main/java/com/yd/rmi/ali/oss/service/impl/OssServiceImpl.java
...@@ -85,8 +85,8 @@ public class OssServiceImpl implements OssService { ...@@ -85,8 +85,8 @@ public class OssServiceImpl implements OssService {
} }
return url; return url;
} }
@Override
private OssResponseVO ossOperate(OssRequestVO ossRequestVO) { public OssResponseVO ossOperate(OssRequestVO ossRequestVO) {
OssResponseVO ossResponseVO = new OssResponseVO(); OssResponseVO ossResponseVO = new OssResponseVO();
boolean success = true; boolean success = true;
String message = ZHBErrorConfig.getErrorInfo("800000"); String message = ZHBErrorConfig.getErrorInfo("800000");
......
yd-api/src/main/resources/application-dev.properties
...@@ -17,10 +17,16 @@ multiple.datasource.master.username=devdbuser ...@@ -17,10 +17,16 @@ multiple.datasource.master.username=devdbuser
multiple.datasource.master.password=devdbpass1 multiple.datasource.master.password=devdbpass1
#egolden #egolden
#multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver
#multiple.datasource.egolden.url=jdbc:MySql://139.224.138.103:13308/stage_ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
#multiple.datasource.egolden.username=insurance_stage
#multiple.datasource.egolden.password=fWTauSswR2!$
#egolden
multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver
multiple.datasource.egolden.url=jdbc:MySql://139.224.138.103:13308/stage_ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true multiple.datasource.egolden.url=jdbc:MySql://139.224.94.140:13307/ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
multiple.datasource.egolden.username=insurance_stage multiple.datasource.egolden.username=stageuser
multiple.datasource.egolden.password=fWTauSswR2!$ multiple.datasource.egolden.password=AG@#$mstage234
#pagehelper分页插件配置 #pagehelper分页插件配置
pagehelper.helperDialect=mysql pagehelper.helperDialect=mysql
......
yd-api/src/main/resources/application-local.properties
...@@ -17,10 +17,16 @@ multiple.datasource.master.username=devdbuser ...@@ -17,10 +17,16 @@ multiple.datasource.master.username=devdbuser
multiple.datasource.master.password=devdbpass1 multiple.datasource.master.password=devdbpass1
#egolden #egolden
#multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver
#multiple.datasource.egolden.url=jdbc:MySql://139.224.138.103:13308/stage_ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
#multiple.datasource.egolden.username=insurance_stage
#multiple.datasource.egolden.password=fWTauSswR2!$
#egolden
multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver multiple.datasource.egolden.driver-class-name=com.mysql.jdbc.Driver
multiple.datasource.egolden.url=jdbc:MySql://139.224.138.103:13308/stage_ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true multiple.datasource.egolden.url=jdbc:MySql://139.224.94.140:13307/ydinsurance?characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
multiple.datasource.egolden.username=insurance_stage multiple.datasource.egolden.username=stageuser
multiple.datasource.egolden.password=fWTauSswR2!$ multiple.datasource.egolden.password=AG@#$mstage234
#pagehelper分页插件配置 #pagehelper分页插件配置
pagehelper.helperDialect=mysql pagehelper.helperDialect=mysql
......
yd-api/src/main/resources/i18n/messages_zh_CN.properties
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
800000=执行成功！ 800000=执行成功！
##系统提示信息 ##系统提示信息
810001=token无效或者错误！ 810001=token无效或者错误！
820001=为查询到相应结果。 820001=未查询到相应结果。
830001=该用户非寿险经纪人。 830001=该用户非寿险经纪人。
830002=只有寿险经纪人才有权限进入！ 830002=只有寿险经纪人才有权限进入！
......
yd-api/src/main/resources/mapper/customer/AclFileUploadMapper.xml
...@@ -289,4 +289,10 @@ ...@@ -289,4 +289,10 @@
</where> </where>
</select> </select>
<select id="findByTargetIdAndRemark" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ag_acl_file_upload
where target_type = #{type,jdbcType=INTEGER} and target_id = #{targetId,jdbcType=BIGINT} and remark = #{remark,jdbcType=VARCHAR} and is_active = 1
</select>
</mapper> </mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
...@@ -699,7 +699,7 @@ ...@@ -699,7 +699,7 @@
from ag_acl_customer c inner join ag_acl_practitioner p on c.id = p.customer_id from ag_acl_customer c inner join ag_acl_practitioner p on c.id = p.customer_id
left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
left join ag_acl_practitioner_setting s on p.id = s.practitioner_id left join ag_acl_practitioner_setting s on p.id = s.practitioner_id
inner join ag_md_drop_options o on s.practitioner_level = o.id left join ag_md_drop_options o on s.practitioner_level = o.id
where c.login = #{mobileNo}; where c.login = #{mobileNo};
</select> </select>
...@@ -870,4 +870,45 @@ ...@@ -870,4 +870,45 @@
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
<select id="findPayScaleByPractitionerEG" resultType="com.yd.api.practitioner.vo.payscale.PayScaleInfo">
select
t.MON_SH_ID as monShId,
t.FK_SAL_MST_ID as salMstId,
t.FK_DRP_TITLE_CODE as drpTitleCode,
t.MON_DTL_TYPE as monDtlType,
t.MON_DTL_ITEM as monDtlItem,
t.MON_DTL_PERIOD as monDtlPeriod,
ifnull(t.MON_DTL_AMOUNT,0) as monDtlAmount,
ifnull(t.MON_DTL_RAMOUNT,0) as monDtlRAmount,
date_format(t.CREATE_DATE, '%Y-%m-%d %H:%i:%s') as createDate,
t.CREATE_USER as createUser
from mon011 t where FK_SAL_MST_ID = #{practitionerIdEG,jdbcType=VARCHAR};
</select>
<select id="findFilePathByMonShId" resultType="com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo">
select
t.MON_SH_ID as monShId,
t.FK_SAL_MST_ID as salMstId,
t.FK_DRP_TITLE_CODE as drpTitleCode,
t.MON_DTL_TYPE as monDtlType,
t.MON_DTL_ITEM as monDtlItem,
t.MON_DTL_PERIOD as monDtlPeriod,
ifnull(t.MON_DTL_AMOUNT,0) as monDtlAmount,
ifnull(t.MON_DTL_RAMOUNT,0) as monDtlRAmount,
date_format(t.CREATE_DATE, '%Y-%m-%d %H:%i:%s') as createDate,
t.CREATE_USER as createUser,
t.UPLOAD_PATH as uploadPath,
t.UPLOAD_TIME as uploadTime
from mon011 t where t.MON_SH_ID = #{monShId,jdbcType=INTEGER}
</select>
<select id="findByIdEG" resultMap="base_result_map_practitioner_info">
SELECT
p.SAL_MST_ID as practitionerId,
p.SAL_MST_NAME as name,
p.SAL_MST_GENDER as gender,
p.SAL_MST_MOBILE as mobileNo
FROM sal001 p
where p.SAL_MST_ID = #{practitionerIdEG,jdbcType=VARCHAR} limit 1
</select>
</mapper> </mapper>
\ No newline at end of file
yd-api/src/main/resources/mapper/meta/MdDropOptionsMapper.xml
...@@ -254,4 +254,11 @@ ...@@ -254,4 +254,11 @@
#{item} #{item}
</foreach> </foreach>
</select> </select>
<select id="findAllTitleEG" resultType="com.yd.dal.entity.meta.OptionsEGolden">
select
t.DRP_TITLE_CODE as titleCode,
t.DRP_TITLE_NAME as titleName,
t.DRP_TITLE_LEVEL as titleLevel
from drp003 t
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment