WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目未符合项跟踪--添加查询条件

Browse Source
This commit is contained in:
zhn
2022-05-12 09:51:40 +08:00
parent ad8507f0fa
commit 047fe6983d
5 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java
+21 -2
View File
@@ -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<NcrTrackVO> page = new Page<NcrTrackVO>(pageNo, pageSize);
IPage<NcrTrackVO> 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<NcrTrackVO> pageList = iNcrTrackService.getPageInfo(ncrTrackVO,pageNo, pageSize);
return Result.OK(pageList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java
+1 -2
View File
@@ -13,6 +13,5 @@ import java.util.List;
*/
public interface NcrTrackMapper extends BaseMapper<NcrTrackVO> {
List<NcrTrackVO> getInfoList(@Param("inconformity") String inconformity,
@Param("track") String track);
List<NcrTrackVO> getInfoList(@Param("ncrTrackVO") NcrTrackVO ncrTrackVO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+37 -5
View File
@@ -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}
<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
and
</if>
<if test="ncrTrackVO.serialNumber != null and ncrTrackVO.serialNumber != ''">
pli.serial_number =#{ncrTrackVO.serialNumber}
and
</if>
<if test="ncrTrackVO.title != null and ncrTrackVO.title != ''">
pli.title =#{ncrTrackVO.title}
and
</if>
<if test="ncrTrackVO.dutyTerritory != null and ncrTrackVO.dutyTerritory != ''">
pli.duty_territory =#{ncrTrackVO.dutyTerritory}
and
</if>
<if test="ncrTrackVO.projectName != null and ncrTrackVO.projectName != ''">
pni.project_name =#{ncrTrackVO.projectName}
and
</if>
<if test="ncrTrackVO.problemType != null and ncrTrackVO.problemType != ''">
(pti.design_flow_task_status =#{ncrTrackVO.problemType} or pti.prehomo_flow_task_status =#{ncrTrackVO.problemType} or pti.verify_flow_task_status =#{ncrTrackVO.problemType})
and
</if>
<if test="ncrTrackVO.initiator != null and ncrTrackVO.initiator != ''">
(pli.design_initiator_id =#{ncrTrackVO.initiator} or pli.prehomo_initiator_id =#{ncrTrackVO.initiator} or pli.verify_initiator_id =#{ncrTrackVO.initiator})
and
</if>
<if test="ncrTrackVO.duty != null and ncrTrackVO.duty != ''">
(pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty})
and
</if>
(
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
</select>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+9 -6
View File
@@ -39,8 +39,16 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
@Override
public IPage<NcrTrackVO> 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<SysUser> sysUserList = sysUserService.list();
List<NcrTrackVO> infoList = ncrTrackMapper.getInfoList(ReviewResultEnum.INCONFORMITY.getValue(), ReviewResultEnum.TO_TRACK.getValue());
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
List<NcrTrackVO> infoList = ncrTrackMapper.getInfoList(ncrTrackVO);
List<NcrTrackVO> trackVOList = new ArrayList<>();
String designName = "";
String prehomoName = "";
@@ -49,12 +57,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
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<NcrTrackMapper, NcrTrackVO>
verifyFlowTaskStatusName = cut(ncrTrackVO, verifyFlowTaskStatus, verifyFlowTaskStatusName);
}
//设计符合性确认
if(StringUtils.isNotBlank(designPId)){
NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
@@ -208,7 +212,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
dutyTemp = collect.get(0).getUsername();
}
}
NcrTrackVO ncrTrackVO = new NcrTrackVO();
ncrTrackVO.setSerialNumber(serialNumber);//编号
ncrTrackVO.setTitle(title);//标题
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+7 -6
View File
@@ -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