Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java

@@ -35,6 +35,6 @@ public interface IMesNcProcessingService {
     @ApiOperation(value = "NC处理")
     void saveNc(MesNcProcessingInputModel model, String org, boolean isOrder);
 
-    List<String> queryPartInspectionCreateUser(String organizeCode, String createUserName);
+    List<String> queryPartInspectionCreateUser(String organizeCode);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java

@@ -112,11 +112,11 @@ public class MesNcProcessingController {
 
     @GetMapping("/query-part-inspection-create-user")
     @ApiOperation(value = "查询检验人（NC-零件检测-单据 表的createUser）")
-    public ResultBean queryPartInspectionCreateUser(String organizeCode, String createUserName) {
+    public ResultBean queryPartInspectionCreateUser(String organizeCode) {
         try {
             ValidatorBean.checkNotNull(organizeCode, "工厂不能为空");
             return ResultBean.success("查询成功").setResultList(
-                    ncProcessingService.queryPartInspectionCreateUser(organizeCode, createUserName));
+                    ncProcessingService.queryPartInspectionCreateUser(organizeCode));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java

@@ -14,6 +14,6 @@ public interface IMesNcProcessingDao {
     @ApiOperation(value = "查询停工统计数据")
     List<MesNcProcessingPartAndLotModel> queryDefectRecordByPager(String partNo, String lotNo, String org, Pager pager);
 
-    List<String> queryPartInspectionCreateUser(String organizeCode, String createUserName);
+    List<String> queryPartInspectionCreateUser(String organizeCode);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java

@@ -93,21 +93,16 @@ public class MesNcProcessingDao implements IMesNcProcessingDao {
     }
 
     @Override
-    public List<String> queryPartInspectionCreateUser(String organizeCode, String createUserName) {
+    public List<String> queryPartInspectionCreateUser(String organizeCode) {
         String sql = "SELECT DISTINCT(create_user) " +
                 "FROM mes_part_inspection " +
                 "WHERE is_valid = :isValid AND is_deleted = :isDeleted AND organize_code = :organizeCode ";
-        if (!StringUtils.isEmpty(createUserName)) {
-            sql += " AND create_user like :createUserName ";
-        }
         Query query = entityManager.createNativeQuery(sql);
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         query.setParameter("organizeCode", organizeCode);
-        if (!StringUtils.isEmpty(createUserName)) {
-            query.setParameter("createUserName", createUserName + "%");
-        }
         List resultList = query.getResultList();
+        log.info("queryPartInspectionCreateUser-查询结果-" + resultList);
         if (CollectionUtils.isEmpty(resultList)) {
             return null;
         }else {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java

@@ -213,8 +213,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
     }
 
     @Override
-    public List<String> queryPartInspectionCreateUser(String organizeCode, String createUserName) {
-        return ncProcessingDao.queryPartInspectionCreateUser(organizeCode, createUserName);
+    public List<String> queryPartInspectionCreateUser(String organizeCode) {
+        return ncProcessingDao.queryPartInspectionCreateUser(organizeCode);
     }
 
     /**