From d0e7c0db0392087242e31cdc8ec46a140d6018ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Nov 2023 12:49:08 +0800
Subject: [PATCH] chore:小程序推送修改提交
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 3 ++-
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 3 ++-
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 9 +++++----
screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java | 14 +++++++++-----
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 7 +++++++
5 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index 19b66b0..c6157c1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -21,6 +21,7 @@
import javax.validation.Valid;
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.Allocation;
import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
import com.moral.api.service.UserService;
@@ -72,7 +73,7 @@
@PostMapping("pushOneUser")
@ApiOperation(value = "���������������������")
- public ResultMessage pushOneUser(@Valid @RequestBody AppAllocationPushUserCond appAllocationPushUserCond){
+ public ResultMessage pushOneUser(@Valid @RequestBody Allocation appAllocationPushUserCond){
userService.pushOneUser(appAllocationPushUserCond);
// String body = push("oOCWi6-_hnzSvrMT8HX5D7Dz7tEA");
return ResultMessage.ok();
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
index b5fb539..4cf58f7 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.enums.AllocationApproveEnum;
+import com.moral.api.pojo.enums.ChangeEnum;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.utils.BeanConverts;
@@ -75,11 +76,14 @@
private String stateName;
public Integer getResidueDay() {
- int day = this.changeDay;
- if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
- Date date = new Date();
- int days = DateUtils.getDays(escalationTime, date);
- return day-days;
+ int day=0;
+ if (this.changeType==ChangeEnum.DEADLINE.value){
+ day = this.changeDay;
+ if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
+ Date date = new Date();
+ int days = DateUtils.getDays(escalationTime, date);
+ return day-days;
+ }
}
return day;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 80a183c..37282b5 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.Allocation;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -53,6 +54,6 @@
boolean updateUserId(Integer userId);
- void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond);
+ void pushOneUser(Allocation appAllocationPushUserCond);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 4fa7ada..bf4a59d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -70,6 +70,8 @@
private ResponsibilityUnitService responsibilityUnitService;
@Autowired
private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private UserService userService;
/**
* ������������������������������������
@@ -132,6 +134,8 @@
}
//������������������
allocationMapper.insert(allocation);
+ //������������
+ userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
if(NEW_BUILT.equals(allocationCond.getState())) {
//������������������
@@ -526,6 +530,9 @@
allocation.setState(changeCond.getState());
allocation.setChangeTime(new Date());
this.updateById(allocation);
+ //������������
+ Allocation allocation1 = this.getById(changeCond.getAllocationId());
+ userService.pushOneUser(allocation1);
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index a603cbc..4d6e8d9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -26,7 +26,6 @@
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.*;
-import com.sun.org.apache.regexp.internal.RE;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -77,6 +76,9 @@
@Autowired
private ResponsibilityUnitMapper responsibilityUnitMapper;
+
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
@Value("${AES.KEY}")
@@ -237,15 +239,14 @@
}
- @Autowired
- private ResponsibilityUnitService responsibilityUnitService;
+
/**
* ���������������
* @param appAllocationPushUserCond
*/
@Override
@Async
- public void pushOneUser(AppAllocationPushUserCond appAllocationPushUserCond) {
+ public void pushOneUser(Allocation appAllocationPushUserCond) {
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId());
Integer areaCode = responsibilityUnit.getAreaCode();
--
Gitblit v1.8.0