|
@@ -87,25 +87,30 @@ public class EquForkliftRepairRecordServiceImpl extends ServiceImpl<EquForkliftR
|
|
|
List<SysDictDo> repairPersonType = dictService.getByRedis("equ_cxwxbyr");
|
|
|
Map<String, String> dictMap = repairPersonType.stream().collect(Collectors.toMap(SysDictDo::getName, SysDictDo::getValue));
|
|
|
|
|
|
+ String rapairname ="";
|
|
|
+ String rapairid ="";
|
|
|
+ // 使用 StringBuilder 来构建新的字符串
|
|
|
+ StringBuilder newStr = new StringBuilder();
|
|
|
// 生成流水号
|
|
|
for (EquForkliftRepairRecordDo forkliftRepairRecord : newForkliftRepairRecord) {
|
|
|
- SysSerialVo sysSerialVo = new SysSerialVo();
|
|
|
- String plantSimp = PlantEnum.addrOf(forkliftRepairRecord.getTenantid());
|
|
|
-// sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_" + plantSimp);
|
|
|
-// // sysSerialVo.setResetrule("date:yyyy");
|
|
|
-// sysSerialVo.setRuleTemplateStr(plantSimp + "-BYBZ-@{serialNumber:#00000}");
|
|
|
-// R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
|
|
|
-// if ("200".equals(serialNumberCode.getCode())) {
|
|
|
-// Object data = serialNumberCode.getData();
|
|
|
-// forkliftRepairRecord.setStandardid(JSONObject.parseObject(JSONObject.toJSONString(data), Map.class).get("code").toString());
|
|
|
-// }
|
|
|
+ rapairname = forkliftRepairRecord.getRapairname()==null?"":forkliftRepairRecord.getRapairname();
|
|
|
+ String[] parts = rapairname.split(",");
|
|
|
+ newStr = new StringBuilder();
|
|
|
+ // 遍历分割后的数组,并根据数据字典进行替换
|
|
|
+ for (String part : parts) {
|
|
|
+ String replacement = dictMap.getOrDefault(part, part); // 如果找不到对应的值,则使用原值
|
|
|
+ newStr.append(replacement).append(",");
|
|
|
+ }
|
|
|
+ // 移除最后一个多余的逗号,并转换为字符串
|
|
|
+ rapairid = newStr.length() > 0 ? newStr.substring(0, newStr.length() - 1) : "";
|
|
|
+
|
|
|
forkliftRepairRecord.setTenantid(CXCommonUtils.getCurrentUserFactoryId(currentUser))
|
|
|
.setCreatedate(date)
|
|
|
.setModifydate(date)
|
|
|
.setCreateuserid(currentUser.getId())
|
|
|
.setCreateusername(currentUser.getName())
|
|
|
.setModifyusername(currentUser.getName())
|
|
|
- .setRapairid(dictMap.getOrDefault(forkliftRepairRecord.getRapairname(),""))
|
|
|
+ .setRapairid(rapairid)
|
|
|
.setModifyuserid(currentUser.getId());
|
|
|
}
|
|
|
equForkliftRepairRecordService.saveBatch(newForkliftRepairRecord, 200);
|