jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批流展示问题修改

Browse Source
This commit is contained in:
ys.git 2025-12-11 14:00:43 +08:00
parent 087612b6b6
commit 1ba7a91bd6
6 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java
View File

@ -3,6 +3,7 @@ package com.xdap.self_development.controller;
import com.definesys.mpaas.common.http.Response;
import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.api.moudle.department.pojo.entity.XdapDepartments;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.runtime.service.RuntimeDatasourceService;
import com.xdap.self_development.controller.form.DepartmentUserForm;
import com.xdap.self_development.controller.form.DeptResponsiblePageForm;
@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@ -168,4 +170,12 @@ public class ResponsiblePersonController {
responsiblePersonService.deleteResponsiblePerson(rowId);
return Response.ok();
}
// 查询部门责任人
@GetMapping("/getUserBydepartment")
public Response getUserBydepartment(
@RequestParam("deptName")String deptName,@RequestParam("subsystem")String subsystem
) {
ArrayList<XdapUsers> userBydepartment = responsiblePersonService.getUserBydepartment(deptName, subsystem);
return Response.ok().data(userBydepartment);
}
}

3
src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java
View File

@ -1,6 +1,7 @@
package com.xdap.self_development.service;
import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.self_development.controller.form.DeptResponsiblePageForm;
import com.xdap.self_development.controller.form.ResponsiblePersonForm;
import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm;
@ -8,6 +9,7 @@ import com.xdap.self_development.pojo.ResponsiblePerson;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.Set;
public interface ResponsiblePersonService {
@ -26,4 +28,5 @@ public interface ResponsiblePersonService {
Boolean isResponsiblePerson(String userId);
Set<String> getAllSubsystem();
ArrayList<XdapUsers> getUserBydepartment(String dept,String subsystem);
}

2
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -452,7 +452,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
todoTaskPojo.setModelName(modelPojo.getModelName());
todoTaskPojo.setModelId(modelPojo.getId());
todoTaskPojo.setCreationDate(new Date());
todoTaskPojo.setDataType("玉柴");
todoTaskPojo.setDataType(modelPojo.getYcOrOth());
todoTaskPojo.setVersionNumber(modelPojo.getVersionNumber());
todoTaskPojo.setOwnerId(filledBy);
todoTaskPojo.setIsDelete(0);

9
src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
View File

@ -45,10 +45,12 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
.like("status_description", engineReviewListRequest.getStatusDescription())
.eq("yc_or_oth", engineReviewListRequest.getYcOrOth())
.eq("applicant", engineReviewListRequest.getApplicant())
.or()
.like("approver_persons",engineReviewListRequest.getUserID() )
.doPageQuery(page, size, EngineReviewListPojo.class);
List<EngineReviewListPojo> engineReviewListPojos = engineReviewListPojoPageQueryResult.getResult();
List<EngineReviewListPojo> engineReviewListPojos = engineReviewListPojoPageQueryResult.getResult();
//将engineReviewListPojosID改为姓名
ArrayList<EngineReviewListPojo> engineReviewListPojos1 = new ArrayList<>();
for (EngineReviewListPojo engineReviewListPojo : engineReviewListPojos) {
@ -65,6 +67,11 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
}
engineReviewListPojo1.setApproverPersons(String.join(",", strings));
}
if (StringUtils.isNotEmpty(engineReviewListPojo.getApplicant())) {
String applicantId = engineReviewListPojo.getApplicant();
XdapUsers xdapUsersPojo = xdapDeptUsersService.selectUserByID(applicantId);
engineReviewListPojo1.setApplicant(xdapUsersPojo.getUsername());
}
engineReviewListPojos1.add(engineReviewListPojo1);
}

28
src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.xdap.self_development.service.impl;
import com.definesys.mpaas.query.db.PageQueryResult;
import com.xdap.api.moudle.user.pojo.XdapUsers;
import com.xdap.runtime.service.RuntimeDatasourceService;
import com.xdap.self_development.config.BusinessDatabase;
import com.xdap.self_development.controller.form.DeptResponsiblePageForm;
@ -11,9 +12,12 @@ import com.xdap.self_development.pojo.Parameter;
import com.xdap.self_development.pojo.ResponsiblePerson;
import com.xdap.self_development.pojo.Template;
import com.xdap.self_development.service.ResponsiblePersonService;
import com.xdap.self_development.service.XdapDeptUsersService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@ -24,6 +28,8 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
private BusinessDatabase bd;
@Resource
private RuntimeDatasourceService runtimeDatasourceService;
@Resource
private XdapDeptUsersService xdapDeptUsersService;
@Override
public void saveResponsiblePerson(ResponsiblePersonForm form) {
@ -117,4 +123,26 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
.doQuery(Parameter.class);
return templates.stream().map(Parameter::getSubsystemName).collect(Collectors.toSet());
}
@Override
public ArrayList<XdapUsers> getUserBydepartment(String dept,String subsystem) {
if (ObjectUtils.isEmpty(dept)) {
return null;
}
ArrayList<XdapUsers> xdapUsers1 = new ArrayList<XdapUsers>();
List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
.eq("department", dept)
.eq("subsystem", subsystem)
.doQuery(ResponsiblePerson.class);
if (!responsiblePeople.isEmpty()) {
List<String> userIds = responsiblePeople.stream().map(x -> x.getUserId()).collect(Collectors.toList());
for (String userId : userIds) {
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(userId);
if (xdapUsers != null) {
xdapUsers1.add(xdapUsers);
}
}
}
return xdapUsers1;
}
}

4
src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
View File

@ -148,7 +148,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
todoTaskPojo.setModelName(ObjectUtils.isNotEmpty(modelPojo) ? modelPojo.getModelName() : "");
todoTaskPojo.setModelId(modelId);
todoTaskPojo.setCreationDate(new Date());
todoTaskPojo.setDataType("玉柴");
todoTaskPojo.setDataType(modelPojo.getYcOrOth());
todoTaskPojo.setVersionNumber(ObjectUtils.isNotEmpty(modelPojo) ? modelPojo.getVersionNumber() : 0);
todoTaskPojo.setIsDelete(0);
todoTaskPojo.setOwnerId(engineParamDetailDTO.getResPersonId());
@ -202,7 +202,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
todoTaskPojo.setModelName(todoTaskPojo1.getModelName());
todoTaskPojo.setModelId(todoTaskPojo1.getModelId());
todoTaskPojo.setCreationDate(new Date());
todoTaskPojo.setDataType("玉柴");
todoTaskPojo.setDataType(todoTaskPojo1.getDataType());
todoTaskPojo.setVersionNumber(todoTaskPojo1.getVersionNumber());
todoTaskPojo.setIsDelete(0);
todoTaskPojo.setOwnerId(todoTaskPojo1.getCreatedById());