From 7941f51885f4d227eb25a1533cbd6c592e6789f9 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Wed, 14 May 2025 16:08:54 +0800 Subject: [PATCH] =?UTF-8?q?2025-05-14=204=E3=80=81ECN=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=B2=A1=E6=9C=89=E5=86=99=E5=85=A5=205=E3=80=81ECN?= =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BC=9A=E7=AD=BE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 165 +++--------------- .../TechnicalSpecificationController.java | 8 + .../dao/TechnicalSpecificationMapper.java | 3 + .../TechnicalSpecificationServiceImpl.java | 5 + .../TechnicalSpecificationService.java | 3 + .../TechnicalSpecificationMapper.xml | 53 +++++- 6 files changed, 97 insertions(+), 140 deletions(-) diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 389ee761..e5df5ce2 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -40,6 +40,7 @@ import com.spring.modules.request.vo.PlmRequestHeaderVo; import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData; import com.spring.modules.sys.dao.SysMenuDao; import com.spring.modules.sys.dao.SysUserDao; +import com.spring.modules.sys.entity.SysRoleEntity; import com.spring.modules.sys.entity.SysUserEntity; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -693,139 +694,27 @@ public class ChangeManagementServiceImpl extends ServiceImpl itemList = data.getChooseItemList().stream().map(a -> { - a.setChangeNo(data.getChangeNo()); - a.setCreateBy(data.getCreateBy()); - return a; - }).collect(Collectors.toList()); - changeManagementMapper.chooseItemSave(itemList); - } - if (!data.getChooseItemList2().isEmpty()) { - List itemList2 = data.getChooseItemList2().stream().map(a -> { - a.setChangeNo(data.getChangeNo()); - a.setCreateBy(data.getCreateBy()); - return a; - }).collect(Collectors.toList()); - changeManagementMapper.chooseItemSave2(itemList2); - } - -// if (!data.getChooseItemList().isEmpty()) { -// // 修改所选属性 -// List itemList = data.getChooseItemList().stream().map(a -> { -// a.setCreateBy(data.getCreateBy()); -// return a; -// }).collect(Collectors.toList()); -// for (ChangeItemEntity changeItem : itemList) { -// changeManagementMapper.chooseItemUpdate(changeItem); -// } -// } -// if (!data.getChooseItemList2().isEmpty()) { -// // 修改所选属性 -// List itemList2 = data.getChooseItemList2().stream().map(a -> { -// a.setCreateBy(data.getCreateBy()); -// return a; -// }).collect(Collectors.toList()); -// for (ChangeItemEntity changeItem : itemList2) { -// changeManagementMapper.chooseItemUpdate2(changeItem); -// } -// } - - + } -// // 执行信息 -// if (!data.getChooseItemList().isEmpty()) { -// // 时间赋值 -// List itemList = data.getChooseItemList().stream().map(a -> { -// a.setChangeNo(data.getChangeNo()); -// a.setCreateBy(data.getCreateBy()); -// return a; -// }).collect(Collectors.toList()); -// // 查出原有数据 -// List oldItemList1 = changeManagementMapper.changeItemSearch(changeRequestEntity); -// // 要删除的数据 -// List delList = new ArrayList<>(oldItemList1); -// for (ChangeItemEntity delMap : itemList) { -// if (delList.contains(delMap)) { -// delList.remove(delMap); -// } -// } -// if (!delList.isEmpty()) { -// List itemNos = delList.stream().map(ChangeItemEntity::getItemNo).collect(Collectors.toList()); -// changeManagementMapper.chooseItemDel(data.getSite(), data.getChangeNo(), itemNos); -// } -// // 要新增的数据 -// List addList = new ArrayList<>(itemList); -// for (ChangeItemEntity addMap : oldItemList1) { -// if (addList.contains(addMap)) { -// addList.remove(addMap); -// } -// } -// if (!addList.isEmpty()) { -// changeManagementMapper.chooseItemSave(addList); -// } -// // 要修改的数据 -// List updateList = new ArrayList<>(); -// for (ChangeItemEntity updateMap : itemList) { -// if (oldItemList1.contains(updateMap)) { -// updateList.add(updateMap); -// } -// } -// if (!updateList.isEmpty()) { -// for (ChangeItemEntity changeItem : updateList) { -// changeManagementMapper.chooseItemUpdate(changeItem); -// } -// } -// } -// -// // 评估信息 -// if (!data.getChooseItemList2().isEmpty()) { -// // 时间赋值 -// List itemList2 = data.getChooseItemList2().stream().map(a -> { -// a.setChangeNo(data.getChangeNo()); -// a.setCreateBy(data.getCreateBy()); -// return a; -// }).collect(Collectors.toList()); -// // 查出原有数据 -// List oldItemList2 = changeManagementMapper.changeItemSearch2(changeRequestEntity); -// // 要删除的数据 -// List delList2 = new ArrayList<>(oldItemList2); -// for (ChangeItemEntity delMap : itemList2) { -// if (delList2.contains(delMap)) { -// delList2.remove(delMap); -// } -// } -// if (!delList2.isEmpty()) { -// List itemNos2 = delList2.stream().map(ChangeItemEntity::getItemNo).collect(Collectors.toList()); -// changeManagementMapper.chooseItemDel2(data.getSite(), data.getChangeNo(), itemNos2); -// } -// // 要新增的数据 -// List addList2 = new ArrayList<>(itemList2); -// for (ChangeItemEntity addMap : oldItemList2) { -// if (addList2.contains(addMap)) { -// addList2.remove(addMap); -// } -// } -// if (!addList2.isEmpty()) { -// changeManagementMapper.chooseItemSave2(addList2); -// } -// // 要修改的数据 -// List updateList2 = new ArrayList<>(); -// for (ChangeItemEntity updateMap : itemList2) { -// if (oldItemList2.contains(updateMap)) { -// updateList2.add(updateMap); -// } -// } -// if (!updateList2.isEmpty()) { -// for (ChangeItemEntity changeItem : updateList2) { -// changeManagementMapper.chooseItemUpdate2(changeItem); -// } -// } -// } + // 删除原数据 + changeManagementMapper.chooseItemDel(data.getSite(), data.getChangeNo()); + changeManagementMapper.chooseItemDel2(data.getSite(), data.getChangeNo()); + // 增加新数据 + if (!data.getChooseItemList().isEmpty()) { + List itemList = data.getChooseItemList().stream().map(a -> { + a.setChangeNo(data.getChangeNo()); + a.setCreateBy(data.getCreateBy()); + return a; + }).collect(Collectors.toList()); + changeManagementMapper.chooseItemSave(itemList); + } + if (!data.getChooseItemList2().isEmpty()) { + List itemList2 = data.getChooseItemList2().stream().map(a -> { + a.setChangeNo(data.getChangeNo()); + a.setCreateBy(data.getCreateBy()); + return a; + }).collect(Collectors.toList()); + changeManagementMapper.chooseItemSave2(itemList2); } HashMap map = new HashMap<>(); @@ -868,6 +757,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl itemList = data.getChooseCSItemList().stream().map(a -> { a.setChangeNo(data.getChangeNo()); a.setCreateBy(data.getCreateBy()); + if (a.getItemExecutionDate() == null) { + a.setItemExecutionDate(new Date()); + } return a; }).collect(Collectors.toList()); changeManagementMapper.chooseCSItemSave(itemList); @@ -1888,10 +1780,11 @@ public class ChangeManagementServiceImpl extends ServiceImpl nodeAuthorityList=new ArrayList<>(); //系统管理员获取所有权限 - if(sysMenuDao.checkSuperAdmin(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()).size()>0){ - nodeAuthorityList = changeManagementMapper.getAllNodeAuthority(requestNodeList.get(0)); - }else { - nodeAuthorityList = changeManagementMapper.getNodeAuthority(requestNodeList.get(0)); + List list = sysMenuDao.getUserRoleHasSuperFlag(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); + if (!list.isEmpty()) { + nodeAuthorityList = changeManagementMapper.getAllNodeAuthority(requestNodeList.get(0)); + } else { + nodeAuthorityList = changeManagementMapper.getNodeAuthority(requestNodeList.get(0)); } return nodeAuthorityList.stream().map(item ->{ item.setFieldId(CommonUtils.underScoreToCamel(item.getFieldId())); diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index 3cd20783..d1c0e4e4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -6,6 +6,7 @@ import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; import com.spring.modules.base.data.PlmBmModelHeaderData; import com.spring.modules.base.data.PlmBmPropertiesValueData; +import com.spring.modules.change.vo.ChangeRequestVo; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.*; @@ -1242,4 +1243,11 @@ public class TechnicalSpecificationController { technicalSpecificationService.copyBm(data); return R.ok(); } + + @PostMapping("/change/log") + @ResponseBody + public R changeLog(@RequestBody PlmTechnicalSpecificationSheetData data) { + List list = technicalSpecificationService.queryChangeLog(data); + return R.ok().put("rows",list); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 184dec0f..111686bc 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.modules.base.data.*; import com.spring.modules.base.entity.PlmBmPageBaseData; import com.spring.modules.base.entity.SysProxyAddress; +import com.spring.modules.change.vo.ChangeRequestVo; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.BomHeaderEntity; import com.spring.modules.part.entity.RoutingDetailEntity; @@ -1175,4 +1176,6 @@ public interface TechnicalSpecificationMapper { long queryTechnicalSpecificationCount(PlmTechnicalSpecificationSheetData inData); List queryTechnicalSpecificationList(@Param("sql") String sql,@Param("page") int page,@Param("limit") int limit); + + List queryChangeLog(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 8fa5c712..0a0893d6 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1640,4 +1640,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } return mainData; } + + @Override + public List queryChangeLog(PlmTechnicalSpecificationSheetData data) { + return technicalSpecificationMapper.queryChangeLog(data); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index e01aca70..6acb2b23 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -4,6 +4,7 @@ import com.spring.common.utils.PageUtils; import com.spring.modules.base.data.PlmBmModelHeaderData; import com.spring.modules.base.data.PlmBmPropertiesValueData; import com.spring.modules.base.data.PlmBmPropertiesValueHeaderData; +import com.spring.modules.change.vo.ChangeRequestVo; import com.spring.modules.part.entity.BomDetailEntity; import com.spring.modules.part.entity.RoutingDetailEntity; import com.spring.modules.part.vo.*; @@ -978,4 +979,6 @@ public interface TechnicalSpecificationService { void copyBm (PlmTechnicalSpecificationSheetData data); + + List queryChangeLog(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index dd4d4613..62ed24ee 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -1515,12 +1515,11 @@ step_id,reject_flag,reject_step_id,mpOperator,pod AND ( - dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc} or - dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) like #{customerDesc} - ) + dbo.plm_get_customer_desc(c.site, c.customer_id) like #{customerDesc}) - AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc} + + and a.status = #{statusDesc} AND b.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(#{site}, #{userName})) @@ -1598,4 +1597,50 @@ step_id,reject_flag,reject_step_id,mpOperator,pod resultType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData"> EXEC dbo.getTechnicalSpecificationPageWithSql #{sql}, #{page}, #{limit} + + \ No newline at end of file