xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.季度审核评分增加流程结束

Browse Source 
2.项目考核指标修改逻辑删除方法
3.项目立项增加项目编号及名称唯一判断
4.季度审核评分增加流程结束判断
This commit is contained in:
zty 2024-07-16 17:42:00 +08:00
parent cd15ef4374
commit 108b6ffbc1
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xqopen/kehui/mapper/ProjectAssessmentIndicatorsDao.java
View File

@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
public interface ProjectAssessmentIndicatorsDao extends BaseMapper<ProjectAssessmentIndicators> { public interface ProjectAssessmentIndicatorsDao extends BaseMapper<ProjectAssessmentIndicators> {
@Update("update project_assessment_indicators set is_deleted=true where project_id =#{id}") @Update("update project_assessment_indicators set is_deleted='1' where project_id =#{id}")
void updateByProjectId(Long id); void updateByProjectId(Long id);
List<ProjectAssessmentIndicators> getList(Page<ProjectAssessmentIndicators> page, @Param("indicators") ProjectAssessmentIndicators indicators); List<ProjectAssessmentIndicators> getList(Page<ProjectAssessmentIndicators> page, @Param("indicators") ProjectAssessmentIndicators indicators);
} }

3
src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
View File

@ -167,9 +167,6 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
JSONObject quarterlyEvaluationExt = quarterlyEvaluation.getExt(); JSONObject quarterlyEvaluationExt = quarterlyEvaluation.getExt();
String user = String.valueOf(quarterlyEvaluationExt.get(role)); String user = String.valueOf(quarterlyEvaluationExt.get(role));
quarterlyEvaluationExt.put("taskName", taskName); quarterlyEvaluationExt.put("taskName", taskName);
if ("流程结束".equals(taskName)) {
user = "";
}
quarterlyEvaluationExt.put("executor", user); quarterlyEvaluationExt.put("executor", user);
quarterlyEvaluation.setExt(quarterlyEvaluationExt); quarterlyEvaluation.setExt(quarterlyEvaluationExt);
quarterlyEvaluation.setUpdatedAt(new Timestamp(System.currentTimeMillis())); quarterlyEvaluation.setUpdatedAt(new Timestamp(System.currentTimeMillis()));

9
src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
View File

@ -127,6 +127,15 @@ public class ProjectInitComtroller implements ProjectInitApi {
ProjectInfoReq infoReq = initDto.getProjectInfoReq(); ProjectInfoReq infoReq = initDto.getProjectInfoReq();
try { try {
ProjectInfo info = new JacksonUtil<ProjectInfo>().setAddEntity(userId, infoReq, ProjectInfo.class); ProjectInfo info = new JacksonUtil<ProjectInfo>().setAddEntity(userId, infoReq, ProjectInfo.class);
EntityWrapper<ProjectInfo> wrapper = new EntityWrapper<>();
wrapper.eq("project_name",info.getProjectName());
wrapper.eq("project_no",info.getProjectNo());
wrapper.eq("project_category","init");
wrapper.eq("is_deleted",false);
List<ProjectInfo> infos = projectInfoService.selectList(wrapper);
if(!ObjectUtils.isEmpty(infos)){
return ApiResponse.fillFail("项目名称/编号已存在！");
}
infoService.insert(info); infoService.insert(info);
//批量新增项目考核季度表 //批量新增项目考核季度表
if (!ObjectUtils.isEmpty(initDto)) { if (!ObjectUtils.isEmpty(initDto)) {

4
src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
View File

@ -47,7 +47,9 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
//判断当前执行人是谁，项目负责人/分管领导/主要领导 //判断当前执行人是谁，项目负责人/分管领导/主要领导
EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>(); EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
evaluationEntityWrapper.eq("is_deleted", "0"); evaluationEntityWrapper.eq("is_deleted", "0");
evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'");//根据当前执行人查询 evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'");
evaluationEntityWrapper.and("ext_->> 'taskName'!='流程结束'");
//根据当前执行人查询
// evaluationEntityWrapper.andNew() // evaluationEntityWrapper.andNew()
// .eq("created_by", String.valueOf(systemUserLogin.getUserinfoId())) // .eq("created_by", String.valueOf(systemUserLogin.getUserinfoId()))
// .or("ext_->> 'projectAdmin'= " + "'" + userId + "'") // .or("ext_->> 'projectAdmin'= " + "'" + userId + "'")