From 047fe6983deab1eeba58395edb648bd0337d280e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 May 2022 09:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E8=B7=9F=E8=B8=AA--=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NcrTrackController.java | 23 +++++++++- .../project/mapper/NcrTrackMapper.java | 3 +- .../project/mapper/xml/NcrTrackMapper.xml | 42 ++++++++++++++++--- .../service/impl/NcrTrackServiceImpl.java | 15 ++++--- .../jero/modules/project/vo/NcrTrackVO.java | 13 +++--- 5 files changed, 75 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java index b4d3c618b..9cad884c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java @@ -30,7 +30,7 @@ public class NcrTrackController { @Autowired private INcrTrackService iNcrTrackService; /** - * 分页列表查询 + * 项目库分页列表查询 * * @param ncrTrackVO * @param pageNo @@ -45,7 +45,26 @@ public class NcrTrackController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Page page = new Page(pageNo, pageSize); + IPage pageList = iNcrTrackService.getPageInfo(ncrTrackVO,pageNo, pageSize); + return Result.OK(pageList); + } + + /** + * 项目详情中项目未符合项跟踪 + * + * @param ncrTrackVO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目未符合项跟踪-分页列表查询") + @ApiOperation(value="项目未符合项跟踪-分页列表查询", notes="项目未符合项跟踪-分页列表查询") + @GetMapping(value = "/queryPageInfo") + public Result queryPageInfo(NcrTrackVO ncrTrackVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { IPage pageList = iNcrTrackService.getPageInfo(ncrTrackVO,pageNo, pageSize); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java index 8e445b470..1f0ab0aee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java @@ -13,6 +13,5 @@ import java.util.List; */ public interface NcrTrackMapper extends BaseMapper { - List getInfoList(@Param("inconformity") String inconformity, - @Param("track") String track); + List getInfoList(@Param("ncrTrackVO") NcrTrackVO ncrTrackVO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index fdb5b4495..bc87910af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -35,11 +35,43 @@ left join project_name_info pni on pni.id = plb.project_name_id where - - - design_flow_task_status =#{inconformity} or design_flow_task_status =#{track} - or prehomo_flow_task_status =#{inconformity} or prehomo_flow_task_status =#{track} - or verify_flow_task_status =#{inconformity} or verify_flow_task_status =#{track} + + plb.id =#{ncrTrackVO.projectLibraryId} + and + + + pli.serial_number =#{ncrTrackVO.serialNumber} + and + + + pli.title =#{ncrTrackVO.title} + and + + + pli.duty_territory =#{ncrTrackVO.dutyTerritory} + and + + + pni.project_name =#{ncrTrackVO.projectName} + and + + + (pti.design_flow_task_status =#{ncrTrackVO.problemType} or pti.prehomo_flow_task_status =#{ncrTrackVO.problemType} or pti.verify_flow_task_status =#{ncrTrackVO.problemType}) + and + + + (pli.design_initiator_id =#{ncrTrackVO.initiator} or pli.prehomo_initiator_id =#{ncrTrackVO.initiator} or pli.verify_initiator_id =#{ncrTrackVO.initiator}) + and + + + (pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty}) + and + + ( + design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track} + or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track} + or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track} + ) order by pli.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 6dcc4dc68..9560e42c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -39,8 +39,16 @@ public class NcrTrackServiceImpl extends ServiceImpl @Override public IPage getPageInfo(NcrTrackVO ncrTrackVO, Integer pageNo, Integer pageSize) { + if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){ + ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*","")); + } + if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){ + ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); + } List sysUserList = sysUserService.list(); - List infoList = ncrTrackMapper.getInfoList(ReviewResultEnum.INCONFORMITY.getValue(), ReviewResultEnum.TO_TRACK.getValue()); + ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue()); + ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue()); + List infoList = ncrTrackMapper.getInfoList(ncrTrackVO); List trackVOList = new ArrayList<>(); String designName = ""; String prehomoName = ""; @@ -49,12 +57,10 @@ public class NcrTrackServiceImpl extends ServiceImpl designName = "设计符合性确认"; prehomoName = "PreHomo确认"; verifyName = "验证符合性确认"; - }else{ designName = "Confirm design conformance"; prehomoName = "PreHomo confirmation"; verifyName = "Verify conformance validation"; - } for (NcrTrackVO trackVO : infoList) { @@ -86,8 +92,6 @@ public class NcrTrackServiceImpl extends ServiceImpl verifyFlowTaskStatusName = cut(ncrTrackVO, verifyFlowTaskStatus, verifyFlowTaskStatusName); } - - //设计符合性确认 if(StringUtils.isNotBlank(designPId)){ NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(), @@ -208,7 +212,6 @@ public class NcrTrackServiceImpl extends ServiceImpl dutyTemp = collect.get(0).getUsername(); } } - NcrTrackVO ncrTrackVO = new NcrTrackVO(); ncrTrackVO.setSerialNumber(serialNumber);//编号 ncrTrackVO.setTitle(title);//标题 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index bcd72ce1e..a89998a7f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -1,17 +1,11 @@ package com.jero.modules.project.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.List; /** @@ -56,6 +50,13 @@ public class NcrTrackVO implements Serializable { //责任人 private String duty; + //项目id + private String projectLibraryId; + //项目id + private String inconformity; + //项目id + private String track; + //设计符合性确认 design_p_id private String designPId; //PreHomo确认 prehomo_p_id