Commit 660d5ac5 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents ae5e44b9 f7c92003
...@@ -40,7 +40,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> { ...@@ -40,7 +40,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
/** /**
* @param employeeInfo * @param employeeInfo
* @param sql
* @Description: 分页查询 * @Description: 分页查询
* @Author: hgw * @Author: hgw
* @Date: 2022/6/20 20:46 * @Date: 2022/6/20 20:46
......
...@@ -45,10 +45,10 @@ public class LdapUtil { ...@@ -45,10 +45,10 @@ public class LdapUtil {
**/ **/
public List<SearchResultEntry> getAllPersonNamesWithTraditionalWay() { public List<SearchResultEntry> getAllPersonNamesWithTraditionalWay() {
List<SearchResultEntry> result = new ArrayList<>(); List<SearchResultEntry> result = new ArrayList<>();
try { try (LDAPConnection connection = new LDAPConnection(ldapProperties.getUrl(), ldapProperties.getPort(),
LDAPConnection connection = new LDAPConnection(ldapProperties.getUrl(), ldapProperties.getPort(), ldapProperties.getUserName(), ldapProperties.getPassword())) {
ldapProperties.getUserName(), ldapProperties.getPassword()); SearchRequest searchRequest = new SearchRequest(ldapProperties.getBaseDn(), SearchScope.SUB,
SearchRequest searchRequest = new SearchRequest(ldapProperties.getBaseDn(), SearchScope.SUB, "(objectclass=*)"); "(objectclass=*)");
searchRequest.addControl(new SubentriesRequestControl()); searchRequest.addControl(new SubentriesRequestControl());
SearchResult searchResult = connection.search(searchRequest); SearchResult searchResult = connection.search(searchRequest);
result.addAll(searchResult.getSearchEntries()); result.addAll(searchResult.getSearchEntries());
......
...@@ -17,6 +17,11 @@ import java.math.BigDecimal; ...@@ -17,6 +17,11 @@ import java.math.BigDecimal;
public class InsuranceAddParam implements Serializable { public class InsuranceAddParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L; private static final long serialVersionUID = -2689686777914935788L;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/** /**
* 员工姓名 * 员工姓名
*/ */
......
...@@ -4,9 +4,9 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; ...@@ -4,9 +4,9 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author licancan * @author licancan
* @description 投保列表请求参数 * @description 投保列表请求参数
...@@ -14,8 +14,7 @@ import java.util.List; ...@@ -14,8 +14,7 @@ import java.util.List;
*/ */
@Data @Data
@Schema(description = "投保列表请求参数") @Schema(description = "投保列表请求参数")
public class InsuranceListParam extends BaseEntity implements Serializable { public class InsuranceListParam extends BaseEntity {
private static final long serialVersionUID = -4692341622141432288L;
/** /**
* 项目编码 * 项目编码
...@@ -71,24 +70,12 @@ public class InsuranceListParam extends BaseEntity implements Serializable { ...@@ -71,24 +70,12 @@ public class InsuranceListParam extends BaseEntity implements Serializable {
@Schema(description = "项目编码列表") @Schema(description = "项目编码列表")
private List<String> deptNoList; private List<String> deptNoList;
/**
* 保单办理人
*/
@Schema(description = "保单办理人")
private String updateBy;
/** /**
* 购买类型, 1新增、3批增、4替换 * 购买类型, 1新增、3批增、4替换
*/ */
@Schema(description = " 购买类型(派单类型), 1新增、3批增、4替换") @Schema(description = " 购买类型(派单类型), 1新增、3批增、4替换")
private Integer buyType; private Integer buyType;
/**
* 创建者-姓名
*/
@Schema(description = "派单人")
private String createName;
/** /**
* 派单开始时间 * 派单开始时间
*/ */
......
...@@ -193,6 +193,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -193,6 +193,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Override @Override
public IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param) { public IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(param.getMId())) {
param.setMId("1547501570923819009");
}
menuUtil.setAuthSql(user, param); menuUtil.setAuthSql(user, param);
List<String> deptNoList = getDeptNoList(user); List<String> deptNoList = getDeptNoList(user);
IPage<InsuranceListVO> insuranceList = new Page<>(); IPage<InsuranceListVO> insuranceList = new Page<>();
...@@ -1931,6 +1934,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1931,6 +1934,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param.setBpoFlag(projectSetInfoVo.getBpoFlag()); param.setBpoFlag(projectSetInfoVo.getBpoFlag());
param.setSettleType(Integer.parseInt(settleType)); param.setSettleType(Integer.parseInt(settleType));
} }
param.setBpoFlag(projectSetInfoVo.getBpoFlag());
param.setDeptId(projectSetInfoVo.getId());
} }
} }
} }
......
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