diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index ba9218d..c09ef98 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit ba9218dd49c0443007e925385cec5660dae9d8a2
+Subproject commit c09ef9872fe9c06389ddff0c5a90363f8fe8ae3e
diff --git a/epdc-cloud-points/pom.xml b/epdc-cloud-points/pom.xml
index 8121767..0e50ff9 100644
--- a/epdc-cloud-points/pom.xml
+++ b/epdc-cloud-points/pom.xml
@@ -143,7 +143,7 @@
9070
- 2
+ 8
r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
10001
elink!888
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsIntegralAdjustmentCheckController.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsIntegralAdjustmentCheckController.java
index 37bb2f9..17e50be 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsIntegralAdjustmentCheckController.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsIntegralAdjustmentCheckController.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -52,7 +53,7 @@ public class PointsIntegralAdjustmentCheckController {
@GetMapping("page")
public Result> page(@RequestParam Map params){
- PageData page = pointsIntegralAdjustmentCheckService.page(params);
+ PageData page = pointsIntegralAdjustmentCheckService.getPhrasePage(params);
return new Result>().ok(page);
}
@@ -67,6 +68,9 @@ public class PointsIntegralAdjustmentCheckController {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setWorkUserId(SecurityUser.getUserId().toString());
+ dto.setWorkUserName(SecurityUser.getUser().getRealName());
+ dto.setWorkUserDeptId(SecurityUser.getUser().getDeptId().toString());
+ dto.setWorkUserDeptName(SecurityUser.getUser().getDeptName());
pointsIntegralAdjustmentCheckService.save(dto);
return new Result();
}
@@ -75,11 +79,18 @@ public class PointsIntegralAdjustmentCheckController {
public Result update(@RequestBody PointsIntegralAdjustmentCheckDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
- dto.setWorkUserId(SecurityUser.getUserId().toString());
pointsIntegralAdjustmentCheckService.update(dto);
return new Result();
}
+ @PutMapping("updateCheck")
+ public Result updateCheck(@RequestBody PointsIntegralAdjustmentCheckDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ pointsIntegralAdjustmentCheckService.updateCheck(dto);
+ return new Result();
+ }
+
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsIntegralAdjustmentCheckDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsIntegralAdjustmentCheckDao.java
index 1b943a6..7923747 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsIntegralAdjustmentCheckDao.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsIntegralAdjustmentCheckDao.java
@@ -18,16 +18,26 @@
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PointsIntegralAdjustmentCheckDTO;
import com.elink.esua.epdc.entity.PointsIntegralAdjustmentCheckEntity;
+import com.elink.esua.epdc.phrases.ActPhraseDTO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+
/**
- * 积分调整审核表
+ * 积分调整审核表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-03-31
*/
@Mapper
public interface PointsIntegralAdjustmentCheckDao extends BaseDao {
-
-}
\ No newline at end of file
+ /**
+ * 条件查询
+ * @param params
+ * @return
+ */
+ List getPhrasePage(Map params);
+}
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsIntegralAdjustmentCheckEntity.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsIntegralAdjustmentCheckEntity.java
index af4fe80..75d595c 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsIntegralAdjustmentCheckEntity.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsIntegralAdjustmentCheckEntity.java
@@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
- * 积分调整审核表
+ * 积分调整审核表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-03-31
@@ -46,7 +46,7 @@ public class PointsIntegralAdjustmentCheckEntity extends BaseEpdcEntity {
/**
* 用户昵称
*/
- private String nickName;
+ private String nickname;
/**
* 姓名
@@ -108,4 +108,29 @@ public class PointsIntegralAdjustmentCheckEntity extends BaseEpdcEntity {
*/
private String workUserId;
-}
\ No newline at end of file
+ /**
+ * 工作人员姓名
+ */
+ private String workUserName;
+
+ /**
+ * 工作人员部门ID
+ */
+ private String workUserDeptId;
+
+ /**
+ * 工作人员部门名称
+ */
+ private String workUserDeptName;
+
+ /**
+ * 审核状态(1:未审核;2:通过;3:不通过)
+ */
+ private Integer state;
+
+ /**
+ * 审核意见
+ */
+ private String checkOpinion;
+
+}
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsIntegralAdjustmentCheckExcel.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsIntegralAdjustmentCheckExcel.java
index 7634255..4a6b24f 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsIntegralAdjustmentCheckExcel.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsIntegralAdjustmentCheckExcel.java
@@ -23,7 +23,7 @@ import lombok.Data;
import java.util.Date;
/**
- * 积分调整审核表
+ * 积分调整审核表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-03-31
@@ -75,6 +75,35 @@ public class PointsIntegralAdjustmentCheckExcel {
@Excel(name = "工作人员ID")
private String workUserId;
+ /**
+ * 工作人员姓名
+ */
+ @Excel(name = "工作人员姓名")
+ private String workUserName;
+
+ /**
+ * 工作人员部门ID
+ */
+ @Excel(name = "工作人员部门ID")
+ private String workUserDeptId;
+
+ /**
+ * 工作人员部门名称
+ */
+ @Excel(name = "工作人员部门名称")
+ private String workUserDeptName;
+
+ /**
+ * 审核状态(1:未审核;2:通过;3:不通过)
+ */
+ @Excel(name = "审核状态")
+ private Integer state;
+
+ /**
+ * 审核意见
+ */
+ @Excel(name = "审核意见")
+ private String checkOpinion;
@Excel(name = "乐观锁")
private Integer revision;
@@ -95,4 +124,4 @@ public class PointsIntegralAdjustmentCheckExcel {
private Date updatedTime;
-}
\ No newline at end of file
+}
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsIntegralAdjustmentCheckService.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsIntegralAdjustmentCheckService.java
index ae564fe..0f645db 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsIntegralAdjustmentCheckService.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsIntegralAdjustmentCheckService.java
@@ -21,12 +21,13 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.PointsIntegralAdjustmentCheckDTO;
import com.elink.esua.epdc.entity.PointsIntegralAdjustmentCheckEntity;
+import com.elink.esua.epdc.phrases.ActPhraseDTO;
import java.util.List;
import java.util.Map;
/**
- * 积分调整审核表
+ * 积分调整审核表
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2022-03-31
@@ -43,6 +44,13 @@ public interface PointsIntegralAdjustmentCheckService extends BaseService page(Map params);
+ /**
+ * 分页条件查询
+ * @param params
+ * @return
+ */
+ PageData getPhrasePage(Map params);
+
/**
* 默认查询
*
@@ -83,6 +91,16 @@ public interface PointsIntegralAdjustmentCheckService extends BaseService page(Map params) {
@@ -58,6 +63,18 @@ public class PointsIntegralAdjustmentCheckServiceImpl extends BaseServiceImpl getPhrasePage(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.getPhrasePage(params);
+ return new PageData<>(list, page.getTotal());
+ }
+
@Override
public List list(Map params) {
List entityList = baseDao.selectList(getWrapper(params));
@@ -92,6 +109,27 @@ public class PointsIntegralAdjustmentCheckServiceImpl extends BaseServiceImpl
+
-
\ No newline at end of file
+
+