From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 145 +++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 88 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index ba2cb87..7f6b6f0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.platform.service.impl;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.read.listener.PageReadListener;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,6 +27,7 @@
import enumeration.general.RuleDeductCategoryEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -77,78 +79,57 @@
private List<CalculateRule> getExcelData() {
ArrayList<CalculateRule> list = new ArrayList<>();
- CalculateRule calculateRule1 = new CalculateRule();
- calculateRule1.setId(1L);
- calculateRule1.setRuleName("瑙嗛骞冲潎鍦ㄧ嚎鐜�");
- calculateRule1.setRuleCondition("鈮�98%");
- calculateRule1.setMax(98D);
- calculateRule1.setDeductCategory(RuleDeductCategoryEnum.DEDUCT_POINTS);
- calculateRule1.setCalcFraction(0.00);
- list.add(calculateRule1);
- CalculateRule calculateRule2 = new CalculateRule();
- calculateRule2.setRuleName("瑙嗛骞冲潎鍦ㄧ嚎鐜�");
- calculateRule2.setRuleCondition("95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%");
- calculateRule2.setMax(97D);
- calculateRule2.setMin(95D);
- calculateRule2.setDeductCategory(RuleDeductCategoryEnum.DEDUCT_POINTS);
- calculateRule2.setCalcFraction(5.00);
- list.add(calculateRule2);
- CalculateRule calculateRule3 = new CalculateRule();
- calculateRule3.setRuleName("瑙嗛骞冲潎鍦ㄧ嚎鐜�");
- calculateRule3.setRuleCondition("90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%");
- calculateRule3.setMax(94D);
- calculateRule3.setMin(90D);
- calculateRule3.setDeductCategory(RuleDeductCategoryEnum.DEDUCT_POINTS);
- calculateRule3.setCalcFraction(10.00);
- list.add(calculateRule3);
- CalculateRule calculateRule33 = new CalculateRule();
- calculateRule33.setRuleName("瑙嗛骞冲潎鍦ㄧ嚎鐜�");
- calculateRule33.setRuleCondition("锛�90%");
- calculateRule33.setMin(89D);
- calculateRule33.setDeductCategory(RuleDeductCategoryEnum.DEDUCT_POINTS);
- calculateRule33.setCalcFraction(10.00);
- list.add(calculateRule33);
- CalculateRule calculateRule4 = new CalculateRule();
- calculateRule4.setId(2L);
- calculateRule4.setRuleName("鍓嶇鎰熺煡婧愭不鐞嗗伐浣�");
- calculateRule4.setRuleCondition("鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級");
- calculateRule4.setDeductCategory(RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY);
- calculateRule4.setCalcFraction(0.1);
- list.add(calculateRule4);
- CalculateRule calculateRule7 = new CalculateRule();
- calculateRule7.setRuleName("鍓嶇鎰熺煡婧愭不鐞嗗伐浣�");
- calculateRule7.setRuleCondition("OSD鏍囪瘑");
- list.add(calculateRule7);
- CalculateRule calculateRule6 = new CalculateRule();
- calculateRule6.setRuleName("鍓嶇鎰熺煡婧愭不鐞嗗伐浣�");
- calculateRule6.setRuleCondition("涓�鏈轰竴妗�");
- list.add(calculateRule6);
- CalculateRule calculateRule5 = new CalculateRule();
- calculateRule5.setId(3L);
- calculateRule5.setRuleName("鍚庡彴绯荤粺鐨勪繚闅�");
- calculateRule5.setRuleCondition("鍗曟鏁呴殰鏃堕暱鑻ヨ秴鍑�72灏忔椂涓嶈冻144灏忔椂鐨勶紝姣忚秴鍑�12灏忔椂锛堜笉瓒�12灏忔椂鎸�12灏忔椂璁★級");
- calculateRule5.setMax(144D);
- calculateRule5.setMin(72D);
- calculateRule5.setDeductCategory(RuleDeductCategoryEnum.MULTIPLY_POINTS_AFTER_DIVIDING_QUANTITY);
- calculateRule5.setCalcFraction(2.00);
- calculateRule5.setCalcUnit(12);
- list.add(calculateRule5);
+ setTemplateRule(list,1,"璁惧骞冲潎鍦ㄧ嚎鐜�","鈮�98%",null,98D,RuleDeductCategoryEnum.DEDUCT_POINTS,0.00);
+ setTemplateRule(list,null,"璁惧骞冲潎鍦ㄧ嚎鐜�","95%鈮よ澶囧钩鍧囧湪绾跨巼锛�98%",97D,95D,RuleDeductCategoryEnum.DEDUCT_POINTS,5.00);
+ setTemplateRule(list,null,"璁惧骞冲潎鍦ㄧ嚎鐜�","90%鈮よ澶囧钩鍧囧湪绾跨巼锛�95%",94D,90D,RuleDeductCategoryEnum.DEDUCT_POINTS,10.00);
+ setTemplateRule(list,null,"璁惧骞冲潎鍦ㄧ嚎鐜�","锛�90%",89D,null,RuleDeductCategoryEnum.DEDUCT_POINTS,20.00);
+
+ setTemplateRule(list,2,"鍓嶇鎰熺煡婧愭不鐞嗗伐浣�","鏃堕挓鍚屾",24D,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.1);
+ setTemplateRule(list,null,"鍓嶇鎰熺煡婧愭不鐞嗗伐浣�","OSD鏍囪瘑",24D,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.1);
+ setTemplateRule(list,null,"鍓嶇鎰熺煡婧愭不鐞嗗伐浣�","涓�鏈轰竴妗�",24D,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.1);
+
+ setTemplateRule(list,3,"瀛樺偍鏁呴殰","鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,椤诲湪24灏忔椂鎺掗櫎鏁呴殰,鍗曟鏁呴殰鍦�24灏忔椂浠ュ唴",24D,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.5);
+ setTemplateRule(list,null,"瀛樺偍鏁呴殰","鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,椤诲湪24灏忔椂鎺掗櫎鏁呴殰,鍗曟鏁呴殰鍦�48灏忔椂浠ュ唴",48D,25D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,1.0);
+ setTemplateRule(list,null,"瀛樺偍鏁呴殰","鍥犺棰戞垨鑰呭浘鐗囦涪澶卞鑷撮噸瑕佹浜嬩欢涓嶈兘鍥炴斁鎴栨煡鐪�",null,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,2.0);
+
+ setTemplateRule(list,4,"瀵逛簬鍓嶇鐐逛綅寮傚父鎯呭喌鐨勫鐞�","闀滃ご鏁呴殰鎴栨薄鏌撴垨鏍戞灊閬尅鎴栨灙鏈鸿瑙掑亸绉绘甯歌搴︽垨琛ュ厜鐏簲浜湭浜�,24灏忔椂鍚庢湭淇鐨�",48D,25D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.5);
+ setTemplateRule(list,null,"瀵逛簬鍓嶇鐐逛綅寮傚父鎯呭喌鐨勫鐞�","闀滃ご鏁呴殰鎴栨薄鏌撴垨鏍戞灊閬尅鎴栨灙鏈鸿瑙掑亸绉绘甯歌搴︽垨琛ュ厜鐏簲浜湭浜�,48灏忔椂鍚庢湭淇鐨�",null,49D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,1.0);
+
+ setTemplateRule(list,5,"纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�","姣忚矾瑙嗛绱涓㈠け10鍒嗛挓锛堝惈锛変互鍐�",10D,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.2);
+ setTemplateRule(list,null,"纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�","涓㈠け10-60 鍒嗛挓锛堝惈锛�",60D,9D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,0.5);
+ setTemplateRule(list,null,"纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�","涓㈠け1 灏忔椂-4 灏忔椂锛堝惈锛�",240D,59D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,1.0);
+ setTemplateRule(list,null,"纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�","涓㈠け4 灏忔椂-12 灏忔椂锛堝惈锛�",720D,539D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,1.5);
+ setTemplateRule(list,null,"纭繚褰曞儚瀹屾暣涓嶅畾鏈熷鎵�鏈夌偣浣嶅綍鍍忓畬鏁存�ф娊鏌�","涓㈠け12 灏忔椂浠ヤ笂",null,719D,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,2.0);
+
+ setTemplateRule(list,6,"纭繚鍥剧墖瀹屾暣涓嶅畾鏈熷鎵�鏈変汉鑴歌溅杈嗕互鍙婃櫤鑳藉墠绔姄鎷嶇殑鍥剧墖瀹屾暣鎬ф娊鏌�","鍙戠幇鍚庡彴瀛樺偍涓嶈兘璋冨彇鍓嶇璁惧鍥剧墖",null,null,RuleDeductCategoryEnum.MULTIPLY_POINTS_BY_QUANTITY,2.0);
+
return list;
}
-
+ private static void setTemplateRule(ArrayList<CalculateRule> list,Integer id,String ruleName,String condition,Double max,Double min,RuleDeductCategoryEnum deductCategoryEnum,Double calcFraction) {
+ CalculateRule calculateRule = new CalculateRule();
+ calculateRule.setId(id);
+ calculateRule.setRuleName(ruleName);
+ calculateRule.setRuleCondition(condition);
+ calculateRule.setMax(max);
+ calculateRule.setMin(min);
+ calculateRule.setDeductCategory(deductCategoryEnum);
+ calculateRule.setCalcFraction(calcFraction);
+ list.add(calculateRule);
+ }
@Override
@Transactional
+ @SneakyThrows
public AjaxResult importData(MultipartFile file, TContract tContract) {
// 淇濆瓨鍚堝悓
tContract.setCreateTime(DateUtils.getNowDate());
save(tContract);
- List<CalculateRule> list = calculateRuleService.readExcel(file);
+
+ // 鑾峰彇鍚堝悓Excel瑙勫垯
+ List<CalculateRule> list = new ArrayList<>();
+ EasyExcel.read(file.getInputStream(), CalculateRule.class, new PageReadListener<CalculateRule>(list::addAll)).sheet().doRead();
// 閬嶅巻鐖跺瓙鍏崇郴
List<CalculateRule> calculateRulesToSave = new ArrayList<>();
- CalculateRule fu1 = new CalculateRule();
- CalculateRule fu2 = new CalculateRule();
- boolean fuNew = true;
for (CalculateRule calculateRule : list) {
// 鍒ゆ柇鏁版嵁瀹屾暣鎬�
if (ObjectUtils.isEmpty(calculateRule.getDeductCategory())) {
@@ -163,35 +144,13 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.warn("璇峰～鍐�" + calculateRule.getRuleName() + calculateRule.getRuleCondition() + "鎵ｅ垎鏁板��");
}
- // 淇濆瓨鐖惰鍒欒幏鍙栫埗id
+ // 淇濆瓨瑙勫垯
if (StringUtils.isNotBlank(calculateRule.getRuleName())) {
- CalculateRule one = new CalculateRule();
- one.setParentId(0L);
- one.setContractId(tContract.getId().intValue());
- one.setRuleName(calculateRule.getRuleName());
- one.setCreateTime(DateUtils.getNowDate());
- one.setDeleted(0);
- calculateRuleService.save(one);
- fu1 = one;
- fuNew = true;
+ calculateRule.setContractId(tContract.getId().intValue());
+ calculateRule.setCreateTime(DateUtils.getNowDate());
+ calculateRule.setUpdateTime(DateUtils.getNowDate());
+ calculateRulesToSave.add(calculateRule);
}
- // 淇濆瓨绗簩灞傜埗瑙勫垯鑾峰彇绗簩灞傜埗id
- // if (StringUtils.isNotBlank(calculateRule.getRuleDesc())) {
- // CalculateRule two = new CalculateRule();
- // two.setContractId(tContract.getId().intValue());
- // two.setParentId(fu1.getId());
- // two.setRuleDesc(calculateRule.getRuleDesc());
- // two.setCreateTime(DateUtils.getNowDate());
- // two.setDeleted(0);
- // calculateRuleService.save(two);
- // fu2 = two;
- // fuNew = false;
- // }
- calculateRule.setContractId(tContract.getId().intValue());
- calculateRule.setCreateTime(DateUtils.getNowDate());
- calculateRule.setDeleted(0);
- calculateRule.setParentId(fuNew ? fu1.getId() : fu2.getId());
- calculateRulesToSave.add(calculateRule);
}
// 鎵归噺淇濆瓨瑙勫垯
calculateRuleService.saveBatch(calculateRulesToSave);
@@ -231,4 +190,14 @@
.ge(TContract::getEndTime, DateUtils.getDate())
.list();
}
+
+ @Override
+ public Result timeRange(Integer unitId) {
+ List<TContract> unitContractList = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(TContract::getId, TContract::getName, TContract::getStartTime, TContract::getEndTime)
+ .eq(TContract::getUnitId, unitId)
+ .ge(TContract::getEndTime, new Date())
+ .list();
+ return Result.ok().data(unitContractList);
+ }
}
--
Gitblit v1.8.0