ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 未符合项跟踪流程 查询未符合项

Browse Source
This commit is contained in:
lijiarao
2023-12-25 09:54:49 +08:00
parent ac0f3bd33c
commit f83a31c742
6 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+1
View File
@@ -662,6 +662,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
lawsEvaluationNotMet.setTermName(assessTerm.getTermName());
lawsEvaluationNotMet.setEngineerId(assessTerm.getAssessorId());
lawsEvaluationNotMet.setExpectedTime(assessTerm.getExpectedTime());
lawsEvaluationNotMet.setAssessResults(assessTerm.getEvaluationFeedback());
lawsEvaluationNotMet.setState(AssessCommon.TO_BE_RECTIFIED);
lawsEvaluationNotMet.setDelFlag(0);
evaluationNotMetList.add(lawsEvaluationNotMet);
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/controller/ProcessProjectNotMetController.java
+25 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.process.projectnotmet.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.DictPoint;
@@ -8,27 +9,50 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet;
import com.jero.modules.activiti.process.projectnotmet.service.ProcessProjectNotMetService;
import com.jero.modules.activiti.process.projectnotmet.vo.ProcessProjectNotMetVO;
import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* 未符合项跟踪流程(process_project_not_met)表控制层
*
* @author xxxxx
*/
@Slf4j
@Api(tags = "未符合项跟踪流程")
@RestController
@RequestMapping("/process_project_not_met")
@RequestMapping("/processProjectNotMet")
public class ProcessProjectNotMetController extends JeroController<ProcessProjectNotMet, ProcessProjectNotMetService> {
/**
* 服务对象
*/
@Autowired
private ProcessProjectNotMetService processProjectNotMetService;
@Autowired
private ILawsEvaluationNotMetService lawsEvaluationNotMetService;
/**
* 分页列表查询
*/
@AutoLog(value = "未符合项跟踪流程-查询未符合项")
@ApiOperation(value="未符合项跟踪流程-查询未符合项")
@GetMapping(value = "/pageForProcess")
public Result<IPage<LawsEvaluationNotMet>> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
IPage<LawsEvaluationNotMet> pageList = lawsEvaluationNotMetService.pageForProcess(lawsEvaluationNotMet, pageNo, pageSize, req);
return Result.OK(pageList);
}
@DictPoint
@GetMapping("/queryProcessInfoVO")
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java
-1
View File
@@ -108,7 +108,6 @@ public class LawsAssess implements Serializable {
private String processStatus;
/**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/
@TableField(exist = false)
@Excel(name = "评估结果", width = 15)
@Dict(dicCode = "assess_results")
@ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)")
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsEvaluationNotMet.java
+9
View File
@@ -71,6 +71,11 @@ public class LawsEvaluationNotMet implements Serializable {
@ApiModelProperty(value = "条款名称")
private String termName;
/**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/
@Dict(dicCode = "assess_results")
@ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)")
private String assessResults;
/**责任部门ID*/
@Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@@ -135,4 +140,8 @@ public class LawsEvaluationNotMet implements Serializable {
@TableLogic
private Integer delFlag;
@TableField(exist = false)
@ApiModelProperty(value = "标准编号或名称")
private String standardNumberOrName;
}
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsEvaluationNotMetService.java
+2
View File
@@ -75,4 +75,6 @@ public interface ILawsEvaluationNotMetService extends IService<LawsEvaluationNot
LawsEvaluationNotMet queryById(String id);
void batchClose(List<String> ids);
IPage<LawsEvaluationNotMet> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req);
}
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+23
View File
@@ -1,5 +1,6 @@
package com.jero.modules.projectLibrary.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.constant.CommonConstant;
@@ -14,12 +15,15 @@ import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
import com.jero.modules.projectLibrary.mapper.LawsEvaluationNotMetMapper;
import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException;
import java.util.List;
import java.util.Date;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
@@ -64,6 +68,25 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
return page(page, queryWrapper);
}
@Override
public IPage<LawsEvaluationNotMet> pageForProcess(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) {
Map<String, String[]> parameterMap = req.getParameterMap();
parameterMap.remove("standardNumber");
parameterMap.remove("standardName");
QueryWrapper<LawsEvaluationNotMet> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, parameterMap);
String standardNumber = lawsEvaluationNotMet.getStandardNumber();
if (StringUtils.isNotBlank(standardNumber)){
queryWrapper.lambda().and(
a-> a.like(LawsEvaluationNotMet::getStandardNumber,standardNumber)
.or()
.like(LawsEvaluationNotMet::getStandardName,standardNumber)
);
}
Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
return page(page, queryWrapper);
}
/**
* 列表查询
*