|
|
@@ -16,7 +16,6 @@ import com.ydtech.modules.admin.model.dto.SysPartnerAPPPageDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysPartnerDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysPartnerPageDto;
|
|
|
import com.ydtech.modules.admin.model.vo.AgencyExtractFeeVo;
|
|
|
-import com.ydtech.modules.admin.model.vo.SysAgencyLeaderVo;
|
|
|
import com.ydtech.modules.admin.model.vo.SysPartnerAPPPageVo;
|
|
|
import com.ydtech.modules.admin.model.vo.SysUserPartner;
|
|
|
import com.ydtech.modules.admin.service.SysAgencyLeaderService;
|
|
|
@@ -41,7 +40,6 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
-import java.util.stream.Stream;
|
|
|
|
|
|
/**
|
|
|
* 配置机构合伙人表(SysPartner)表服务实现类
|
|
|
@@ -437,10 +435,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
String dateStr = "";
|
|
|
if (updateTime != null) {
|
|
|
dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
|
|
|
- agencyExtractFee.setStartTime(updateTime);
|
|
|
} else {
|
|
|
dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
|
|
|
- agencyExtractFee.setStartTime(createTime);
|
|
|
}
|
|
|
HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
|
|
|
if (CollectionUtil.isNotEmpty(map)) {
|
|
|
@@ -597,10 +593,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
String dateStr = "";
|
|
|
if (updateTime != null) {
|
|
|
dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
|
|
|
- sysPartnerAPPPageVo.setStartTime(updateTime);
|
|
|
+// sysPartnerAPPPageVo.setStartTime(updateTime);
|
|
|
} else {
|
|
|
dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
|
|
|
- sysPartnerAPPPageVo.setStartTime(createTime);
|
|
|
+// sysPartnerAPPPageVo.setStartTime(createTime);
|
|
|
}
|
|
|
HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysDept1.getId(), dateStr,null,null);
|
|
|
if (CollectionUtil.isNotEmpty(map)) {
|
