From 32b4f6188f32e6c08e813efa98a25d94eacdc0c6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 四月 2024 09:32:29 +0800
Subject: [PATCH] Revert "新考核"
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 220 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 163 insertions(+), 57 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index db6d9a1..b7d8729 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,97 +1,203 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.entity.CheckTemplateRule;
+import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.service.ICheckTemplateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import utils.DateUtils;
-
+import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.service.CheckTemplateService;
+import com.ycl.platform.service.YwUnitService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.CheckTemplateForm;
+import com.ycl.platform.domain.vo.CheckTemplateVO;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
+
/**
- * 鑰冩牳妯℃澘Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-04-01
+ * 鑰冩牳妯℃澘 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-06
*/
@Service
-public class CheckTemplateServiceImpl implements ICheckTemplateService
-{
+@RequiredArgsConstructor
+public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements CheckTemplateService {
+
+ private final CheckTemplateMapper checkTemplateMapper;
+ private final CheckTemplateRuleMapper checkTemplateRuleMapper;
@Autowired
- private CheckTemplateMapper checkTemplateMapper;
-
+ private YwUnitService unitService;
/**
- * 鏌ヨ鑰冩牳妯℃澘
- *
- * @param id 鑰冩牳妯℃澘涓婚敭
- * @return 鑰冩牳妯℃澘
+ * 娣诲姞
+ * @param form
+ * @return
*/
@Override
- public CheckTemplate selectCheckTemplateById(Long id)
- {
- return checkTemplateMapper.selectCheckTemplateById(id);
+ @Transactional(rollbackFor = Exception.class)
+ public Result add(CheckTemplateForm form) {
+ CheckTemplate entity = CheckTemplateForm.getEntityByForm(form, null);
+ baseMapper.insert(entity);
+ form.getRuleFormList().stream().forEach(rule -> {
+ CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
+ checkTemplateRule.setCheckTemplateId(entity.getId());
+ checkTemplateRule.setCheckRuleId(rule.getRuleId());
+ checkTemplateRule.setWeight(rule.getWeight());
+ checkTemplateRuleMapper.insert(checkTemplateRule);
+ });
+ return Result.ok("娣诲姞鎴愬姛");
}
/**
- * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
- *
- * @param checkTemplate 鑰冩牳妯℃澘
- * @return 鑰冩牳妯℃澘
+ * 淇敼
+ * @param form
+ * @return
*/
@Override
- public List<CheckTemplate> selectCheckTemplateList(CheckTemplate checkTemplate)
- {
- return checkTemplateMapper.selectCheckTemplateList(checkTemplate);
+ @Transactional(rollbackFor = Exception.class)
+ public Result update(CheckTemplateForm form) {
+
+ CheckTemplate entity = baseMapper.selectById(form.getId());
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ baseMapper.updateById(entity);
+
+ // 鍏堝垹闄ゅ師鍏堢殑瀵瑰簲鍏崇郴
+ new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
+ .eq(CheckTemplateRule::getCheckTemplateId, form.getId())
+ .remove();
+ // 鍐嶉噸鏂版坊鍔�
+ form.getRuleFormList().stream().forEach(rule -> {
+ CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
+ checkTemplateRule.setCheckTemplateId(entity.getId());
+ checkTemplateRule.setCheckRuleId(rule.getRuleId());
+ checkTemplateRule.setWeight(rule.getWeight());
+ checkTemplateRuleMapper.insert(checkTemplateRule);
+ });
+ return Result.ok("淇敼鎴愬姛");
}
/**
- * 鏂板鑰冩牳妯℃澘
- *
- * @param checkTemplate 鑰冩牳妯℃澘
- * @return 缁撴灉
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
*/
@Override
- public int insertCheckTemplate(CheckTemplate checkTemplate)
- {
- checkTemplate.setCreateTime(DateUtils.getNowDate());
- return checkTemplateMapper.insertCheckTemplate(checkTemplate);
+ @Transactional(rollbackFor = Exception.class)
+ public Result remove(List<String> ids) {
+ baseMapper.deleteBatchIds(ids);
+ new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
+ .in(CheckTemplateRule::getCheckTemplateId, ids)
+ .remove();
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
- * 淇敼鑰冩牳妯℃澘
- *
- * @param checkTemplate 鑰冩牳妯℃澘
- * @return 缁撴灉
+ * id鍒犻櫎
+ * @param id
+ * @return
*/
@Override
- public int updateCheckTemplate(CheckTemplate checkTemplate)
- {
- checkTemplate.setUpdateTime(DateUtils.getNowDate());
- return checkTemplateMapper.updateCheckTemplate(checkTemplate);
+ @Transactional(rollbackFor = Exception.class)
+ public Result removeById(String id) {
+ baseMapper.deleteById(id);
+ new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
+ .eq(CheckTemplateRule::getCheckTemplateId, id)
+ .remove();
+ return Result.ok("鍒犻櫎鎴愬姛");
}
/**
- * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭
- * @return 缁撴灉
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
*/
@Override
- public int deleteCheckTemplateByIds(Long[] ids)
- {
- return checkTemplateMapper.deleteCheckTemplateByIds(ids);
+ public Result page(CheckTemplateQuery query) {
+ IPage<CheckTemplate> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .like(StringUtils.hasText(query.getTemplateName()), CheckTemplate::getTemplateName, query.getTemplateName())
+ .eq(StringUtils.hasText(query.getStatus()), CheckTemplate::getStatus, query.getStatus())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ CheckTemplate::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
+ .orderByDesc(CheckTemplate::getCreateTime)
+ .page(PageUtil.getPage(query, CheckTemplate.class));
+
+ List<CheckTemplateVO> vos = page.getRecords().stream()
+ .map(
+ entity -> CheckTemplateVO.getVoByEntity(entity, null)
+// .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
}
/**
- * 鍒犻櫎鑰冩牳妯℃澘淇℃伅
- *
- * @param id 鑰冩牳妯℃澘涓婚敭
- * @return 缁撴灉
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
*/
@Override
- public int deleteCheckTemplateById(Long id)
- {
- return checkTemplateMapper.deleteCheckTemplateById(id);
+ public Result detail(String id) {
+
+ CheckTemplate entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ CheckTemplateVO vo = CheckTemplateVO.getVoByEntity(entity, null);
+
+ // 鏌ヨ�冩牳瑙勫垯
+ List<CheckTemplateRule> ruleList = new LambdaQueryChainWrapper<>(checkTemplateRuleMapper)
+ .eq(CheckTemplateRule::getCheckTemplateId, entity.getId())
+ .list();
+ List<RuleItemVO> ruleVOS = ruleList.stream().map(rule -> {
+ RuleItemVO ruleItemVO = new RuleItemVO();
+ ruleItemVO.setRuleId(rule.getCheckRuleId());
+ ruleItemVO.setWeight(rule.getWeight());
+ return ruleItemVO;
+ }).collect(Collectors.toList());
+ vo.setRuleFormList(ruleVOS);
+
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<CheckTemplate> entities = baseMapper.selectList(null);
+ List<BaseSelect> vos = entities.stream()
+ .map(
+ entity -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(entity.getId());
+ baseSelect.setValue(entity.getTemplateName());
+ return baseSelect;
+ }
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
}
}
--
Gitblit v1.8.0