From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java | 164 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 110 insertions(+), 54 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
index 071559b..b285a68 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
@@ -1,95 +1,151 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.CalculateRecord;
import com.ycl.platform.mapper.CalculateRecordMapper;
-import com.ycl.platform.service.ICalculateRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.ycl.platform.service.CalculateRecordService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.CalculateRecordForm;
+import com.ycl.platform.domain.vo.CalculateRecordVO;
+import com.ycl.platform.domain.query.CalculateRecordQuery;
+import java.util.Date;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
/**
- * 鏍哥畻璁板綍Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-04-03
+ * 鏍哥畻璁板綍 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-04-23
*/
@Service
-public class CalculateRecordServiceImpl extends ServiceImpl<CalculateRecordMapper, CalculateRecord> implements ICalculateRecordService
-{
- @Autowired
- private CalculateRecordMapper calculateRecordMapper;
+@RequiredArgsConstructor
+public class CalculateRecordServiceImpl extends ServiceImpl<CalculateRecordMapper, CalculateRecord> implements CalculateRecordService {
+
+ private final CalculateRecordMapper calculateRecordMapper;
/**
- * 鏌ヨ鏍哥畻璁板綍
- *
- * @param id 鏍哥畻璁板綍涓婚敭
- * @return 鏍哥畻璁板綍
+ * 娣诲姞
+ * @param form
+ * @return
*/
@Override
- public CalculateRecord selectCalculateRecordById(Long id)
- {
- return calculateRecordMapper.selectCalculateRecordById(id);
+ public Result add(CalculateRecordForm form) {
+ CalculateRecord entity = CalculateRecordForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
}
/**
- * 鏌ヨ鏍哥畻璁板綍鍒楄〃
- *
- * @param calculateRecord 鏍哥畻璁板綍
- * @return 鏍哥畻璁板綍
+ * 淇敼
+ * @param form
+ * @return
*/
@Override
- public List<CalculateRecord> selectCalculateRecordList(CalculateRecord calculateRecord)
- {
- return calculateRecordMapper.selectCalculateRecordList(calculateRecord);
+ public Result update(CalculateRecordForm form) {
+
+ CalculateRecord entity = baseMapper.selectById(form.getId());
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
}
/**
- * 鏂板鏍哥畻璁板綍
- *
- * @param calculateRecord 鏍哥畻璁板綍
- * @return 缁撴灉
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
*/
@Override
- public int insertCalculateRecord(CalculateRecord calculateRecord)
- {
- return calculateRecordMapper.insertCalculateRecord(calculateRecord);
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
}
/**
- * 淇敼鏍哥畻璁板綍
- *
- * @param calculateRecord 鏍哥畻璁板綍
- * @return 缁撴灉
+ * id鍒犻櫎
+ * @param id
+ * @return
*/
@Override
- public int updateCalculateRecord(CalculateRecord calculateRecord)
- {
- return calculateRecordMapper.updateCalculateRecord(calculateRecord);
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
}
/**
- * 鎵归噺鍒犻櫎鏍哥畻璁板綍
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻璁板綍涓婚敭
- * @return 缁撴灉
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
*/
@Override
- public int deleteCalculateRecordByIds(Long[] ids)
- {
- return calculateRecordMapper.deleteCalculateRecordByIds(ids);
+ public Result page(CalculateRecordQuery query) {
+
+ IPage<CalculateRecord> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(CalculateRecord::getCreateTime)
+ .page(PageUtil.getPage(query, CalculateRecord.class));
+
+ List<CalculateRecordVO> vos = page.getRecords().stream()
+ .map(
+ entity -> CalculateRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
}
/**
- * 鍒犻櫎鏍哥畻璁板綍淇℃伅
- *
- * @param id 鏍哥畻璁板綍涓婚敭
- * @return 缁撴灉
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
*/
@Override
- public int deleteCalculateRecordById(Long id)
- {
- return calculateRecordMapper.deleteCalculateRecordById(id);
+ public Result detail(String id) {
+
+ CalculateRecord entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ CalculateRecordVO vo = CalculateRecordVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<CalculateRecord> entities = baseMapper.selectList(null);
+ List<CalculateRecordVO> vos = entities.stream()
+ .map(
+ entity -> CalculateRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
}
}
--
Gitblit v1.8.0