From 2220383df9ee6bfbced20b83b83c90b6a68d995f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 05 Sep 2023 17:41:02 +0800
Subject: [PATCH] 填报调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java | 274 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 157 insertions(+), 117 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
index baa96c3..f685a88 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
+import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResWaterDeliveryService;
import cn.gistack.system.user.feign.IUserClient;
@@ -9,9 +10,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @ClassName TbAttResWaterDeliveryServiceImpl
@@ -33,161 +37,197 @@
* @return
*/
@Override
- public TbAttResWaterDelivery getDetailByGuid(String guid) {
+ public List<TbAttResWaterDelivery> getDetailByGuid(String guid) {
return baseMapper.getDetailByResGuid(guid);
}
/**
* 编辑
- * @param tbAttResWaterDelivery
+ * @param newList
* @return
*/
@Override
- public boolean updateByGuid(TbAttResWaterDelivery tbAttResWaterDelivery) {
+ public boolean updateByGuid(List<TbAttResWaterDelivery> newList) {
// 查询是否存在
- TbAttResWaterDelivery detail = baseMapper.getDetailByResGuid(tbAttResWaterDelivery.getResGuid());
+ List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
// 更新日志
- setUpdateLog(detail,tbAttResWaterDelivery);
- // 修改
- int i = addOrUpdateByGuid(detail,tbAttResWaterDelivery);
- if (i>0){
+ setUpdateLog(oldList,newList);
+ // 创建或更新数据
+ boolean flag = addOrUpdate(oldList,newList);
+ // 返回
+ return flag;
+ }
+
+ /**
+ * 新增或更新数据
+ * @param oldList
+ * @param newList
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addOrUpdate(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
+ // 取旧数据和新提交数据差集--删除
+ // 去除前一天已填报的人员手机号集合
+ List<TbAttResWaterDelivery> removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ // 取旧数据和新提交数据交集--更新
+ List<TbAttResWaterDelivery> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ // 取新数提交据和旧数据交集--新增
+ List<TbAttResWaterDelivery> addList = newList.stream().filter(vo -> !oldList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ boolean addFlag = true;
+ boolean updateFlag = true;
+ boolean removeFlag = true;
+ if (addList.size()>0){
+ // 批量新增
+ addFlag = saveBatch(addList);
+ }
+ if (updateList.size()>0){
+ // 批量更新
+ addFlag = updateBatchById(updateList);
+ }
+ if (removeList.size()>0){
+ // 批量删除
+ removeFlag = removeBatchByIds(removeList);
+ }
+ if (addFlag && updateFlag && removeFlag){
return true;
}
+ // 返回
return false;
}
/**
* 审核
- * @param tbAttResWaterDelivery
+ * @param newList
* @return
*/
@Override
- public boolean auditByGuid(TbAttResWaterDelivery tbAttResWaterDelivery) {
+ public boolean auditByGuid(List<TbAttResWaterDelivery> newList) {
// 查询是否存在
- TbAttResWaterDelivery detail = baseMapper.getDetailByResGuid(tbAttResWaterDelivery.getResGuid());
+ List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
// 更新操作日志
- setUpdateLog(detail,tbAttResWaterDelivery);
+ setUpdateLog(oldList,newList);
// 更新审核日志
- setUpdateCheckLog(detail,tbAttResWaterDelivery);
- if (null!=detail){
- tbAttResWaterDelivery.setGuid(detail.getGuid());
- }
- // 驳回情况下将状态修改回0即已填写未提交状态
- if (tbAttResWaterDelivery.getCheckState()==3){
- tbAttResWaterDelivery.setCheckState(0);
- }
+ setUpdateCheckLog(oldList,newList);
// 更新数据
- int i = baseMapper.updateById(tbAttResWaterDelivery);
- if (i>0){
- return true;
- }
- return false;
- }
-
- /**
- * 更新
- * @param tbAttResWaterDelivery
- * @return
- */
- private int addOrUpdateByGuid(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery tbAttResWaterDelivery){
- int i = 0;
- if (null!=oldAbAttResBase){
- tbAttResWaterDelivery.setGuid(oldAbAttResBase.getGuid());
- // 更新
- i = baseMapper.updateById(tbAttResWaterDelivery);
- }else {
- tbAttResWaterDelivery.setCreateTime(new Date());
- i = baseMapper.insert(tbAttResWaterDelivery);
- }
+ boolean batch = updateBatchById(newList);
// 返回
- return i;
+ return batch;
}
/**
- * @param oldAbAttResBase
- * @param newTbAttResWaterDelivery
+ * @param oldList
+ * @param newList
* 更新审核记录
*/
- private void setUpdateCheckLog(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery newTbAttResWaterDelivery) {
- String fillName = "";
- if (newTbAttResWaterDelivery.getCheckState()==2){
- fillName = "审核";
- }
- if (newTbAttResWaterDelivery.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
- }
+ private void setUpdateCheckLog(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
+ // 遍历
+ for (TbAttResWaterDelivery newTbAttResWaterDelivery : newList) {
+ String fillName = "";
+ if (newTbAttResWaterDelivery.getCheckState() == 2) {
+ fillName = "审核";
+ }
+ if (newTbAttResWaterDelivery.getCheckState() == 3) {
+ fillName = "退回" + (null == newTbAttResWaterDelivery.getCheckLog() ? "" : ":" + newTbAttResWaterDelivery.getCheckLog());
+ for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
+ if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
+ // 退回时进行设置状态为填写中
+ newTbAttResWaterDelivery.setCheckState(0);
+ }
+ }
+ }
- // 拼接
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
- String userName = AuthUtil.getUser().getUserName();
- String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
- StringBuilder builder = new StringBuilder();
- builder.append(time)
- .append(",")
- .append(fillName)
- .append(",")
- .append(userName)
- .append(",")
- .append(phone)
- .append(";");
- // 判断是否存在
- if (null==oldAbAttResBase){
- // 填报
- newTbAttResWaterDelivery.setCheckLog(builder.toString());
- }else {
- StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
- stringBuilder.append(builder);
- // 填报
- newTbAttResWaterDelivery.setCheckLog(stringBuilder.toString());
+ // 拼接
+ String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
+ String userName = AuthUtil.getUser().getUserName();
+ String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
+ StringBuilder builder = new StringBuilder();
+ builder.append(time)
+ .append(",")
+ .append(fillName)
+ .append(",")
+ .append(userName)
+ .append(",")
+ .append(phone)
+ .append(";");
+ // 判断是否存在
+ if (null==newTbAttResWaterDelivery.getGuid() || newTbAttResWaterDelivery.getGuid().equals("")){
+ // 填报
+ newTbAttResWaterDelivery.setCheckLog(builder.toString());
+ } else {
+ for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
+ if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
+ StringBuilder stringBuilder = new StringBuilder(null == tbAttResWaterDelivery.getCheckLog() ? "" : tbAttResWaterDelivery.getCheckLog());
+ stringBuilder.append(builder);
+ // 填报
+ newTbAttResWaterDelivery.setCheckLog(stringBuilder.toString());
+ }
+ }
+ }
}
}
/**
- * @param oldAbAttResBase
- * @param newTbAttResWaterDelivery
+ * @param oldList
+ * @param newList
* 更新操作记录
*/
- private void setUpdateLog(TbAttResWaterDelivery oldAbAttResBase,TbAttResWaterDelivery newTbAttResWaterDelivery) {
- String fillName = "";
- if (newTbAttResWaterDelivery.getCheckState()==0){
- fillName = "编辑";
- }
- if (newTbAttResWaterDelivery.getCheckState()==1){
- fillName = "提交";
- }
- if (newTbAttResWaterDelivery.getCheckState()==2){
- fillName = "审核";
- }
- if (newTbAttResWaterDelivery.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
- }
- if (newTbAttResWaterDelivery.getCheckState()==4){
- fillName = "编辑";
- newTbAttResWaterDelivery.setCheckState(oldAbAttResBase.getCheckState());
- }
+ private void setUpdateLog(List<TbAttResWaterDelivery> oldList,List<TbAttResWaterDelivery> newList) {
+ // 遍历
+ for (TbAttResWaterDelivery newTbAttResWaterDelivery : newList){
+ String fillName = "";
+ if (newTbAttResWaterDelivery.getCheckState()==0){
+ fillName = "编辑";
+ }
+ if (newTbAttResWaterDelivery.getCheckState()==1){
+ fillName = "提交";
+ }
+ if (newTbAttResWaterDelivery.getCheckState()==2){
+ fillName = "审核";
+ }
+ if (newTbAttResWaterDelivery.getCheckState()==3){
+ fillName = "退回" + (null==newTbAttResWaterDelivery.getCheckLog()?"":":" + newTbAttResWaterDelivery.getCheckLog());
+ }
+ // 管理员编辑
+ if (newTbAttResWaterDelivery.getCheckState()==4){
+ fillName = "编辑";
+ // 找到相关的 guid 数据
+ for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
+ if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
+ newTbAttResWaterDelivery.setCheckState(tbAttResWaterDelivery.getCheckState());
+ }
+ }
+ }
- // 拼接
- String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
- String userName = AuthUtil.getUser().getUserName();
- String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
- StringBuilder builder = new StringBuilder();
- builder.append(time)
- .append(",")
- .append(fillName)
- .append(",")
- .append(userName)
- .append(",")
- .append(phone)
- .append(";");
- // 判断是否存在
- if (null==oldAbAttResBase){
- // 填报
- newTbAttResWaterDelivery.setLog(builder.toString());
- }else {
- StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
- stringBuilder.append(builder);
- // 填报
- newTbAttResWaterDelivery.setLog(stringBuilder.toString());
+ // 拼接
+ String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
+ String userName = AuthUtil.getUser().getUserName();
+ String phone = userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone();
+ StringBuilder builder = new StringBuilder();
+ builder.append(time)
+ .append(",")
+ .append(fillName)
+ .append(",")
+ .append(userName)
+ .append(",")
+ .append(phone)
+ .append(";");
+ // 判断是否存在
+ if (null==newTbAttResWaterDelivery.getGuid() || newTbAttResWaterDelivery.getGuid().equals("")){
+ // 填报
+ newTbAttResWaterDelivery.setLog(builder.toString());
+ }else {
+ for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
+ if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
+ StringBuilder stringBuilder = new StringBuilder(null==tbAttResWaterDelivery.getLog()?"":tbAttResWaterDelivery.getLog());
+ stringBuilder.append(builder);
+ // 填报
+ newTbAttResWaterDelivery.setLog(stringBuilder.toString());
+ }
+ }
+ }
}
}
}
--
Gitblit v1.9.3