From a12423474cd5384898fb91dba49dea23931f7b9a Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 26 十月 2023 11:34:09 +0800
Subject: [PATCH] 20231026_qiuyh_调整磨具监测
---
hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java
index 9ddf2b5..f11a087 100644
--- a/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java
+++ b/hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java
@@ -10,7 +10,6 @@
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,8 +36,8 @@
@Transactional(rollbackFor = Exception.class)
public BasicResult insert(MoldQualityEntity moldQualityEntity) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
- String companyId = sysUserInfo.getCompanyId();
- moldQualityEntity.setCompanyId(companyId);
+ moldQualityEntity.setCompanyId(sysUserInfo.getCompanyId());
+ moldQualityEntity.setCreateUser(sysUserInfo.getRealName());
mapper.insert(moldQualityEntity);
MoldQualityEntity newOne = mapper.findNewOne();
moldQualityEntity.getMoldQualityFileEntities().forEach(modFile->{
@@ -63,7 +62,7 @@
moldQualityFileMapper.delete(moldQualityEntity.getId());
List<MoldQualityFileEntity> moldQualityFileEntities = moldQualityEntity.getMoldQualityFileEntities();
moldQualityFileEntities.forEach(moldFile->{
- moldFile.setId(moldQualityEntity.getId());
+ moldFile.setMoldQualityId(moldQualityEntity.getId());
});
moldQualityFileMapper.insertList(moldQualityFileEntities);
return BasicResult.success();
@@ -76,6 +75,9 @@
map.put("companyId",companyId);
PageHelper.startPage((int)map.get("pageNum"),(int)map.get("pageSize"));
List<MoldQualityEntity> all = mapper.findAll(map);
+ all.forEach(moldQualityOne->{
+ moldQualityOne.setMoldQualityFileEntities(moldQualityFileMapper.findFileList(moldQualityOne.getId()));
+ });
PageInfo<MoldQualityEntity> moldQualityEntities = new PageInfo<>(all);
return BasicResult.success(moldQualityEntities);
}
@@ -93,8 +95,8 @@
}
@Override
- public BasicResult getMoldCode(String proId) {
- return BasicResult.success(mapper.getMoldCode(proId));
+ public BasicResult getMoldCode(Map<String, Object> map) {
+ return BasicResult.success(mapper.getMoldCode(map));
}
@Override
--
Gitblit v1.9.3