Skip to content

A
amos-boot-biz
Commit cc7de47c authored by litengwei's avatar litengwei
Browse files
Options

代码提交

parent 9ff37ed6
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 22 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProjectInitiationEnum.java
View file @ cc7de47c
...@@ -17,6 +17,14 @@ public enum ProjectInitiationEnum { ...@@ -17,6 +17,14 @@ public enum ProjectInitiationEnum {
设计资料审核("","设计资料审核","SJZISH","设计资料待审核","设计资料审核","待审核"), 设计资料审核("","设计资料审核","SJZISH","设计资料待审核","设计资料审核","待审核"),
设计资料审批("","设计资料审批","SJZISP","设计资料待审批","设计资料审批","待审批"), 设计资料审批("","设计资料审批","SJZISP","设计资料待审批","设计资料审批","待审批"),
建设负责人指定项目负责人("","建设负责人分配项目负责人","","建设负责人分配项目负责人","",""),
建设负责人指定项目资料员("","建设项目负责人分配项目资料员","","建设项目负责人分配项目资料员","",""),
设计负责人指定项目负责人("","设计负责人分配项目负责人","","设计负责人分配项目负责人","",""),
设计负责人指定项目资料员("","设计项目负责人分配资料员","","设计项目负责人分配资料员","",""),
安装负责人指定项目负责人("","安装负责人分配项目负责人","","安装负责人分配项目负责人","",""),
安装负责人指定项目资料员("","安装项目负责人分配资料员","","安装项目负责人分配资料员","",""),
提交指定("6","提交指定","TJZL","","",""),
安装资料审核("","安装资料审核","AZZLSH","安装资料待审核","安装资料审核","待审核"), 安装资料审核("","安装资料审核","AZZLSH","安装资料待审核","安装资料审核","待审核"),
安装资料审批("","安装资料审批","AZZLSP","安装资料待审批","安装资料待审批","待审批"), 安装资料审批("","安装资料审批","AZZLSP","安装资料待审批","安装资料待审批","待审批"),
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java
View file @ cc7de47c
...@@ -52,6 +52,12 @@ public class XJConstant { ...@@ -52,6 +52,12 @@ public class XJConstant {
public static final String INS_DEPID="insDepId"; public static final String INS_DEPID="insDepId";
public static final String INS_PRESON = "insPerson"; public static final String INS_PRESON = "insPerson";
public static final String INS_PRESONID = "insPersonId"; public static final String INS_PRESONID = "insPersonId";
public static final String JSFZ_PRESON = "jsfzPerson";
public static final String JSZL_PRESON = "jszlPerson";
public static final String SJFZ_PRESON = "sjfzPerson";
public static final String SJZL_PRESON = "sjzlPerson";
public static final String AZFZ_PRESON = "azfzPerson";
public static final String AZZL_PRESON = "azzlPerson";
/** /**
* 构造方法 * 构造方法
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IProjectService.java
View file @ cc7de47c
...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto; ...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto; import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment; import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -26,5 +27,5 @@ public interface IProjectService { ...@@ -26,5 +27,5 @@ public interface IProjectService {
* @param roleId 角色id * @param roleId 角色id
* @return 用户 * @return 用户
*/ */
List<Map<String, String>> queryUserByRoleId(String roleId); List<Map<String, String>> queryUserByRoleId(String roleId, List<CompanyModel> companys );
} }
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java
View file @ cc7de47c
...@@ -32,6 +32,8 @@ import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify; ...@@ -32,6 +32,8 @@ import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*; import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
import com.yeejoin.amos.component.robot.BadRequest; import com.yeejoin.amos.component.robot.BadRequest;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -274,6 +276,12 @@ public class ProjectController extends BaseController { ...@@ -274,6 +276,12 @@ public class ProjectController extends BaseController {
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过"); jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过");
String insDepId = json.getString(XJConstant.INS_DEPID); String insDepId = json.getString(XJConstant.INS_DEPID);
String insPerson = json.getString(XJConstant.INS_PRESON); String insPerson = json.getString(XJConstant.INS_PRESON);
String jsfz = json.getString(XJConstant.JSFZ_PRESON);
String jszl = json.getString(XJConstant.JSZL_PRESON);
String sjfz = json.getString(XJConstant.SJFZ_PRESON);
String sjzl = json.getString(XJConstant.SJZL_PRESON);
String azfz = json.getString(XJConstant.AZFZ_PRESON);
String azzl = json.getString(XJConstant.AZZL_PRESON);
if(!ValidationUtil.isEmpty(insPerson)){ if(!ValidationUtil.isEmpty(insPerson)){
Map map = orgServiceImpl.getdetialInfo(insDepId); Map map = orgServiceImpl.getdetialInfo(insDepId);
jsonObject.put(XJConstant.INS_PRESON,insPerson); jsonObject.put(XJConstant.INS_PRESON,insPerson);
...@@ -284,7 +292,25 @@ public class ProjectController extends BaseController { ...@@ -284,7 +292,25 @@ public class ProjectController extends BaseController {
Map map = orgServiceImpl.getdetialInfo(insDepId); Map map = orgServiceImpl.getdetialInfo(insDepId);
jsonObject.put(XJConstant.INS_DEPID,map.get("sequenceNbr")); jsonObject.put(XJConstant.INS_DEPID,map.get("sequenceNbr"));
jsonObject.put(XJConstant.INS_DEP,map.get("name")); jsonObject.put(XJConstant.INS_DEP,map.get("name"));
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检员待分配"); jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"ssss");
} else if (!ValidationUtil.isEmpty(jsfz)) {
jsonObject.put(XJConstant.INS_PRESON,jsfz);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"建设负责人分配项目负责人");
} else if (!ValidationUtil.isEmpty(jszl)) {
jsonObject.put(XJConstant.INS_PRESON,jszl);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"建设项目负责人分配项目资料员");
} else if (!ValidationUtil.isEmpty(sjfz)) {
jsonObject.put(XJConstant.INS_PRESON,sjfz);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"设计负责人分配项目负责人");
} else if (!ValidationUtil.isEmpty(sjzl)) {
jsonObject.put(XJConstant.INS_PRESON,sjzl);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"设计项目负责人分配资料员");
} else if (!ValidationUtil.isEmpty(azfz)) {
jsonObject.put(XJConstant.INS_PRESON,azfz);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"安装负责人分配项目负责人");
} else if (!ValidationUtil.isEmpty(azzl)) {
jsonObject.put(XJConstant.INS_PRESON,azzl);
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"安装项目负责人分配资料员");
} }
if("0".equals(option)){ if("0".equals(option)){
jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核不通过"); jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核不通过");
...@@ -911,9 +937,12 @@ public class ProjectController extends BaseController { ...@@ -911,9 +937,12 @@ public class ProjectController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/queryUserByRoleId") @GetMapping(value = "/queryUserByRoleId")
@BusinessIdentify
@ApiOperation(httpMethod = "GET",value = "查询登陆人所在公司的某个角色的人", notes = "查询登陆人所在公司的某个角色的人") @ApiOperation(httpMethod = "GET",value = "查询登陆人所在公司的某个角色的人", notes = "查询登陆人所在公司的某个角色的人")
public ResponseModel<List<Map<String, String>>> queryUserByRoleId(String roleId) { public ResponseModel<List<Map<String, String>>> queryUserByRoleId(String roleId) {
return ResponseHelper.buildResponse(projectServiceImpl.queryUserByRoleId(roleId)); AgencyUserModel userInfo = getUserInfo();
List<CompanyModel> companys = userInfo.getCompanys();
return ResponseHelper.buildResponse(projectServiceImpl.queryUserByRoleId(roleId, companys));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @ cc7de47c
...@@ -248,6 +248,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -248,6 +248,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
isEnd = false; isEnd = false;
break; break;
} }
if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)) {
dataObject = JSON.parseObject(JSON.toJSONString(o));
isEnd = false;
break;
}
if(ProjectInitiationEnum.监检员审核.getName().equals(name)){ if(ProjectInitiationEnum.监检员审核.getName().equals(name)){
isEnd = true; isEnd = true;
} }
...@@ -299,8 +306,12 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -299,8 +306,12 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
//更新任务表的状态 已办 //更新任务表的状态 已办
taskType = getUnitId(unitIds, project, superviseRule); taskType = getUnitId(unitIds, project, superviseRule);
if(ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus())){ // if(ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus())){
project.setStatus(ProjectInitiationEnum.提交资料.getName()); // project.setStatus(ProjectInitiationEnum.提交资料.getName());
// }
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus())){
project.setStatus(ProjectInitiationEnum.建设负责人指定项目资料员.getName());
} }
taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId); taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
...@@ -333,6 +344,18 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -333,6 +344,18 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
unitIds.add(project.getConstructionUnitId()); unitIds.add(project.getConstructionUnitId());
taskType = TaskTypeEnum.填报.getKey(); taskType = TaskTypeEnum.填报.getKey();
} }
if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) ||
ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus()) ) {
if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
unitIds.add(project.getInstallationUnitId());
} else if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
unitIds.add(project.getDesignUnitId());
} else {
unitIds.add(project.getDesignUnitId());
unitIds.add(project.getInstallationUnitId());
}
taskType = TaskTypeEnum.填报.getKey();
}
if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) { if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
unitIds.add(project.getConstructionUnitId()); unitIds.add(project.getConstructionUnitId());
taskType = TaskTypeEnum.填报.getKey(); taskType = TaskTypeEnum.填报.getKey();
...@@ -564,22 +587,26 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -564,22 +587,26 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
// 部门审核/审批逻辑 // 部门审核/审批逻辑
if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) { if (ProjectInitiationEnum.建设负责人指定项目资料员.getName().equals(project.getStatus())) {
if (ProjectInitiationEnum.设计资料审核.getName().equals(taskName)) { taskName = ProjectInitiationEnum.设计负责人指定项目负责人.getName() + "/" + ProjectInitiationEnum.安装负责人指定项目负责人.getName();
// 当前执行-设计单位资料提交 // 部门审核/审批逻辑
taskName = ProjectInitiationEnum.安装开工资料提交.getName() + "/" + ProjectInitiationEnum.设计资料审核.getName();
} else { } else {
// 当前执行-安裝单位资料提交 if (ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)) {
taskName = ProjectInitiationEnum.安装资料审核.getName() + "/" + ProjectInitiationEnum.设计开工资料提交.getName(); taskName = ProjectInitiationEnum.设计负责人指定项目资料员.getName() + "/" + project.getStatus().split("/")[1];
} else if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(taskName)) {
taskName = project.getStatus().split("/")[0] + "/" + ProjectInitiationEnum.安装负责人指定项目资料员.getName();
} }
} }
if (!"流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus()) && project.getStatus().contains("/")) { if (!"流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus()) && project.getStatus().contains("/")) {
String azStatus = StringUtils.substringBefore(project.getStatus(), "/"); String azStatus = StringUtils.substringBefore(project.getStatus(), "/");
String sjStatus = StringUtils.substringAfter(project.getStatus(), "/"); String sjStatus = StringUtils.substringAfter(project.getStatus(), "/");
if (taskName.contains("安装")) { if (taskName.contains("安装")) {
taskName = taskName + "/" + sjStatus;
} else {
taskName = azStatus + "/" + taskName; taskName = azStatus + "/" + taskName;
} else {
taskName = taskName + "/" + sjStatus;
} }
} }
if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) { if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java
View file @ cc7de47c
...@@ -985,20 +985,22 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -985,20 +985,22 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
} }
@Override @Override
public List<Map<String, String>> queryUserByRoleId(String roleId) { public List<Map<String, String>> queryUserByRoleId(String roleId, List<CompanyModel> companysList ) {
ReginParams reginParams = orgService.getReginParams(); ReginParams reginParams = orgService.getReginParams();
String companyId = String.valueOf(reginParams.getBusinessInfo().getCompanySequenceNbr()); String companyId = String.valueOf(reginParams.getBusinessInfo().getAmosUserCode());
List<Map<String, String>> list = new ArrayList<>(); List<Map<String, String>> list = new ArrayList<>();
List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByRoleId(roleId, null, null).getResult(); List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByRoleId(roleId, null, true).getResult();
if (!CollectionUtils.isEmpty(agencyUserModelList)) { if (!CollectionUtils.isEmpty(agencyUserModelList)) {
agencyUserModelList.forEach(user -> { agencyUserModelList.forEach(user -> {
List<CompanyModel> companys = user.getCompanys(); List<CompanyModel> companys = user.getCompanys();
companys.forEach(companyModel -> { companys.forEach(companyModel -> {
if (String.valueOf(companyModel.getSequenceNbr()).equals(companyId)) { for(CompanyModel com : companysList ) {
Map<String, String> map = new HashMap<>(2); if (String.valueOf(companyModel.getSequenceNbr()).equals(com.getSequenceNbr().toString())) {
map.put("id", String.valueOf(user.getSequenceNbr())); Map<String, String> map = new HashMap<>(2);
map.put("userName", user.getRealName()); map.put("id", String.valueOf(user.getSequenceNbr()));
list.add(map); map.put("userName", user.getRealName());
list.add(map);
}
} }
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment