2025-05-14

4、ECN执行完成后，执行时间没有写入
5、ECN会签页面添加一个会签时间

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<ChangeManagementMap
         } else {
             // 执行信息修改
             changeManagementMapper.executionUpdate(data);
-            // 删除原数据
-            changeManagementMapper.chooseItemDel(data.getSite(), data.getChangeNo());
-            changeManagementMapper.chooseItemDel2(data.getSite(), data.getChangeNo());
-            // 增加新数据
-            if (!data.getChooseItemList().isEmpty()) {
-                List<ChangeItemEntity> 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<ChangeItemEntity> 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<ChangeItemEntity> 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<ChangeItemEntity> 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<ChangeItemEntity> itemList = data.getChooseItemList().stream().map(a -> {
-//                    a.setChangeNo(data.getChangeNo());
-//                    a.setCreateBy(data.getCreateBy());
-//                    return a;
-//                }).collect(Collectors.toList());
-//                // 查出原有数据
-//                List<ChangeItemEntity> oldItemList1 = changeManagementMapper.changeItemSearch(changeRequestEntity);
-//                // 要删除的数据
-//                List<ChangeItemEntity> delList = new ArrayList<>(oldItemList1);
-//                for (ChangeItemEntity delMap : itemList) {
-//                    if (delList.contains(delMap)) {
-//                        delList.remove(delMap);
-//                    }
-//                }
-//                if (!delList.isEmpty()) {
-//                    List<String> itemNos = delList.stream().map(ChangeItemEntity::getItemNo).collect(Collectors.toList());
-//                    changeManagementMapper.chooseItemDel(data.getSite(), data.getChangeNo(), itemNos);
-//                }
-//                // 要新增的数据
-//                List<ChangeItemEntity> addList = new ArrayList<>(itemList);
-//                for (ChangeItemEntity addMap : oldItemList1) {
-//                    if (addList.contains(addMap)) {
-//                        addList.remove(addMap);
-//                    }
-//                }
-//                if (!addList.isEmpty()) {
-//                    changeManagementMapper.chooseItemSave(addList);
-//                }
-//                // 要修改的数据
-//                List<ChangeItemEntity> 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<ChangeItemEntity> itemList2 = data.getChooseItemList2().stream().map(a -> {
-//                    a.setChangeNo(data.getChangeNo());
-//                    a.setCreateBy(data.getCreateBy());
-//                    return a;
-//                }).collect(Collectors.toList());
-//                // 查出原有数据
-//                List<ChangeItemEntity> oldItemList2 = changeManagementMapper.changeItemSearch2(changeRequestEntity);
-//                // 要删除的数据
-//                List<ChangeItemEntity> delList2 = new ArrayList<>(oldItemList2);
-//                for (ChangeItemEntity delMap : itemList2) {
-//                    if (delList2.contains(delMap)) {
-//                        delList2.remove(delMap);
-//                    }
-//                }
-//                if (!delList2.isEmpty()) {
-//                    List<String> itemNos2 = delList2.stream().map(ChangeItemEntity::getItemNo).collect(Collectors.toList());
-//                    changeManagementMapper.chooseItemDel2(data.getSite(), data.getChangeNo(), itemNos2);
-//                }
-//                // 要新增的数据
-//                List<ChangeItemEntity> addList2 = new ArrayList<>(itemList2);
-//                for (ChangeItemEntity addMap : oldItemList2) {
-//                    if (addList2.contains(addMap)) {
-//                        addList2.remove(addMap);
-//                    }
-//                }
-//                if (!addList2.isEmpty()) {
-//                    changeManagementMapper.chooseItemSave2(addList2);
-//                }
-//                // 要修改的数据
-//                List<ChangeItemEntity> 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<ChangeItemEntity> 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<ChangeItemEntity> itemList2 = data.getChooseItemList2().stream().map(a -> {
+                a.setChangeNo(data.getChangeNo());
+                a.setCreateBy(data.getCreateBy());
+                return a;
+            }).collect(Collectors.toList());
+            changeManagementMapper.chooseItemSave2(itemList2);
         }
 
         HashMap<String, Object> map = new HashMap<>();
@@ -868,6 +757,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 List<ChangeCountersignatureItemEntity> 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<ChangeManagementMap
         // 根据节点获得节点权限
         List<RequestNodeAuthorityEntity> 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<SysRoleEntity> 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()));

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<ChangeRequestVo> list = technicalSpecificationService.queryChangeLog(data);
+        return R.ok().put("rows",list);
+    }
 }

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<PlmTechnicalSpecificationSheetData> queryTechnicalSpecificationList(@Param("sql") String sql,@Param("page") int page,@Param("limit") int limit);
+
+    List<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data);
 }

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<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data) {
+        return technicalSpecificationMapper.queryChangeLog(data);
+    }
 }

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<ChangeRequestVo> queryChangeLog(PlmTechnicalSpecificationSheetData data);
 }

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -1515,12 +1515,11 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
             </if>
             <if test="customerDesc != null and customerDesc != ''">
                 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})
             </if>
             <if test="statusDesc != null and statusDesc != ''">
-                AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc}
+<!--                AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{statusDesc}-->
+                and a.status = #{statusDesc}
             </if>
             <if test="buNo == null || buNo == ''">
                 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}
     </select>
+
+    <select id="queryChangeLog" resultType="com.spring.modules.change.vo.ChangeRequestVo">
+        SELECT a.site,
+               a.bu_no,
+               a.change_no,
+               a.applicant_id,
+               dbo.get_userDisPlay(a.applicant_id)              as applicantName,
+               b.department_no                                  as applicationDepartmentId,
+               dbo.get_department_name(a.site, b.department_no) as applicationDepartmentName,
+               a.apply_date,
+               a.ecn_type,
+               a.change_impact,
+               a.change_impact_desc,
+               a.ecn_stage,
+               a.change_type,
+               a.tp_engineer_id,
+               dbo.get_userDisPlay(a.tp_engineer_id)            as tpEngineerName,
+               a.change_phase_in_date,
+               a.df_is_product,
+               a.printing,
+               a.manufacturing_cost_is_change,
+               a.change_request_desc,
+               a.is_re_quote,
+               a.ul_certification_requirements,
+               a.ul_continue_to_meet_demand,
+               a.gp_certification_requirements,
+               a.gp_continue_to_meet_demand,
+               a.create_date,
+               a.create_by,
+               a.update_date,
+               a.update_by,
+               a.industrial_engineer_id,
+               dbo.get_userDisPlay(a.industrial_engineer_id)    as industrialEngineerName,
+               a.change_status,
+               a.cqc_operator_id,
+               dbo.get_userDisPlay(a.cqc_operator_id)           as cqcOperatorName,
+               a.fai_operator_id,
+               dbo.get_userDisPlay(a.fai_operator_id)           as faiOperatorName,
+               a.step_id,
+               a.reject_flag,
+               a.reject_step_id
+        FROM plm_change_request a
+                 LEFT JOIN sys_user as b on a.site = b.site and a.applicant_id = b.username
+                 left join plm_change_request_detail pcrd on a.site = pcrd.site and a.change_no = pcrd.change_no
+        where a.site = #{site} and  pcrd.code_no = #{codeNo}
+    </select>
 </mapper>