Merge remote-tracking branch 'origin/orderChange' into orderChange

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Collections;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Service
@@ -186,15 +183,15 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
         String productName = udiInfoDao.selectProductNameByProductId(deviceMAOrderDetailEntity.getProductId());
         data.put("productName", productName);
         //批次号
-        data.put("batchNo", deviceMAOrderDetailEntity.getBatchNo());
+        data.put("batchNo", StrUtil.isBlank(deviceMAOrderDetailEntity.getBatchNo()) ? "" : deviceMAOrderDetailEntity.getBatchNo());
         //养护时间
         data.put("createTime", deviceMAOrderEntity.getCreateTime());
         //养护人
         data.put("createUser", deviceMAOrderEntity.getCreateUser());
         //审核人
-        data.put("auditUser", deviceMAOrderEntity.getAuditUser());
+        data.put("auditUser", StrUtil.isBlank(deviceMAOrderEntity.getAuditUser()) ? "" : deviceMAOrderEntity.getAuditUser());
         //养护说明
-        data.put("remark", deviceMAOrderDetailEntity.getRemark());
+        data.put("remark", StrUtil.isBlank(deviceMAOrderDetailEntity.getRemark()) ? "" : deviceMAOrderDetailEntity.getRemark());
         //设备状态
         data.put("deviceStatus", deviceMAOrderDetailEntity.getDeviceStatus() == 0 ? "异常" : "正常");
         //养护状态

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -54,6 +54,7 @@
         basic_products.basicPrductRemak6,
         basic_products.basicPrductRemak7,
         basic_products.basicPrductRemak8,
+        basic_udirel.id relId,
         basic_udirel.thirdId,
         basic_udirel.thirdName,
         basic_udirel.isUseDy,