admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

隐患工单派发生成隐患单去重

Browse Source
This commit is contained in:
guoshengxiong 2025-10-10 13:59:13 +08:00
parent 8b1fd8996e
commit 25f564b2b7
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
View File

@ -80,6 +80,7 @@ import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -490,7 +491,11 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
.in(EnterpriseInfo::getId, eids)).stream().map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(",")); .in(EnterpriseInfo::getId, eids)).stream().map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(","));
record.setId(null); record.setId(null);
setSecondThirdIdByDangerItemId(record, record.getDangerItemId()); setSecondThirdIdByDangerItemId(record, record.getDangerItemId());
xzSecurityQualityInspectionRecordMapper.insert(record); try {
xzSecurityQualityInspectionRecordMapper.insert(record);
} catch (DuplicateKeyException e) {
throw new OpenAlertException(MessageUtil.get("operateBusyErr"),e);
}
if (record.getDraftId() != null) { if (record.getDraftId() != null) {
xzSecurityQualityInspectionRecordDraftService.update(null, new LambdaUpdateWrapper<XzSecurityQualityInspectionRecordDraft>() xzSecurityQualityInspectionRecordDraftService.update(null, new LambdaUpdateWrapper<XzSecurityQualityInspectionRecordDraft>()
.set(XzSecurityQualityInspectionRecordDraft::getIsGenerate, 1) .set(XzSecurityQualityInspectionRecordDraft::getIsGenerate, 1)

1
src/main/resources/i18n/messages.properties
View File

@ -128,3 +128,4 @@ roomIntoNumErr=\u5BBF\u820D\u5E8A\u4F4D\u6570\u9700\u5927\u4E8E\u5DF2\u4F4F\u5BB
roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728 roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728
bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01 bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01
thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E
operateBusyErr=\u64CD\u4F5C\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u5237\u65B0\u9875\u9762

1
src/main/resources/i18n/messages_zh_CN.properties
View File

@ -125,3 +125,4 @@ roomIntoNumErr=\u5BBF\u820D\u5E8A\u4F4D\u6570\u9700\u5927\u4E8E\u5DF2\u4F4F\u5BB
roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728 roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728
bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01 bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01
thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E
operatorBusyErr=\u64CD\u4F5C\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u5237\u65B0\u9875\u9762