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