diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java index ad606e00..a505e1a4 100644 --- a/src/main/java/com/spring/modules/base/controller/BaseController.java +++ b/src/main/java/com/spring/modules/base/controller/BaseController.java @@ -613,7 +613,8 @@ public class BaseController extends AbstractController { @PostMapping(value = "/getSiteList") @ResponseBody - public R getSiteList(@RequestBody SiteVoData inData){ +// public R getSiteList(@RequestBody SiteVoData inData){ + public R getSiteList(SiteVoData inData){ List rows = baseService.getSiteList(inData); return R.ok().put("rows",rows); } diff --git a/src/main/java/com/spring/modules/project/dao/ProjectDao.java b/src/main/java/com/spring/modules/project/dao/ProjectDao.java index 1d651cd1..364a6663 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -265,4 +265,6 @@ public interface ProjectDao extends BaseMapper { List queryProjectSiteUserRole(PlmProjectInfo project); IPage projectPartSearchByAnyField(Page plmProjectPartDataPage,@Param("params") Map params); + + List getProjectByName(String site, String projectName); } diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java index f81645ce..bdc78ead 100644 --- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java @@ -175,6 +175,10 @@ public class ProjectServiceImpl implements ProjectService { @Override @Transactional public String saveProjectInfo(PlmProjectInfoData inData){ + List list = projectDao.getProjectByName(inData.getSite(),inData.getProjectName()); + if (!list.isEmpty()){ + throw new RuntimeException("项目名称已存在!"); + } SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); List plmProjectTeams = new ArrayList<>(); List userRoleList = new ArrayList<>(); 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 54c0351d..58712b38 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 @@ -2064,13 +2064,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification whereConditionArr[i] = "a.status != 'death' AND a.status " + statusSymbol + filteredList.get(i).getFormula(); } if (whereConditionArr[i].contains("test_part_no")) { - whereConditionArr[i] = "(a.test_part_no "+ testPartNoSymbol + filteredList.get(i).getFormula() + " or b.final_part_no "+ testPartNoSymbol + filteredList.get(i).getFormula() + " or a.relevance_part_no "+ testPartNoSymbol + filteredList.get(i).getFormula() + " or pcpi.customer_part_no "+ testPartNoSymbol + filteredList.get(i).getFormula() + ")"; + whereConditionArr[i] = "(a.test_part_no "+ testPartNoSymbol + "'" + filteredList.get(i).getFormula() + "' or b.final_part_no "+ testPartNoSymbol + "'" + filteredList.get(i).getFormula() + "' or a.relevance_part_no "+ testPartNoSymbol + "'" + filteredList.get(i).getFormula() + "' or pcpi.customer_part_no "+ testPartNoSymbol + "'" + filteredList.get(i).getFormula() + "')"; } if (whereConditionArr[i].contains("bu_no")) { - whereConditionArr[i] = "b.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(" + querySavedVo.getSite() + ", " + querySavedVo.getUserName() + ")) AND b.bu_no " + buNoSymbol + filteredList.get(i).getFormula(); + whereConditionArr[i] = "b.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble('" + querySavedVo.getSite() + "', '" + querySavedVo.getUserName() + "')) AND b.bu_no " + buNoSymbol + "'" + filteredList.get(i).getFormula() + "'"; } if (whereConditionArr[i].contains("customer_desc")){ - whereConditionArr[i] = "(dbo.plm_get_customer_desc(c.site, c.customer_id) " + customerDescSymbol + filteredList.get(i).getFormula() + " or dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) " + customerDescSymbol + filteredList.get(i).getFormula()+")"; + whereConditionArr[i] = "(dbo.plm_get_customer_desc(c.site, c.customer_id) " + customerDescSymbol + "'" + filteredList.get(i).getFormula() + "' or dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) " + customerDescSymbol + "'" + filteredList.get(i).getFormula()+"')"; } if (whereConditionArr[i].contains("cutterNumber")){ cutterNumber = whereConditionArr[i].split("'")[1]; diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 41a4f59c..6ffd9251 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -1496,7 +1496,7 @@ dbo.get_process_control(a.site, prh.workflow_id, d.node_id, 5) as csProcessControl 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_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId} + left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{params.menuId} left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id WHERE ${params.whereClause} diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index 1c80434c..470d3451 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -874,4 +874,9 @@ update_by,update_date,priority,site,id,project_desc,customer_remark,remark,need_ ORDER BY a.project_id +