suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增逾期完成

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-23 19:46:12 +08:00
parent 00ee314e13
commit a655ddefb0
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/FollowTaskStatusEnum.java
View File

@@ -12,6 +12,7 @@ public enum FollowTaskStatusEnum {
FINISHED(1, "已完成"),
OVERDUE(2, "已逾期"),
CANCELLED(3, "作废"),
OVERDUE_FINISH(4, "逾期完成"),
;
//任务状态:0:待完成、1:已完成、2:已逾期、3:作废

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
View File

@@ -86,10 +86,10 @@ public class HyFollowTaskDAO {
* @param followTaskId
* @return
*/
public Integer finishFollowTask(Long followTaskId){
public Integer finishFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){
HyFollowTaskDO update = new HyFollowTaskDO();
update.setId(followTaskId);
update.setTaskStatus(FollowTaskStatusEnum.FINISHED.getCode());
update.setTaskStatus(followTaskStatus.getCode());
update.setFinishTime(new Date());
return updateFollowTask(update);
}

2
coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
View File

@@ -169,7 +169,7 @@
<if test="deadlineEndTime != null">
<![CDATA[ and a.deadline <= #{deadlineEndTime}]]>
</if>
order by a.deadline desc
order by a.deadline desc, a.id desc
</select>
<select id="getFollowTask" resultMap="BaseResultMap">

1
coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java
View File

@@ -1,7 +1,6 @@
package com.cool.store.vo.follow;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.log.LogFieldDTO;
import com.cool.store.entity.CallRecordDO;
import com.cool.store.entity.HyFollowTaskDO;
import com.cool.store.entity.HyPartnerTaskInfoLogDO;

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
View File

@@ -171,7 +171,11 @@ public class FollowTaskServiceImpl implements FollowTaskService {
throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE);
}
checkLine(followTask.getPartnerLineId());
return hyFollowTaskDAO.finishFollowTask(request.getFollowTaskId());
FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.FINISHED;
if(followTask.getDeadline().getTime() < System.currentTimeMillis()){
followTaskStatus = FollowTaskStatusEnum.OVERDUE_FINISH;
}
return hyFollowTaskDAO.finishFollowTask(request.getFollowTaskId(), followTaskStatus);
}
@Override