From 2fc80842a96ced69006186f4febe9a8b658b2317 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:39 +0800
Subject: [PATCH] aa
---
server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java | 7 +++++--
server/src/main/resources/application.yml | 4 ----
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 3 +++
.idea/dmMes.iml | 9 +++++++++
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/.idea/dmMes.iml b/.idea/dmMes.iml
index d6ebd48..73e8f54 100644
--- a/.idea/dmMes.iml
+++ b/.idea/dmMes.iml
@@ -5,5 +5,14 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/server/lib/antelope-other-client-20230203.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
\ No newline at end of file
diff --git a/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java
index 04bbbb4..ff62915 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java
@@ -275,8 +275,11 @@
for(int i=0;i<materialList.size();i++){
Integer counter=i+2;
Material material=materialList.get(i);
- if(StringUtils.isEmpty(material.getName())||StringUtils.isEmpty(material.getCode())||StringUtils.isEmpty(material.getUnitname())
- ||StringUtils.isEmpty(material.getFormationname())||StringUtils.isEmpty(material.getAttr())
+ if(StringUtils.isEmpty(material.getName())
+ ||StringUtils.isEmpty(material.getCode())
+ ||StringUtils.isEmpty(material.getUnitname())
+ ||StringUtils.isEmpty(material.getFormationname())
+ ||StringUtils.isEmpty(material.getAttr())
||StringUtils.isEmpty(material.getCateUnionName())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "绗�"+counter+"琛岋細瀵煎叆鏁版嵁鍐呭涓嶈兘涓虹┖锛�");
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 09bf3d7..ac96eba 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,6 +137,9 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
+// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
+// s.divide(new BigDecimal(0),2);
+// model.setSalary(s.doubleValue());
}
}
return PageData.from(new PageInfo<>(result));
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 3d9a01d..ae670ec 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,11 +9,7 @@
# application:
# name: doumeemes
profiles:
-<<<<<<< HEAD
- active: standardTest
-=======
active: standardLingyang
->>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3