|
|
@@ -11,19 +11,18 @@ import com.malk.server.common.McR;
|
|
|
import com.malk.server.dingtalk.DDR_New;
|
|
|
import com.malk.service.aliwork.YDClient;
|
|
|
import com.malk.service.aliwork.YDService;
|
|
|
-import com.malk.utils.PublicUtil;
|
|
|
-import com.malk.utils.UtilMap;
|
|
|
-import com.malk.utils.UtilMc;
|
|
|
-import com.malk.utils.UtilNumber;
|
|
|
+import com.malk.utils.*;
|
|
|
import lombok.SneakyThrows;
|
|
|
import lombok.Synchronized;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringEscapeUtils;
|
|
|
import org.apache.logging.log4j.util.Strings;
|
|
|
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -356,6 +355,7 @@ public class KKLImplService implements KKLService {
|
|
|
String cost3 = UtilMap.getString(data,"timeLimit");
|
|
|
String cost4 = UtilMap.getString(data,"packNumber");// 包装数量
|
|
|
String cost5 = UtilMap.getString(data,"packUnit");// 包装单位
|
|
|
+ String cost6 = UtilMap.getString(data,"state");// 原材料状态
|
|
|
|
|
|
//todo2: 服务执行, 周日凌晨更新价格前, 是否重新匹配数据?
|
|
|
List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
|
|
|
@@ -373,8 +373,11 @@ public class KKLImplService implements KKLService {
|
|
|
double price1 = UtilNumber.formatPrecisionValue(cost1 * (rate + 100) / 100f);
|
|
|
double price2 = UtilNumber.formatPrecisionValue(cost2 * (100 + rate2) / 100f);
|
|
|
|
|
|
+
|
|
|
+ String state= cost6.equals("已启用") && Long.parseLong(cost3) > UtilDateTime.getLocalDateTimeTimeStamp()?"已启用":"已停用";
|
|
|
+
|
|
|
Map update = UtilMap.map("numberField_llkknd6h, numberField_lpalgz0a", price1, price2);
|
|
|
- update.putAll(UtilMap.map("numberField_llkknd6g, numberField_lpalgz05, dateField_lm4lxur7, numberField_lnrzzg03, textField_lnrzzg04", cost1, cost2, cost3, cost4, cost5 ));
|
|
|
+ update.putAll(UtilMap.map("numberField_llkknd6g, numberField_lpalgz05, dateField_lm4lxur7, numberField_lnrzzg03, textField_lnrzzg04,textField_lm4lxur8", cost1, cost2, cost3, cost4, cost5,state ));
|
|
|
ydClient.operateData(YDParam.builder()
|
|
|
.formInstanceId(String.valueOf(record.get("formInstanceId")))
|
|
|
.updateFormDataJson(JSON.toJSONString(update))
|
lfx