other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善欠款客户备案

Browse Source
This commit is contained in:
fanzongzhe
2023-10-19 10:26:13 +08:00
parent c2250b187b
commit 9f8bf9e5a9
4 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
message-center-api/src/main/java/com/yxt/messagecenter/api/messageurgeList/MessageUrgeListQuery.java
View File

@@ -10,4 +10,10 @@ import lombok.Data;
*/
@Data
public class MessageUrgeListQuery implements Query {
private String startTime;
private String endTime;
private String applyName; //发起人
private String useTime; //审批用时
private String sysCount; //系统催办次数
}

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListMapper.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
public interface MessageUrgeListMapper extends BaseMapper<MessageUrgeList> {
List<MessageUrgeList> selecct(String taskId);
IPage<MessageUrgeListVo> urgeCount(IPage<MessageUrgeList> page);
List<MessageUrgeListVo> urgeCount();
int selCuiBanCount(@Param("taskId") String taskId, @Param("procInstId") String procInstId, @Param("count") int count);

159
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListService.java
View File

@@ -111,16 +111,46 @@ public class MessageUrgeListService extends MybatisBaseService<MessageUrgeListMa
return baseMapper.selecct(taskId);
}
/**
* 分页方法
*/
public List<MessageUrgeListVo> pageBySubList(List<MessageUrgeListVo> list, int pagesize, int currentPage) {
int totalcount = list.size();
int pagecount = 0;
List<MessageUrgeListVo> subList;
int m = totalcount % pagesize;
if (m > 0) {
pagecount = totalcount / pagesize + 1;
} else {
pagecount = totalcount / pagesize;
}
if (m == 0) {
subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
} else {
if (currentPage == pagecount) {
subList = list.subList((currentPage - 1) * pagesize, totalcount);
} else {
subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
}
}
return subList;
}
/**
* 催办统计
*
* @return
*/
public PagerVo<MessageUrgeListVo> urgeCount(PagerQuery<MessageUrgeListQuery> pagerQuery) {
public PagerVo<MessageUrgeListVo> urgeCount(PagerQuery<MessageUrgeListQuery> pq) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
IPage<MessageUrgeList> page = PagerUtil.queryToPage(pagerQuery);
IPage<MessageUrgeListVo> pagging = baseMapper.urgeCount(page);
List<MessageUrgeListVo> records = pagging.getRecords();
PagerVo<MessageUrgeListVo> pagerVo = new PagerVo<>();
MessageUrgeListQuery params = pq.getParams();
// IPage<MessageUrgeList> page = PagerUtil.queryToPage(pagerQuery);
// IPage<MessageUrgeListVo> pagging = baseMapper.urgeCount();
// List<MessageUrgeListVo> records = pagging.getRecords();
List<MessageUrgeListVo> records = baseMapper.urgeCount();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (MessageUrgeListVo urgeVo : records) {
@@ -219,8 +249,125 @@ public class MessageUrgeListService extends MybatisBaseService<MessageUrgeListMa
}
}
}
SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
//开始拼接查询条件
List<MessageUrgeListVo> listStartTime = new ArrayList<>();
if (StringUtils.isNotBlank(params.getStartTime()) && StringUtils.isBlank(params.getEndTime())) {
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getStartTime())) {
String recordStartTime = record.getStartTime();
try {
Date parse1 = sdfDate.parse(recordStartTime);
Date parse2 = sdfDate.parse(params.getStartTime());
if (!parse2.after(parse1)) {
listStartTime.add(record);
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
} else if (StringUtils.isNotBlank(params.getEndTime()) && StringUtils.isBlank(params.getStartTime())) {
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getStartTime())) {
String recordStartTime = record.getStartTime();
try {
Date parse1 = sdfDate.parse(recordStartTime);
Date parse2 = sdfDate.parse(params.getEndTime());
if (!parse1.after(parse2)) {
listStartTime.add(record);
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
} else if (StringUtils.isNotBlank(params.getStartTime()) && StringUtils.isNotBlank(params.getEndTime())) {
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getStartTime())) {
String recordStartTime = record.getStartTime();
try {
Date parse1 = sdfDate.parse(recordStartTime);
Date parse2 = sdfDate.parse(params.getEndTime());
Date parse3 = sdfDate.parse(params.getStartTime());
if (!parse1.after(parse2) && !parse3.after(parse1)) {
listStartTime.add(record);
}
} catch (ParseException e) {
e.printStackTrace();
}
}
}
}
List<MessageUrgeListVo> listName = new ArrayList<>();
if (StringUtils.isNotBlank(params.getApplyName())) {
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getApplyName())) {
if (record.getApplyName().contains(params.getApplyName())) {
listName.add(record);
}
}
}
}
List<MessageUrgeListVo> listUseTime = new ArrayList<>();
if (StringUtils.isNotBlank(params.getUseTime())) {
String useTime = params.getUseTime();
int useIntTime = Integer.parseInt(useTime) * 60;
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getApprovalTime())) {
String approvalTime = record.getApprovalTime();
String[] split = approvalTime.split("-");
int i = Integer.parseInt(split[0]);
int i1 = Integer.parseInt(split[1]);
int i2 = Integer.parseInt(split[2]);
int time = i * 3600 + i1 * 60 + i2;
if (time >= useIntTime) {
listUseTime.add(record);
}
}
}
}
List<MessageUrgeListVo> listSysCount = new ArrayList<>();
if (StringUtils.isNotBlank(params.getSysCount())) {
int i = Integer.parseInt(params.getSysCount());
for (MessageUrgeListVo record : records) {
if (StringUtils.isNotBlank(record.getSysCount())) {
String sysCount = record.getSysCount();
if (Integer.parseInt(sysCount) >= i) {
listSysCount.add(record);
}
}
}
}
listStartTime.removeAll(listName);
listStartTime.addAll(listName);
listStartTime.removeAll(listUseTime);
listStartTime.addAll(listUseTime);
listStartTime.removeAll(listSysCount);
listStartTime.addAll(listSysCount);
if (StringUtils.isBlank(params.getSysCount())
&& StringUtils.isBlank(params.getApplyName())
&& StringUtils.isBlank(params.getUseTime())
&& StringUtils.isBlank(params.getEndTime())
&& StringUtils.isBlank(params.getStartTime())) {
listStartTime.removeAll(Collections.singleton(null));
listStartTime.addAll(records);
}
if (!listStartTime.isEmpty()) {
List<MessageUrgeListVo> lastList = this.pageBySubList(listStartTime, (int) pq.getSize(), (int) pq.getCurrent());
lastList.sort((t1, t2) -> t2.getStartTime().compareTo(t1.getStartTime()));
pagerVo.setRecords(lastList);
pagerVo.setTotal(listStartTime.size());
pagerVo.setCurrent(pq.getCurrent());
pagerVo.setSize(pq.getSize());
if (listStartTime.size() % pq.getSize() != 0L) {
pagerVo.setPages((listStartTime.size() / pq.getSize()) + 1);
} else {
pagerVo.setPages(listStartTime.size() / pq.getSize());
}
pagerVo.setMsg("当前共查询到" + listStartTime.size() + "条记录");
}
}
PagerVo<MessageUrgeListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
return pagerVo;
}
}

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java
View File

@@ -46,7 +46,7 @@ public class ScheduledMessageService {
//@Scheduled(cron = "0 0 0 * * ?")
// @Scheduled(cron = "0 0/5 16 * * ?")
// @Scheduled(cron = "0/30 * * * * ?") //每30秒执行一次
// @Scheduled(cron = "0/30 * * * * ?") //每30秒执行一次
public void remindMessage() {
//查询规则
Date now = new Date();