Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -109,6 +109,7 @@ public class IotMaintainController {
         IotDeviceDO iotDevice = iotDeviceService.getIotDevice(iotMaintain.getDeviceId());
         IotMaintainRespVO bean = BeanUtils.toBean(iotMaintain, IotMaintainRespVO.class);
         bean.setPics(JSON.parseArray(bean.getPic(), String.class));
+        bean.setOutFiles(JSON.parseArray(bean.getOutFile(), String.class));
         if (Objects.nonNull(iotDevice)&&Objects.nonNull(iotDevice.getManufacturerId())) {
             SupplierDO supplierDO1 = supplierService.get(iotDevice.getManufacturerId());
             bean.setSupplierName(Objects.nonNull(supplierDO1)?supplierDO1.getName():"");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainRespVO.java

@@ -129,4 +129,5 @@ public class IotMaintainRespVO {
     private String createName;
     private LocalDateTime executeDate;
     private List<String> pics;
+    private List<String> outFiles;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainSaveReqVO.java

@@ -92,6 +92,7 @@ public class IotMaintainSaveReqVO {
      * 委外附件
      */
     private String outFile;
+
     /**
      * 类型
      */
@@ -104,4 +105,5 @@ public class IotMaintainSaveReqVO {
     private String deviceCode;
 
     private List<String> pics;
+    private List<String> outFiles;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -32,6 +32,7 @@ import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -251,13 +252,31 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             IotInspectOrderDO iotInspectOrderDO = new IotInspectOrderDO();
             AdminUserRespDTO user = adminUserApi.getUser(k);
             String deptName = "";
+            String chinese = "";
+            String english = "";
             if (Objects.nonNull(user)&&Objects.nonNull(user.getDeptId())) {
                 DeptRespDTO dept = deptApi.getDept(user.getDeptId());
                 if (Objects.nonNull(dept)) {
                     deptName = dept.getName();
+                    if (StringUtils.isNotBlank(deptName)) {
+                        String[] split = deptName.split("~~");
+                        chinese = split[0];
+                        if (split.length > 1) {
+                            english = split[1];
+                            if (StringUtils.isBlank(english)) {
+                                english = chinese;
+                            } else {
+                                english = english.replace("en**", "");
+                            }
+                        }else {
+                            english = chinese;
+                        }
+                    }
                 }
             }
-            iotInspectOrderDO.setInspectOrderTitle(deptName+"/"+(Objects.nonNull(user)?user.getNickname():"")+"/"+ DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")+"-巡检工单");
+            String chineseName = chinese+"/"+(Objects.nonNull(user)?user.getNickname():"")+"/"+ DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")+"-巡检工单";
+            String englishName = english+"/"+(Objects.nonNull(user)?user.getNickname():"")+"/"+ DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")+"-inspect order";
+            iotInspectOrderDO.setInspectOrderTitle(chineseName+"~~en**"+englishName);
             iotInspectOrderDO.setInspectOrderCode("IN"+ DateUtil.format(new Date(),"yyyyMMddHHmmss")+UUID.randomUUID().toString().substring(0, 4));
             iotInspectOrderDO.setCharge(k);
             iotInspectOrderDO.setStatus("todo");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -164,6 +164,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         iotMaintain.setMaintainType("手动新增");
         iotMaintain.setExecuteDate(LocalDateTime.now());
         iotMaintain.setPic(JSON.toJSONString(createReqVO.getMaintain().getPics()));
+        iotMaintain.setOutFile(JSON.toJSONString(createReqVO.getMaintain().getOutFiles()));
         iotMaintainMapper.insert(iotMaintain);
         //插入工单bom
         List<IotMaintainBomSaveReqVO> maintainMaterials = createReqVO.getMaintainMaterials();